You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by md...@apache.org on 2023/01/05 10:10:59 UTC

[incubator-pekko] branch main updated: Rename sbt akka modules

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 24c03cde19 Rename sbt akka modules
24c03cde19 is described below

commit 24c03cde191d80512d5f722cfea8ab5ab2b91322
Author: Matthew de Detrich <md...@gmail.com>
AuthorDate: Thu Jan 5 11:10:50 2023 +0100

    Rename sbt akka modules
    
    Co-authored-by: Sean Glover <se...@seanglover.com>
---
 .github/autolabeler.yml                            |   2 +-
 .github/workflows/nightly-builds.yml               |  14 +-
 .github/workflows/scala3-build.yml                 |  22 +--
 .github/workflows/scala3-compile.yml               |  22 +--
 .gitignore                                         |   4 +-
 CONTRIBUTING.md                                    |  12 +-
 LICENSE                                            |   4 +-
 .../src/main/resources/reference.conf              |   0
 .../actor/testkit/typed/CapturedLogEvent.scala     |   0
 .../apache/pekko/actor/testkit/typed/Effect.scala  |   0
 .../pekko/actor/testkit/typed/FishingOutcome.scala |   0
 .../pekko/actor/testkit/typed/LoggingEvent.scala   |   0
 .../pekko/actor/testkit/typed/TestException.scala  |   0
 .../actor/testkit/typed/TestKitSettings.scala      |   0
 .../testkit/typed/internal/ActorSystemStub.scala   |   0
 .../typed/internal/BehaviorTestKitImpl.scala       |   0
 .../testkit/typed/internal/CapturingAppender.scala |   0
 .../typed/internal/ControlledExecutor.scala        |   0
 .../actor/testkit/typed/internal/DebugRef.scala    |   0
 .../typed/internal/EffectfulActorContext.scala     |   0
 .../actor/testkit/typed/internal/LogbackUtil.scala |   0
 .../typed/internal/LoggingTestKitImpl.scala        |   0
 .../typed/internal/StubbedActorContext.scala       |   0
 .../testkit/typed/internal/TestAppender.scala      |   0
 .../testkit/typed/internal/TestInboxImpl.scala     |   0
 .../testkit/typed/internal/TestKitUtils.scala      |   0
 .../testkit/typed/internal/TestProbeImpl.scala     |   0
 .../actor/testkit/typed/javadsl/ActorTestKit.scala |   0
 .../testkit/typed/javadsl/BehaviorTestKit.scala    |   0
 .../actor/testkit/typed/javadsl/Effects.scala      |   0
 .../actor/testkit/typed/javadsl/LogCapturing.scala |   0
 .../testkit/typed/javadsl/LoggingTestKit.scala     |   0
 .../actor/testkit/typed/javadsl/ManualTime.scala   |   0
 .../typed/javadsl/SerializationTestKit.scala       |   0
 .../actor/testkit/typed/javadsl/TestInbox.scala    |   0
 .../typed/javadsl/TestKitJunitResource.scala       |   0
 .../actor/testkit/typed/javadsl/TestProbe.scala    |   0
 .../testkit/typed/scaladsl/ActorTestKit.scala      |   0
 .../testkit/typed/scaladsl/ActorTestKitBase.scala  |   0
 .../testkit/typed/scaladsl/BehaviorTestKit.scala   |   0
 .../actor/testkit/typed/scaladsl/Effects.scala     |   0
 .../testkit/typed/scaladsl/LogCapturing.scala      |   0
 .../testkit/typed/scaladsl/LoggingTestKit.scala    |   0
 .../actor/testkit/typed/scaladsl/ManualTime.scala  |   0
 .../typed/scaladsl/ScalaTestWithActorTestKit.scala |   0
 .../typed/scaladsl/SerializationTestKit.scala      |   0
 .../actor/testkit/typed/scaladsl/TestInbox.scala   |   0
 .../actor/testkit/typed/scaladsl/TestProbe.scala   |   0
 .../actor/testkit/typed/scaladsl/package.scala     |   0
 .../typed/javadsl/AsyncTestingExampleTest.java     |   0
 .../typed/javadsl/JunitIntegrationExampleTest.java |   0
 .../typed/javadsl/LogCapturingExampleTest.java     |   0
 .../typed/javadsl/ManualTimerExampleTest.java      |   0
 .../typed/javadsl/SyncTestingExampleTest.java      |   0
 .../testkit/typed/javadsl/TestConfigExample.java   |   0
 .../testkit/typed/javadsl/ActorTestKitApiTest.java |   0
 .../testkit/typed/javadsl/ActorTestKitTest.java    |   0
 .../testkit/typed/javadsl/BehaviorTestKitTest.java |   0
 .../testkit/typed/javadsl/LoggingTestKitTest.java  |   0
 .../actor/testkit/typed/javadsl/TestProbeTest.java |   0
 .../src/test/resources/application-test.conf       |   0
 .../src/test/resources/application.conf            |   0
 .../src/test/resources/logback-test.xml            |   0
 .../typed/scaladsl/AsyncTestingExampleSpec.scala   |   0
 .../typed/scaladsl/ManualTimerExampleSpec.scala    |   0
 .../scaladsl/ScalaTestIntegrationExampleSpec.scala |   0
 .../typed/scaladsl/SyncTestingExampleSpec.scala    |   0
 .../testkit/typed/scaladsl/TestConfigExample.scala |   0
 .../testkit/typed/scaladsl/ActorTestKitSpec.scala  |   0
 .../typed/scaladsl/BehaviorTestKitSpec.scala       |   0
 .../typed/scaladsl/LoggingEventFilterSpec.scala    |   0
 .../testkit/typed/scaladsl/TestAppenderSpec.scala  |   0
 .../testkit/typed/scaladsl/TestProbeSpec.scala     |   0
 .../src/test/bind/etc/bind.keys                    |   0
 .../src/test/bind/etc/db.0                         |   0
 .../src/test/bind/etc/db.127                       |   0
 .../src/test/bind/etc/db.255                       |   0
 .../src/test/bind/etc/db.bar.example               |   0
 .../src/test/bind/etc/db.empty                     |   0
 .../src/test/bind/etc/db.foo.test                  |   0
 .../src/test/bind/etc/db.local                     |   0
 .../src/test/bind/etc/db.root                      |   0
 .../src/test/bind/etc/named.conf                   |   0
 .../src/test/bind/etc/named.conf.default-zones     |   0
 .../src/test/bind/etc/named.conf.local             |   0
 .../src/test/bind/etc/named.conf.options           |   0
 .../src/test/bind/etc/rndc.key                     |   0
 .../src/test/bind/etc/zones.rfc1918                |   0
 .../apache/pekko/actor/AbstractFSMActorTest.java   |   0
 .../org/apache/pekko/actor/ActorCreationTest.java  |   0
 .../org/apache/pekko/actor/ActorSelectionTest.java |   0
 .../org/apache/pekko/actor/ActorSystemTest.java    |   0
 .../java/org/apache/pekko/actor/AddressTest.java   |   0
 .../test/java/org/apache/pekko/actor/JavaAPI.java  |   0
 .../org/apache/pekko/actor/JavaAPITestActor.java   |   0
 .../java/org/apache/pekko/actor/JavaExtension.java |   0
 .../org/apache/pekko/actor/NonPublicClass.java     |   0
 .../org/apache/pekko/actor/NonStaticCreator.java   |   0
 .../java/org/apache/pekko/actor/StashJavaAPI.java  |   0
 .../apache/pekko/actor/StashJavaAPITestActors.java |   0
 .../org/apache/pekko/actor/TestAnnotation.java     |   0
 .../pekko/actor/setup/ActorSystemSetupTest.java    |   0
 .../org/apache/pekko/dispatch/JavaFutureTests.java |   0
 .../java/org/apache/pekko/event/ActorWithMDC.java  |   0
 .../org/apache/pekko/event/LoggingAdapterTest.java |   0
 .../org/apache/pekko/japi/JavaAPITestBase.java     |   0
 .../org/apache/pekko/japi/MatchBuilderTest.java    |   0
 .../java/org/apache/pekko/japi/ThrowablesTest.java |   0
 .../org/apache/pekko/japi/pf/PFBuilderTest.java    |   0
 .../apache/pekko/japi/pf/ReceiveBuilderTest.java   |   0
 .../apache/pekko/pattern/CircuitBreakerTest.java   |   0
 .../org/apache/pekko/pattern/PatternsTest.java     |   0
 .../org/apache/pekko/pattern/StatusReplyTest.java  |   0
 .../java/org/apache/pekko/util/ByteStringTest.java |   0
 .../java/org/apache/pekko/util/JavaDuration.java   |   0
 .../pekko/util/LineNumberSpecCodeForJava.java      |   0
 .../src/test/resources/reference.conf              |   0
 .../org/apache/pekko/util/LineNumberSpec.scala     |   0
 .../org/apache/pekko/util/TypedMultiMapSpec.scala  |   0
 .../org/apache/pekko/util/LineNumberSpec.scala     |   0
 .../org/apache/pekko/util/TypedMultiMapSpec.scala  |   0
 .../org/apache/pekko/util/LineNumberSpec.scala     |   0
 .../src/test/scala/org/apache/pekko/Messages.scala |   0
 .../org/apache/pekko/PekkoExceptionSpec.scala      |   0
 .../scala/org/apache/pekko/PekkoVersionSpec.scala  |   0
 .../actor/ActorConfigurationVerificationSpec.scala |   0
 .../apache/pekko/actor/ActorCreationPerfSpec.scala |   0
 .../apache/pekko/actor/ActorLifeCycleSpec.scala    |   0
 .../org/apache/pekko/actor/ActorMailboxSpec.scala  |   0
 .../org/apache/pekko/actor/ActorPathSpec.scala     |   0
 .../org/apache/pekko/actor/ActorRefSpec.scala      |   0
 .../apache/pekko/actor/ActorSelectionSpec.scala    |   0
 .../pekko/actor/ActorSystemDispatcherSpec.scala    |   0
 .../org/apache/pekko/actor/ActorSystemSpec.scala   |   0
 .../org/apache/pekko/actor/ActorTimeoutSpec.scala  |   0
 .../pekko/actor/ActorWithBoundedStashSpec.scala    |   0
 .../apache/pekko/actor/ActorWithStashSpec.scala    |   0
 .../test/scala/org/apache/pekko/actor/Bench.scala  |   0
 .../org/apache/pekko/actor/ConsistencySpec.scala   |   0
 .../pekko/actor/CoordinatedShutdownSpec.scala      |   0
 .../pekko/actor/DeadLetterSupressionSpec.scala     |   0
 .../pekko/actor/DeadLetterSuspensionSpec.scala     |   0
 .../org/apache/pekko/actor/DeathWatchSpec.scala    |   0
 .../org/apache/pekko/actor/DeployerSpec.scala      |   0
 .../org/apache/pekko/actor/DynamicAccessSpec.scala |   0
 .../org/apache/pekko/actor/ExtensionSpec.scala     |   0
 .../org/apache/pekko/actor/FSMActorSpec.scala      |   0
 .../org/apache/pekko/actor/FSMTimingSpec.scala     |   0
 .../org/apache/pekko/actor/FSMTransitionSpec.scala |   0
 .../org/apache/pekko/actor/ForwardActorSpec.scala  |   0
 .../org/apache/pekko/actor/FunctionRefSpec.scala   |   0
 .../scala/org/apache/pekko/actor/HotSwapSpec.scala |   0
 .../pekko/actor/LocalActorRefProviderSpec.scala    |   0
 .../org/apache/pekko/actor/PropsCreationSpec.scala |   0
 .../apache/pekko/actor/ProviderSelectionSpec.scala |   0
 .../apache/pekko/actor/ReceiveTimeoutSpec.scala    |   0
 .../apache/pekko/actor/RelativeActorPathSpec.scala |   0
 .../apache/pekko/actor/RestartStrategySpec.scala   |   0
 .../org/apache/pekko/actor/SchedulerSpec.scala     |   0
 .../scala/org/apache/pekko/actor/Supervisor.scala  |   0
 .../pekko/actor/SupervisorHierarchySpec.scala      |   0
 .../apache/pekko/actor/SupervisorMiscSpec.scala    |   0
 .../org/apache/pekko/actor/SupervisorSpec.scala    |   0
 .../apache/pekko/actor/SupervisorTreeSpec.scala    |   0
 .../org/apache/pekko/actor/Ticket669Spec.scala     |   0
 .../scala/org/apache/pekko/actor/TimerSpec.scala   |   0
 .../org/apache/pekko/actor/TypedActorSpec.scala    |   0
 .../org/apache/pekko/actor/UidClashTest.scala      |   0
 .../pekko/actor/dispatch/ActorModelSpec.scala      |   0
 .../actor/dispatch/BalancingDispatcherSpec.scala   |   0
 .../pekko/actor/dispatch/DispatcherActorSpec.scala |   0
 .../actor/dispatch/DispatcherActorsSpec.scala      |   0
 .../pekko/actor/dispatch/DispatchersSpec.scala     |   0
 .../pekko/actor/dispatch/PinnedActorSpec.scala     |   0
 .../apache/pekko/actor/dungeon/DispatchSpec.scala  |   0
 .../apache/pekko/actor/routing/ListenerSpec.scala  |   0
 .../pekko/actor/setup/ActorSystemSetupSpec.scala   |   0
 .../scala/org/apache/pekko/config/ConfigSpec.scala |   6 +-
 .../org/apache/pekko/dataflow/Future2Actor.scala   |   0
 .../dispatch/ControlAwareDispatcherSpec.scala      |   0
 .../pekko/dispatch/DispatcherShutdownSpec.scala    |   0
 .../pekko/dispatch/ExecutionContextSpec.scala      |   0
 .../dispatch/ForkJoinPoolStarvationSpec.scala      |   0
 .../apache/pekko/dispatch/MailboxConfigSpec.scala  |   0
 .../pekko/dispatch/PriorityDispatcherSpec.scala    |   0
 .../dispatch/SameThreadExecutionContextSpec.scala  |   0
 .../dispatch/StablePriorityDispatcherSpec.scala    |   0
 .../dispatch/sysmsg/SystemMessageListSpec.scala    |   0
 .../event/AddressTerminatedTopicBenchSpec.scala    |   0
 .../org/apache/pekko/event/EventBusSpec.scala      |   0
 .../org/apache/pekko/event/EventStreamSpec.scala   |   0
 .../scala/org/apache/pekko/event/LoggerSpec.scala  |   0
 .../apache/pekko/event/LoggingReceiveSpec.scala    |   0
 .../org/apache/pekko/event/MarkerLoggingSpec.scala |   0
 .../apache/pekko/event/jul/JavaLoggerSpec.scala    |   0
 .../org/apache/pekko/io/CapacityLimitSpec.scala    |   0
 .../pekko/io/InetAddressDnsResolverSpec.scala      |   0
 .../org/apache/pekko/io/SimpleDnsCacheSpec.scala   |   0
 .../org/apache/pekko/io/TcpConnectionSpec.scala    |   0
 .../org/apache/pekko/io/TcpIntegrationSpec.scala   |   0
 .../pekko/io/TcpIntegrationSpecSupport.scala       |   0
 .../org/apache/pekko/io/TcpListenerSpec.scala      |   0
 .../pekko/io/UdpConnectedIntegrationSpec.scala     |   0
 .../org/apache/pekko/io/UdpIntegrationSpec.scala   |   0
 .../io/dns/AsyncDnsResolverIntegrationSpec.scala   |   0
 .../org/apache/pekko/io/dns/DnsSettingsSpec.scala  |   0
 .../apache/pekko/io/dns/DockerBindDnsService.scala |   4 +-
 .../pekko/io/dns/NameserverAddressParserSpec.scala |   0
 .../io/dns/internal/AsyncDnsManagerSpec.scala      |   0
 .../io/dns/internal/AsyncDnsResolverSpec.scala     |   0
 .../pekko/io/dns/internal/DnsClientSpec.scala      |   0
 .../apache/pekko/io/dns/internal/MessageSpec.scala |   0
 .../io/dns/internal/ResolvConfParserSpec.scala     |   0
 .../pekko/io/dns/internal/TcpDnsClientSpec.scala   |   0
 .../scala/org/apache/pekko/pattern/AskSpec.scala   |   0
 .../pattern/BackoffOnRestartSupervisorSpec.scala   |   0
 .../pekko/pattern/BackoffSupervisorSpec.scala      |   0
 .../pekko/pattern/CircuitBreakerMTSpec.scala       |   0
 .../apache/pekko/pattern/CircuitBreakerSpec.scala  |   0
 .../pekko/pattern/CircuitBreakerStressSpec.scala   |   0
 .../org/apache/pekko/pattern/PatternSpec.scala     |   0
 .../org/apache/pekko/pattern/PipeToSpec.scala      |   0
 .../org/apache/pekko/pattern/PromiseRefSpec.scala  |   0
 .../scala/org/apache/pekko/pattern/RetrySpec.scala |   0
 .../org/apache/pekko/pattern/StatusReplySpec.scala |   0
 .../pekko/pattern/extended/ExplicitAskSpec.scala   |   0
 .../org/apache/pekko/routing/BalancingSpec.scala   |   0
 .../org/apache/pekko/routing/BroadcastSpec.scala   |   0
 .../pekko/routing/ConfiguredLocalRoutingSpec.scala |   0
 .../routing/ConsistentHashingRouterSpec.scala      |   0
 .../pekko/routing/MetricsBasedResizerSpec.scala    |   0
 .../org/apache/pekko/routing/RandomSpec.scala      |   0
 .../org/apache/pekko/routing/ResizerSpec.scala     |   0
 .../org/apache/pekko/routing/RoundRobinSpec.scala  |   0
 .../apache/pekko/routing/RouteeCreationSpec.scala  |   0
 .../org/apache/pekko/routing/RoutingSpec.scala     |   0
 .../routing/ScatterGatherFirstCompletedSpec.scala  |   0
 .../apache/pekko/routing/SmallestMailboxSpec.scala |   0
 .../apache/pekko/routing/TailChoppingSpec.scala    |   0
 .../pekko/serialization/AsyncSerializeSpec.scala   |   0
 .../DisabledJavaSerializerWarningSpec.scala        |   0
 .../pekko/serialization/NoVerification.scala       |   0
 .../PrimitivesSerializationSpec.scala              |   0
 .../serialization/SerializationSetupSpec.scala     |   0
 .../apache/pekko/serialization/SerializeSpec.scala |   0
 .../testkit/CallingThreadDispatcherModelSpec.scala |   0
 .../apache/pekko/util/AsciiStringCopySpec.scala    |   0
 .../pekko/util/BoundedBlockingQueueSpec.scala      |   0
 .../org/apache/pekko/util/ByteIteratorSpec.scala   |   0
 .../pekko/util/ByteStringInitializationSpec.scala  |   0
 .../org/apache/pekko/util/ByteStringSpec.scala     |   0
 .../apache/pekko/util/DoubleLinkedListSpec.scala   |   0
 .../scala/org/apache/pekko/util/DurationSpec.scala |   0
 .../org/apache/pekko/util/FrequencyListSpec.scala  |   0
 .../apache/pekko/util/FrequencySketchSpec.scala    |   0
 .../apache/pekko/util/ImmutableIntMapSpec.scala    |   0
 .../scala/org/apache/pekko/util/IndexSpec.scala    |   0
 .../pekko/util/LineNumberSpecCodeForScala.scala    |   0
 .../org/apache/pekko/util/ManifestInfoSpec.scala   |  37 +++++
 .../org/apache/pekko/util/MessageBufferSpec.scala  |   0
 .../org/apache/pekko/util/PrettyDurationSpec.scala |   0
 .../org/apache/pekko/util/RecencyListSpec.scala    |   0
 .../scala/org/apache/pekko/util/ReflectSpec.scala  |   0
 .../pekko/util/SegmentedRecencyListSpec.scala      |   0
 .../scala/org/apache/pekko/util/SwitchSpec.scala   |   0
 .../org/apache/pekko/util/TokenBucketSpec.scala    |   0
 .../scala/org/apache/pekko/util/VersionSpec.scala  |   0
 .../org/apache/pekko/util/WildcardIndexSpec.scala  |   0
 .../org/apache/pekko/util/ZipfianGenerator.scala   |   0
 .../other/SerializerOutsidePekkoPackage.scala      |   0
 .../jdocs/org/apache/pekko/typed/Aggregator.java   |   0
 .../org/apache/pekko/typed/AggregatorTest.java     |   0
 .../org/apache/pekko/typed/BubblingSample.java     |   0
 .../org/apache/pekko/typed/BubblingSampleTest.java |   0
 .../org/apache/pekko/typed/DispatchersDocTest.java |   0
 .../jdocs/org/apache/pekko/typed/FSMDocTest.java   |   0
 .../apache/pekko/typed/GracefulStopDocTest.java    |   0
 .../InteractionPatternsAskWithStatusTest.java      |   0
 .../pekko/typed/InteractionPatternsTest.java       |   0
 .../jdocs/org/apache/pekko/typed/IntroTest.java    |   0
 .../org/apache/pekko/typed/LoggingDocExamples.java |   0
 .../org/apache/pekko/typed/MailboxDocTest.java     |   0
 .../jdocs/org/apache/pekko/typed/OOIntroTest.java  |   0
 .../jdocs/org/apache/pekko/typed/RouterTest.java   |   0
 .../apache/pekko/typed/SpawnProtocolDocTest.java   |   0
 .../org/apache/pekko/typed/StashDocSample.java     |   0
 .../jdocs/org/apache/pekko/typed/StashDocTest.java |   0
 .../apache/pekko/typed/StyleGuideDocExamples.java  |   0
 .../jdocs/org/apache/pekko/typed/TailChopping.java |   0
 .../coexistence/ClassicWatchingTypedTest.java      |   0
 .../coexistence/TypedWatchingClassicTest.java      |   0
 .../pekko/typed/extensions/ExtensionDocTest.java   |   0
 .../pekko/typed/fromclassic/ClassicSample.java     |   0
 .../pekko/typed/fromclassic/TypedSample.java       |   0
 .../apache/pekko/typed/pubsub/PubSubExample.java   |   0
 .../supervision/SupervisionCompileOnlyTest.java    |   0
 .../apache/pekko/actor/typed/ActorSystemTest.java  |   0
 .../pekko/actor/typed/DispatcherSelectorTest.java  |   0
 .../apache/pekko/actor/typed/ExtensionsTest.java   |   0
 .../pekko/actor/typed/MailboxSelectorTest.java     |   0
 .../apache/pekko/actor/typed/SchedulerTest.java    |   0
 .../actor/typed/eventstream/EventStreamTest.java   |   0
 .../pekko/actor/typed/javadsl/ActorCompile.java    |   0
 .../actor/typed/javadsl/ActorContextAskTest.java   |   0
 .../typed/javadsl/ActorContextPipeToSelfTest.java  |   0
 .../actor/typed/javadsl/ActorLoggingTest.java      |   0
 .../pekko/actor/typed/javadsl/AdapterTest.java     |   0
 .../actor/typed/javadsl/BehaviorBuilderTest.java   |   0
 .../pekko/actor/typed/javadsl/InterceptTest.java   |   0
 .../actor/typed/javadsl/ReceiveBuilderTest.java    |   0
 .../pekko/actor/typed/javadsl/RoutersTest.java     |   0
 .../pekko/actor/typed/javadsl/StashBufferTest.java |   0
 .../pekko/actor/typed/javadsl/WatchTest.java       |   0
 .../typed/receptionist/ReceptionistApiTest.java    |   0
 .../src/test/resources/logback-doc-dev.xml         |   0
 .../src/test/resources/logback-doc-prod.xml        |   0
 .../src/test/resources/logback-doc-test.xml        |   0
 .../src/test/resources/logback-test.xml            |   0
 .../src/test/resources/mailbox-config-sample.conf  |   0
 .../docs/org/apache/pekko/typed/Aggregator.scala   |   0
 .../org/apache/pekko/typed/AggregatorSpec.scala    |   0
 .../apache/pekko/typed/DispatchersDocSpec.scala    |   0
 .../docs/org/apache/pekko/typed/FSMDocSpec.scala   |   0
 .../apache/pekko/typed/FaultToleranceDocSpec.scala |   0
 .../apache/pekko/typed/GracefulStopDocSpec.scala   |   0
 .../pekko/typed/InteractionPatternsSpec.scala      |   0
 .../docs/org/apache/pekko/typed/IntroSpec.scala    |   0
 .../apache/pekko/typed/LoggingDocExamples.scala    |   0
 .../org/apache/pekko/typed/MailboxDocSpec.scala    |   0
 .../docs/org/apache/pekko/typed/OOIntroSpec.scala  |   0
 .../docs/org/apache/pekko/typed/RouterSpec.scala   |   0
 .../apache/pekko/typed/SpawnProtocolDocSpec.scala  |   0
 .../docs/org/apache/pekko/typed/StashDocSpec.scala |   0
 .../apache/pekko/typed/StyleGuideDocExamples.scala |   0
 .../docs/org/apache/pekko/typed/TailChopping.scala |   0
 .../coexistence/ClassicWatchingTypedSpec.scala     |   0
 .../coexistence/TypedWatchingClassicSpec.scala     |   0
 .../pekko/typed/extensions/ExtensionDocSpec.scala  |   0
 .../pekko/typed/fromclassic/ClassicSample.scala    |   0
 .../pekko/typed/fromclassic/TypedSample.scala      |   0
 .../org/apache/pekko/typed/myapp/package.scala     |   0
 .../apache/pekko/typed/pubsub/PubSubExample.scala  |   0
 .../typed/supervision/SupervisionCompileOnly.scala |   0
 .../pekko/actor/typed/ActorContextSpec.scala       |   0
 .../pekko/actor/typed/ActorRefIgnoreSpec.scala     |   0
 .../pekko/actor/typed/ActorRefResolverSpec.scala   |   0
 .../org/apache/pekko/actor/typed/AskSpec.scala     |   0
 .../apache/pekko/actor/typed/BehaviorSpec.scala    |   0
 .../apache/pekko/actor/typed/DeferredSpec.scala    |   0
 .../apache/pekko/actor/typed/ExtensionsSpec.scala  |   0
 .../apache/pekko/actor/typed/InterceptSpec.scala   |   0
 .../LocalActorRefProviderLogMessagesSpec.scala     |   0
 .../apache/pekko/actor/typed/LogMessagesSpec.scala |   0
 .../pekko/actor/typed/MailboxSelectorSpec.scala    |   0
 .../org/apache/pekko/actor/typed/MonitorSpec.scala |   0
 .../org/apache/pekko/actor/typed/OrElseSpec.scala  |   0
 .../org/apache/pekko/actor/typed/PropsSpec.scala   |   0
 .../apache/pekko/actor/typed/SchedulerSpec.scala   |   0
 .../pekko/actor/typed/SpawnProtocolSpec.scala      |   0
 .../apache/pekko/actor/typed/SupervisionSpec.scala |   0
 .../apache/pekko/actor/typed/TerminatedSpec.scala  |   0
 .../org/apache/pekko/actor/typed/TimerSpec.scala   |   0
 .../pekko/actor/typed/TransformMessagesSpec.scala  |   0
 .../org/apache/pekko/actor/typed/WatchSpec.scala   |   0
 .../coexistence/ClassicSupervisingTypedSpec.scala  |   0
 .../coexistence/TypedSupervisingClassicSpec.scala  |   0
 .../typed/delivery/ConsumerControllerSpec.scala    |   0
 .../delivery/DurableProducerControllerSpec.scala   |   0
 .../typed/delivery/DurableProducerQueueSpec.scala  |   0
 .../typed/delivery/DurableWorkPullingSpec.scala    |   0
 .../typed/delivery/ProducerControllerSpec.scala    |   0
 .../delivery/ReliableDeliveryRandomSpec.scala      |   0
 .../typed/delivery/ReliableDeliverySpec.scala      |   0
 .../pekko/actor/typed/delivery/TestConsumer.scala  |   0
 .../typed/delivery/TestDurableProducerQueue.scala  |   0
 .../pekko/actor/typed/delivery/TestProducer.scala  |   0
 .../actor/typed/delivery/TestProducerWithAsk.scala |   0
 .../typed/delivery/TestProducerWorkPulling.scala   |   0
 .../actor/typed/delivery/WorkPullingSpec.scala     |   0
 .../actor/typed/eventstream/EventStreamSpec.scala  |   0
 .../typed/internal/ActorRefSerializationSpec.scala |   0
 .../actor/typed/internal/ActorSystemSpec.scala     |   0
 .../typed/internal/adpater/PropsAdapterSpec.scala  |   0
 .../receptionist/LocalReceptionistSpec.scala       |   0
 .../receptionist/ServiceKeySerializationSpec.scala |   0
 .../typed/internal/routing/PoolRouterSpec.scala    |   0
 .../typed/internal/routing/RoutingLogicSpec.scala  |   0
 .../typed/javadsl/AdaptationFailureSpec.scala      |   0
 .../pekko/actor/typed/pubsub/LocalPubSubSpec.scala |   0
 .../typed/receptionist/ReceptionistApiSpec.scala   |   0
 .../actor/typed/scaladsl/ActorContextAskSpec.scala |   0
 .../typed/scaladsl/ActorContextDelegateSpec.scala  |   0
 .../scaladsl/ActorContextPipeToSelfSpec.scala      |   0
 .../actor/typed/scaladsl/ActorLoggingSpec.scala    |   2 +-
 .../actor/typed/scaladsl/ActorThreadSpec.scala     |   0
 .../typed/scaladsl/AdaptationFailureSpec.scala     |   0
 .../typed/scaladsl/DispatcherSelectorSpec.scala    |   0
 .../actor/typed/scaladsl/GracefulStopSpec.scala    |   0
 .../pekko/actor/typed/scaladsl/LoggerOpsSpec.scala |   0
 .../actor/typed/scaladsl/MessageAdapterSpec.scala  |   0
 .../pekko/actor/typed/scaladsl/OnSignalSpec.scala  |   0
 .../actor/typed/scaladsl/ReceivePartialSpec.scala  |   0
 .../pekko/actor/typed/scaladsl/RoutersSpec.scala   |   0
 .../actor/typed/scaladsl/StashBufferSpec.scala     |   0
 .../pekko/actor/typed/scaladsl/StashSpec.scala     |   0
 .../pekko/actor/typed/scaladsl/StopSpec.scala      |   0
 .../actor/typed/scaladsl/adapter/AdapterSpec.scala |   0
 .../scaladsl/adapter/GuardianStartupSpec.scala     |   0
 .../src/main/resources/reference.conf              |   0
 .../typed/internal/receptionist/Platform.scala     |   0
 .../typed/internal/receptionist/Platform.scala     |   0
 .../typed/internal/receptionist/Platform.scala     |   0
 .../pekko/actor/typed/internal/jfr/Events.scala    |   0
 .../internal/jfr/JFRActorFlightRecorder.scala      |   0
 .../org/apache/pekko/actor/typed/ActorRef.scala    |   0
 .../pekko/actor/typed/ActorRefResolver.scala       |   0
 .../org/apache/pekko/actor/typed/ActorSystem.scala |   0
 .../org/apache/pekko/actor/typed/Behavior.scala    |   0
 .../pekko/actor/typed/BehaviorInterceptor.scala    |   0
 .../org/apache/pekko/actor/typed/Dispatchers.scala |   0
 .../org/apache/pekko/actor/typed/Extensions.scala  |   0
 .../org/apache/pekko/actor/typed/LogOptions.scala  |   0
 .../pekko/actor/typed/MessageAndSignals.scala      |   0
 .../scala/org/apache/pekko/actor/typed/Props.scala |   0
 .../org/apache/pekko/actor/typed/Scheduler.scala   |   0
 .../apache/pekko/actor/typed/SpawnProtocol.scala   |   0
 .../pekko/actor/typed/SupervisorStrategy.scala     |   0
 .../pekko/actor/typed/TypedActorContext.scala      |   0
 .../actor/typed/delivery/ConsumerController.scala  |   0
 .../typed/delivery/DurableProducerQueue.scala      |   0
 .../actor/typed/delivery/ProducerController.scala  |   0
 .../delivery/WorkPullingProducerController.scala   |   0
 .../typed/delivery/internal/ChunkedMessage.scala   |   0
 .../delivery/internal/ConsumerControllerImpl.scala |   0
 .../delivery/internal/DeliverySerializable.scala   |   0
 .../delivery/internal/ProducerControllerImpl.scala |   0
 .../WorkPullingProducerControllerImpl.scala        |   0
 .../actor/typed/eventstream/EventStream.scala      |   0
 .../actor/typed/internal/ActorContextImpl.scala    |   0
 .../actor/typed/internal/ActorFlightRecorder.scala |   0
 .../pekko/actor/typed/internal/ActorMdc.scala      |   0
 .../pekko/actor/typed/internal/ActorRefImpl.scala  |   0
 .../pekko/actor/typed/internal/BehaviorImpl.scala  |   0
 .../typed/internal/EventStreamExtension.scala      |   0
 .../actor/typed/internal/ExtensionsImpl.scala      |   0
 .../actor/typed/internal/InterceptorImpl.scala     |   0
 .../actor/typed/internal/InternalMessage.scala     |   0
 .../typed/internal/InternalRecipientRef.scala      |   0
 .../pekko/actor/typed/internal/LoggerClass.scala   |   0
 .../typed/internal/MiscMessageSerializer.scala     |   0
 .../pekko/actor/typed/internal/PoisonPill.scala    |   0
 .../pekko/actor/typed/internal/PropsImpl.scala     |   0
 .../actor/typed/internal/StashBufferImpl.scala     |   0
 .../pekko/actor/typed/internal/Supervision.scala   |   0
 .../pekko/actor/typed/internal/SystemMessage.scala |   0
 .../actor/typed/internal/TimerSchedulerImpl.scala  |   0
 .../internal/WithMdcBehaviorInterceptor.scala      |   0
 .../typed/internal/adapter/ActorAdapter.scala      |   0
 .../internal/adapter/ActorContextAdapter.scala     |   0
 .../typed/internal/adapter/ActorRefAdapter.scala   |   0
 .../internal/adapter/ActorRefFactoryAdapter.scala  |   0
 .../internal/adapter/ActorSystemAdapter.scala      |   0
 .../typed/internal/adapter/AdapterExtension.scala  |   0
 .../internal/adapter/EventStreamAdapter.scala      |   0
 .../internal/adapter/GuardianStartupBehavior.scala |   0
 .../typed/internal/adapter/PropsAdapter.scala      |   0
 .../typed/internal/adapter/SchedulerAdapter.scala  |   0
 .../actor/typed/internal/pubsub/TopicImpl.scala    |   0
 .../internal/receptionist/LocalReceptionist.scala  |   0
 .../internal/receptionist/ReceptionistImpl.scala   |   2 +-
 .../receptionist/ReceptionistMessages.scala        |   0
 .../typed/internal/receptionist/ServiceKey.scala   |   0
 .../receptionist/ServiceKeySerializer.scala        |   0
 .../typed/internal/routing/GroupRouterImpl.scala   |   0
 .../typed/internal/routing/PoolRouterImpl.scala    |   0
 .../typed/internal/routing/RoutingLogic.scala      |   0
 .../actor/typed/javadsl/AbstractBehavior.scala     |   0
 .../pekko/actor/typed/javadsl/ActorContext.scala   |   0
 .../apache/pekko/actor/typed/javadsl/Adapter.scala |   0
 .../pekko/actor/typed/javadsl/AskPattern.scala     |   0
 .../actor/typed/javadsl/BehaviorBuilder.scala      |   0
 .../pekko/actor/typed/javadsl/Behaviors.scala      |   0
 .../apache/pekko/actor/typed/javadsl/Receive.scala |   0
 .../pekko/actor/typed/javadsl/ReceiveBuilder.scala |   0
 .../apache/pekko/actor/typed/javadsl/Routers.scala |   0
 .../pekko/actor/typed/javadsl/StashBuffer.scala    |   0
 .../pekko/actor/typed/javadsl/TimerScheduler.scala |   0
 .../apache/pekko/actor/typed/pubsub/Topic.scala    |   0
 .../actor/typed/receptionist/Receptionist.scala    |   0
 .../actor/typed/scaladsl/AbstractBehavior.scala    |   0
 .../pekko/actor/typed/scaladsl/ActorContext.scala  |   0
 .../pekko/actor/typed/scaladsl/AskPattern.scala    |   0
 .../pekko/actor/typed/scaladsl/Behaviors.scala     |   0
 .../pekko/actor/typed/scaladsl/Routers.scala       |   0
 .../pekko/actor/typed/scaladsl/StashBuffer.scala   |   0
 .../actor/typed/scaladsl/TimerScheduler.scala      |   0
 .../typed/scaladsl/adapter/PropsAdapter.scala      |   0
 .../actor/typed/scaladsl/adapter/package.scala     |   0
 .../pekko/actor/typed/scaladsl/package.scala       |   0
 .../pekko/japi/function/Functions.scala.template   |   0
 .../apache/pekko/japi/tuple/Tuples.scala.template  |   0
 .../org/apache/pekko/actor/AbstractActorRef.java   |   0
 .../org/apache/pekko/actor/AbstractScheduler.java  |   0
 .../pekko/actor/dungeon/AbstractActorCell.java     |   0
 .../org/apache/pekko/annotation/ApiMayChange.java  |   0
 .../org/apache/pekko/annotation/DoNotInherit.java  |   0
 .../org/apache/pekko/annotation/InternalApi.java   |   0
 .../apache/pekko/annotation/InternalStableApi.java |   0
 .../pekko/dispatch/AbstractBoundedNodeQueue.java   |   0
 .../org/apache/pekko/dispatch/AbstractMailbox.java |   0
 .../pekko/dispatch/AbstractMessageDispatcher.java  |   0
 .../apache/pekko/dispatch/AbstractNodeQueue.java   |   0
 .../apache/pekko/dispatch/affinity/OnSpinWait.java |   0
 .../src/main/java/org/apache/pekko/japi/JAPI.java  |   0
 .../org/apache/pekko/japi/pf/AbstractMatch.java    |   0
 .../apache/pekko/japi/pf/AbstractPFBuilder.java    |   0
 .../org/apache/pekko/japi/pf/DeciderBuilder.java   |   0
 .../src/main/java/org/apache/pekko/japi/pf/FI.java |   0
 .../pekko/japi/pf/FSMStateFunctionBuilder.java     |   0
 .../org/apache/pekko/japi/pf/FSMStopBuilder.java   |   0
 .../pekko/japi/pf/FSMTransitionHandlerBuilder.java |   0
 .../main/java/org/apache/pekko/japi/pf/Match.java  |   0
 .../java/org/apache/pekko/japi/pf/PFBuilder.java   |   0
 .../org/apache/pekko/japi/pf/ReceiveBuilder.java   |   0
 .../java/org/apache/pekko/japi/pf/UnitMatch.java   |   0
 .../org/apache/pekko/japi/pf/UnitPFBuilder.java    |   0
 .../pekko/pattern/AbstractCircuitBreaker.java      |   0
 .../pekko/pattern/AbstractPromiseActorRef.java     |   0
 .../main/java/org/apache/pekko/util/Unsafe.java    |   0
 .../src/main/resources/reference.conf              |   0
 .../org/apache/pekko/compat/Future.scala           |   0
 .../org/apache/pekko/compat/PartialFunction.scala  |   0
 .../internal/SameThreadExecutionContext.scala      |   0
 .../pekko/dispatch/internal/ScalaBatchable.scala   |   0
 .../org/apache/pekko/util/ByteIterator.scala       |   0
 .../org/apache/pekko/util/ByteString.scala         |   0
 .../org/apache/pekko/util/ccompat/CompatImpl.scala |   0
 .../pekko/util/ccompat/ccompatUsedUntil213.scala   |   0
 .../org/apache/pekko/util/ccompat/package.scala    |   0
 .../org/apache/pekko/compat/Future.scala           |   0
 .../org/apache/pekko/compat/PartialFunction.scala  |   0
 .../internal/SameThreadExecutionContext.scala      |   0
 .../pekko/util/ccompat/ccompatUsedUntil213.scala   |   0
 .../org/apache/pekko/util/ccompat/package.scala    |   0
 .../pekko/dispatch/internal/ScalaBatchable.scala   |   0
 .../org/apache/pekko/util/ByteIterator.scala       |   0
 .../org/apache/pekko/util/ByteString.scala         |   0
 .../pekko/dispatch/internal/ScalaBatchable.scala   |   0
 .../org/apache/pekko/util/ByteIterator.scala       |   0
 .../scala-3/org/apache/pekko/util/ByteString.scala |   0
 .../src/main/scala/org/apache/pekko/Done.scala     |   0
 .../src/main/scala/org/apache/pekko/Main.scala     |   0
 .../src/main/scala/org/apache/pekko/NotUsed.scala  |   0
 .../scala/org/apache/pekko/PekkoException.scala    |   0
 .../main/scala/org/apache/pekko/PekkoVersion.scala |   0
 .../org/apache/pekko/actor/AbstractActor.scala     |   0
 .../scala/org/apache/pekko/actor/AbstractFSM.scala |   0
 .../org/apache/pekko/actor/AbstractProps.scala     |   0
 .../main/scala/org/apache/pekko/actor/Actor.scala  |   0
 .../scala/org/apache/pekko/actor/ActorCell.scala   |   0
 .../org/apache/pekko/actor/ActorLogMarker.scala    |   0
 .../scala/org/apache/pekko/actor/ActorPath.scala   |   0
 .../scala/org/apache/pekko/actor/ActorRef.scala    |   0
 .../org/apache/pekko/actor/ActorRefProvider.scala  |   0
 .../org/apache/pekko/actor/ActorSelection.scala    |   0
 .../scala/org/apache/pekko/actor/ActorSystem.scala |  68 ++++-----
 .../scala/org/apache/pekko/actor/Address.scala     |   0
 .../pekko/actor/ClassicActorSystemProvider.scala   |   0
 .../apache/pekko/actor/CoordinatedShutdown.scala   |   0
 .../scala/org/apache/pekko/actor/Deployer.scala    |   0
 .../org/apache/pekko/actor/DynamicAccess.scala     |   0
 .../scala/org/apache/pekko/actor/Extension.scala   |   0
 .../main/scala/org/apache/pekko/actor/FSM.scala    |   0
 .../org/apache/pekko/actor/FaultHandling.scala     |   0
 .../apache/pekko/actor/IndirectActorProducer.scala |   0
 .../pekko/actor/LightArrayRevolverScheduler.scala  |   0
 .../main/scala/org/apache/pekko/actor/Props.scala  |   0
 .../pekko/actor/ReflectiveDynamicAccess.scala      |   0
 .../apache/pekko/actor/RepointableActorRef.scala   |   0
 .../scala/org/apache/pekko/actor/Scheduler.scala   |   0
 .../main/scala/org/apache/pekko/actor/Stash.scala  |   0
 .../main/scala/org/apache/pekko/actor/Timers.scala |   0
 .../scala/org/apache/pekko/actor/TypedActor.scala  |   0
 .../org/apache/pekko/actor/dungeon/Children.scala  |   0
 .../pekko/actor/dungeon/ChildrenContainer.scala    |   0
 .../apache/pekko/actor/dungeon/DeathWatch.scala    |   0
 .../org/apache/pekko/actor/dungeon/Dispatch.scala  |   0
 .../apache/pekko/actor/dungeon/FaultHandling.scala |   0
 .../pekko/actor/dungeon/ReceiveTimeout.scala       |   0
 .../pekko/actor/dungeon/TimerSchedulerImpl.scala   |   0
 .../scala/org/apache/pekko/actor/package.scala     |   0
 .../pekko/actor/setup/ActorSystemSetup.scala       |   0
 .../apache/pekko/dispatch/AbstractDispatcher.scala |   0
 .../pekko/dispatch/BalancingDispatcher.scala       |   0
 .../apache/pekko/dispatch/BatchingExecutor.scala   |   0
 .../org/apache/pekko/dispatch/CachingConfig.scala  |   0
 .../org/apache/pekko/dispatch/Dispatcher.scala     |   0
 .../org/apache/pekko/dispatch/Dispatchers.scala    |   0
 .../dispatch/ForkJoinExecutorConfigurator.scala    |   0
 .../scala/org/apache/pekko/dispatch/Future.scala   |   0
 .../scala/org/apache/pekko/dispatch/Mailbox.scala  |   0
 .../org/apache/pekko/dispatch/Mailboxes.scala      |   0
 .../apache/pekko/dispatch/PinnedDispatcher.scala   |   0
 .../apache/pekko/dispatch/ThreadPoolBuilder.scala  |   0
 .../pekko/dispatch/affinity/AffinityPool.scala     |   0
 .../pekko/dispatch/sysmsg/SystemMessage.scala      |   0
 .../event/ActorClassificationUnsubscriber.scala    |   0
 .../pekko/event/AddressTerminatedTopic.scala       |   0
 .../apache/pekko/event/DeadLetterListener.scala    |   0
 .../scala/org/apache/pekko/event/EventBus.scala    |   0
 .../scala/org/apache/pekko/event/EventStream.scala |   0
 .../pekko/event/EventStreamUnsubscriber.scala      |   0
 .../org/apache/pekko/event/LoggerMailbox.scala     |   0
 .../scala/org/apache/pekko/event/Logging.scala     |   0
 .../org/apache/pekko/event/LoggingReceive.scala    |   0
 .../apache/pekko/event/japi/EventBusJavaAPI.scala  |   0
 .../org/apache/pekko/event/jul/JavaLogger.scala    |   0
 .../org/apache/pekko/io/DirectByteBufferPool.scala |   0
 .../src/main/scala/org/apache/pekko/io/Dns.scala   |   0
 .../scala/org/apache/pekko/io/DnsProvider.scala    |   0
 .../src/main/scala/org/apache/pekko/io/IO.scala    |   0
 .../src/main/scala/org/apache/pekko/io/Inet.scala  |   0
 .../apache/pekko/io/InetAddressDnsProvider.scala   |   0
 .../apache/pekko/io/InetAddressDnsResolver.scala   |   0
 .../org/apache/pekko/io/SelectionHandler.scala     |   0
 .../scala/org/apache/pekko/io/SimpleDnsCache.scala |   0
 .../org/apache/pekko/io/SimpleDnsManager.scala     |   0
 .../src/main/scala/org/apache/pekko/io/Tcp.scala   |   0
 .../scala/org/apache/pekko/io/TcpConnection.scala  |   0
 .../apache/pekko/io/TcpIncomingConnection.scala    |   0
 .../scala/org/apache/pekko/io/TcpListener.scala    |   0
 .../scala/org/apache/pekko/io/TcpManager.scala     |   0
 .../apache/pekko/io/TcpOutgoingConnection.scala    |   0
 .../src/main/scala/org/apache/pekko/io/Udp.scala   |   0
 .../scala/org/apache/pekko/io/UdpConnected.scala   |   0
 .../org/apache/pekko/io/UdpConnectedManager.scala  |   0
 .../scala/org/apache/pekko/io/UdpConnection.scala  |   0
 .../scala/org/apache/pekko/io/UdpListener.scala    |   0
 .../scala/org/apache/pekko/io/UdpManager.scala     |   0
 .../main/scala/org/apache/pekko/io/UdpSender.scala |   0
 .../scala/org/apache/pekko/io/WithUdpSend.scala    |   0
 .../org/apache/pekko/io/dns/CachePolicy.scala      |   0
 .../org/apache/pekko/io/dns/DnsProtocol.scala      |   0
 .../apache/pekko/io/dns/DnsResourceRecords.scala   |   0
 .../org/apache/pekko/io/dns/DnsSettings.scala      |   0
 .../org/apache/pekko/io/dns/RecordClass.scala      |   0
 .../scala/org/apache/pekko/io/dns/RecordType.scala |   0
 .../pekko/io/dns/internal/AsyncDnsManager.scala    |   0
 .../pekko/io/dns/internal/AsyncDnsProvider.scala   |   0
 .../pekko/io/dns/internal/AsyncDnsResolver.scala   |   0
 .../apache/pekko/io/dns/internal/DnsClient.scala   |   0
 .../apache/pekko/io/dns/internal/DnsMessage.scala  |   0
 .../apache/pekko/io/dns/internal/DomainName.scala  |   0
 .../apache/pekko/io/dns/internal/Question.scala    |   0
 .../io/dns/internal/RecordClassSerializer.scala    |   0
 .../io/dns/internal/RecordTypeSerializer.scala     |   0
 .../pekko/io/dns/internal/ResolvConfParser.scala   |   0
 .../pekko/io/dns/internal/TcpDnsClient.scala       |   0
 .../org/apache/pekko/io/dns/internal/package.scala |   0
 .../main/scala/org/apache/pekko/japi/JavaAPI.scala |   0
 .../scala/org/apache/pekko/japi/Throwables.scala   |   0
 .../org/apache/pekko/japi/function/Function.scala  |   0
 .../org/apache/pekko/japi/pf/CaseStatements.scala  |   0
 .../org/apache/pekko/pattern/AskSupport.scala      |   0
 .../scala/org/apache/pekko/pattern/Backoff.scala   |   0
 .../org/apache/pekko/pattern/BackoffOptions.scala  |   0
 .../apache/pekko/pattern/BackoffSupervisor.scala   |   0
 .../org/apache/pekko/pattern/CircuitBreaker.scala  |   0
 .../pekko/pattern/CircuitBreakersRegistry.scala    |   0
 .../pekko/pattern/FutureTimeoutSupport.scala       |   0
 .../apache/pekko/pattern/GracefulStopSupport.scala |   0
 .../org/apache/pekko/pattern/HandleBackoff.scala   |   0
 .../scala/org/apache/pekko/pattern/Patterns.scala  |   0
 .../org/apache/pekko/pattern/PipeToSupport.scala   |   0
 .../org/apache/pekko/pattern/PromiseRef.scala      |   0
 .../org/apache/pekko/pattern/RetrySupport.scala    |   0
 .../org/apache/pekko/pattern/StatusReply.scala     |   0
 .../apache/pekko/pattern/extended/package.scala    |   0
 .../internal/BackoffOnRestartSupervisor.scala      |   0
 .../pattern/internal/BackoffOnStopSupervisor.scala |   0
 .../pattern/internal/CircuitBreakerTelemetry.scala |   0
 .../scala/org/apache/pekko/pattern/package.scala   |   0
 .../scala/org/apache/pekko/routing/Balancing.scala |   0
 .../scala/org/apache/pekko/routing/Broadcast.scala |   0
 .../org/apache/pekko/routing/ConsistentHash.scala  |   0
 .../apache/pekko/routing/ConsistentHashing.scala   |   0
 .../scala/org/apache/pekko/routing/Listeners.scala |   0
 .../org/apache/pekko/routing/MurmurHash.scala      |   0
 .../routing/OptimalSizeExploringResizer.scala      |   0
 .../scala/org/apache/pekko/routing/Random.scala    |   0
 .../scala/org/apache/pekko/routing/Resizer.scala   |   0
 .../org/apache/pekko/routing/RoundRobin.scala      |   0
 .../org/apache/pekko/routing/RoutedActorCell.scala |   0
 .../org/apache/pekko/routing/RoutedActorRef.scala  |   0
 .../scala/org/apache/pekko/routing/Router.scala    |   0
 .../org/apache/pekko/routing/RouterConfig.scala    |   0
 .../routing/ScatterGatherFirstCompleted.scala      |   0
 .../org/apache/pekko/routing/SmallestMailbox.scala |   0
 .../org/apache/pekko/routing/TailChopping.scala    |   0
 .../pekko/serialization/AsyncSerializer.scala      |   0
 .../pekko/serialization/PrimitiveSerializers.scala |   0
 .../apache/pekko/serialization/Serialization.scala |   0
 .../serialization/SerializationExtension.scala     |   0
 .../pekko/serialization/SerializationSetup.scala   |   0
 .../apache/pekko/serialization/Serializer.scala    |   0
 .../apache/pekko/util/BoundedBlockingQueue.scala   |   0
 .../scala/org/apache/pekko/util/BoxedType.scala    |   0
 .../pekko/util/ClassLoaderObjectInputStream.scala  |   0
 .../scala/org/apache/pekko/util/Collections.scala  |   0
 .../scala/org/apache/pekko/util/ConstantFun.scala  |   0
 .../org/apache/pekko/util/DoubleLinkedList.scala   |   0
 .../org/apache/pekko/util/ErrorMessages.scala      |   0
 .../apache/pekko/util/FlightRecorderLoader.scala   |   0
 .../org/apache/pekko/util/FrequencyList.scala      |   0
 .../org/apache/pekko/util/FrequencySketch.scala    |   0
 .../scala/org/apache/pekko/util/HashCode.scala     |   0
 .../main/scala/org/apache/pekko/util/Helpers.scala |   0
 .../org/apache/pekko/util/ImmutableIntMap.scala    |   0
 .../main/scala/org/apache/pekko/util/Index.scala   |   0
 .../apache/pekko/util/JavaDurationConverters.scala |   0
 .../scala/org/apache/pekko/util/JavaVersion.scala  |   0
 .../scala/org/apache/pekko/util/LineNumbers.scala  |   0
 .../scala/org/apache/pekko/util/LockUtil.scala     |   0
 .../scala/org/apache/pekko/util/ManifestInfo.scala |   0
 .../org/apache/pekko/util/MessageBuffer.scala      |   0
 .../scala/org/apache/pekko/util/OptionVal.scala    |   0
 .../org/apache/pekko/util/PrettyByteString.scala   |   0
 .../org/apache/pekko/util/PrettyDuration.scala     |   0
 .../scala/org/apache/pekko/util/RecencyList.scala  |   0
 .../main/scala/org/apache/pekko/util/Reflect.scala |   0
 .../apache/pekko/util/SegmentedRecencyList.scala   |   0
 .../SerializedSuspendableExecutionContext.scala    |   0
 .../apache/pekko/util/StablePriorityQueue.scala    |   0
 .../org/apache/pekko/util/SubclassifiedIndex.scala |   0
 .../main/scala/org/apache/pekko/util/Timeout.scala |   0
 .../scala/org/apache/pekko/util/TokenBucket.scala  |   0
 .../org/apache/pekko/util/TypedMultiMap.scala      |   0
 .../org/apache/pekko/util/UUIDComparator.scala     |   0
 .../main/scala/org/apache/pekko/util/Unused.scala  |   0
 .../main/scala/org/apache/pekko/util/Version.scala |   0
 .../scala/org/apache/pekko/util/WallClock.scala    |   0
 .../org/apache/pekko/util/WildcardIndex.scala      |   0
 .../org/apache/pekko/util/ManifestInfoSpec.scala   |  37 -----
 {akka-bench-jmh => bench-jmh}/README.md            |   2 +-
 .../akka/serialization/jackson/JavaMessages.java   |   0
 .../src/main/resources/logback.xml                 |   0
 .../main/scala/org/apache/pekko/BenchRunner.scala  |   0
 .../org/apache/pekko/actor/ActorBenchmark.scala    |   0
 .../pekko/actor/ActorCreationBenchmark.scala       |   0
 .../pekko/actor/ActorPathValidationBenchmark.scala |   0
 .../actor/AffinityPoolComparativeBenchmark.scala   |   0
 .../actor/AffinityPoolIdleCPULevelBenchmark.scala  |   0
 .../AffinityPoolRequestResponseBenchmark.scala     |   0
 .../org/apache/pekko/actor/BenchmarkActors.scala   |   0
 .../actor/DirectByteBufferPoolBenchmark.scala      |   0
 .../pekko/actor/ForkJoinActorBenchmark.scala       |   0
 .../org/apache/pekko/actor/JCToolsMailbox.scala    |   0
 .../apache/pekko/actor/ManyToOneArrayMailbox.scala |   0
 .../apache/pekko/actor/RequestResponseActors.scala |   0
 .../pekko/actor/RouterPoolCreationBenchmark.scala  |   0
 .../org/apache/pekko/actor/ScheduleBenchmark.scala |   0
 .../pekko/actor/StashCreationBenchmark.scala       |   0
 .../org/apache/pekko/actor/TellOnlyBenchmark.scala |   0
 .../pekko/actor/typed/TypedActorBenchmark.scala    |   0
 .../pekko/actor/typed/TypedBenchmarkActors.scala   |   0
 .../actor/typed/TypedForkJoinActorBenchmark.scala  |   0
 .../typed/delivery/ReliableDeliveryBenchmark.scala |   0
 .../pekko/cluster/ddata/ORSetMergeBenchmark.scala  |   0
 .../ddata/ORSetSerializationBenchmark.scala        |   0
 .../cluster/ddata/VersionVectorBenchmark.scala     |   0
 .../pekko/dispatch/CachingConfigBenchmark.scala    |   0
 .../apache/pekko/dispatch/NodeQueueBenchmark.scala |   0
 .../pekko/event/LogLevelAccessBenchmark.scala      |   0
 .../org/apache/pekko/persistence/Common.scala      |   0
 .../persistence/LevelDbBatchingBenchmark.scala     |   0
 .../PersistenceActorDeferBenchmark.scala           |   0
 .../persistence/PersistentActorBenchmark.scala     |   0
 ...tentActorWithAtLeastOnceDeliveryBenchmark.scala |   0
 .../pekko/remote/artery/BenchTestSource.scala      |   0
 .../pekko/remote/artery/CodecBenchmark.scala       |   0
 .../org/apache/pekko/remote/artery/LatchSink.scala |   0
 .../remote/artery/LiteralEncodingBenchmark.scala   |   0
 .../pekko/remote/artery/SendQueueBenchmark.scala   |   0
 .../artery/compress/CountMinSketchBenchmark.scala  |   0
 .../compress/InvertCompressionTableBenchmark.scala |   0
 .../SerializationFormatCacheBenchmark.scala        |   0
 .../remote/compress/HeavyHittersBenchmark.scala    |   0
 .../jackson/JacksonSerializationBench.scala        |   0
 .../org/apache/pekko/stream/AskBenchmark.scala     |   0
 .../apache/pekko/stream/EmptySourceBenchmark.scala |   0
 .../pekko/stream/FlatMapConcatBenchmark.scala      |   0
 .../pekko/stream/FlatMapMergeBenchmark.scala       |   0
 .../org/apache/pekko/stream/FlowMapBenchmark.scala |   0
 .../org/apache/pekko/stream/FramingBenchmark.scala |   0
 .../apache/pekko/stream/FusedGraphsBenchmark.scala |   0
 .../pekko/stream/GraphBuilderBenchmark.scala       |   0
 .../apache/pekko/stream/InterpreterBenchmark.scala |   0
 .../pekko/stream/InvokeWithFeedbackBenchmark.scala |   0
 .../apache/pekko/stream/JsonFramingBenchmark.scala |   0
 .../apache/pekko/stream/MapAsyncBenchmark.scala    |   0
 .../pekko/stream/MaterializationBenchmark.scala    |   0
 .../pekko/stream/NewLayoutBenchmark.template       |   0
 .../pekko/stream/PartitionHubBenchmark.scala       |   0
 .../apache/pekko/stream/SourceRefBenchmark.scala   |   0
 .../impl/OutputStreamSourceStageBenchmark.scala    |   0
 .../pekko/stream/io/FileSourcesBenchmark.scala     |   0
 .../stream/io/FileSourcesScaleBenchmark.scala      |   0
 .../pekko/util/ByteString_append_Benchmark.scala   |   0
 .../pekko/util/ByteString_apply_Benchmark.scala    |   0
 .../util/ByteString_copyToBuffer_Benchmark.scala   |   0
 .../pekko/util/ByteString_decode_Benchmark.scala   |   0
 .../util/ByteString_dropRight_Benchmark.scala      |   0
 .../util/ByteString_dropSliceTake_Benchmark.scala  |   0
 .../pekko/util/ByteString_drop_Benchmark.scala     |   0
 .../pekko/util/ByteString_grouped_Benchmark.scala  |   0
 .../pekko/util/ByteString_indexOf_Benchmark.scala  |   0
 .../pekko/util/ByteString_take_Benchmark.scala     |   0
 .../pekko/util/ByteString_toArray_Benchmark.scala  |   0
 .../pekko/util/FastFrequencySketchBenchmark.scala  |   0
 .../pekko/util/FrequencySketchBenchmark.scala      |   0
 .../apache/pekko/util/ImmutableIntMapBench.scala   |   0
 .../apache/pekko/util/LruBoundedCacheBench.scala   |   0
 .../scala/org/apache/pekko/util/StackBench.scala   |   0
 build.sbt                                          | 152 +++++++++++----------
 .../protobuf/msg/ClusterMetricsMessages.java       |   0
 .../src/main/protobuf/ClusterMetricsMessages.proto |   0
 .../src/main/resources/reference.conf              |   0
 .../cluster/metrics/ClusterMetricsCollector.scala  |   0
 .../cluster/metrics/ClusterMetricsExtension.scala  |   0
 .../cluster/metrics/ClusterMetricsRouting.scala    |   0
 .../cluster/metrics/ClusterMetricsSettings.scala   |   0
 .../cluster/metrics/ClusterMetricsStrategy.scala   |   0
 .../org/apache/pekko/cluster/metrics/EWMA.scala    |   0
 .../org/apache/pekko/cluster/metrics/Metric.scala  |   0
 .../pekko/cluster/metrics/MetricsCollector.scala   |   0
 .../apache/pekko/cluster/metrics/Provision.scala   |   0
 .../metrics/protobuf/MessageSerializer.scala       |   0
 .../metrics/ClusterMetricsExtensionSpec.scala      |   0
 .../metrics/ClusterMetricsRoutingSpec.scala        |   0
 .../cluster/metrics/sample/StatsMessages.scala     |   0
 .../cluster/metrics/sample/StatsSampleSpec.scala   |   2 +-
 .../cluster/metrics/sample/StatsService.scala      |   0
 .../pekko/cluster/metrics/sample/StatsWorker.scala |   0
 .../src/test/resources/logback-test.xml            |   0
 .../metrics/ClusterMetricsExtensionSpec.scala      |   0
 .../metrics/ClusterMetricsRoutingSpec.scala        |   0
 .../metrics/ClusterMetricsSettingsSpec.scala       |   0
 .../apache/pekko/cluster/metrics/EWMASpec.scala    |   0
 .../apache/pekko/cluster/metrics/MetricSpec.scala  |   0
 .../cluster/metrics/MetricsCollectorSpec.scala     |   0
 .../apache/pekko/cluster/metrics/TestUtil.scala    |   0
 .../cluster/metrics/WeightedRouteesSpec.scala      |   0
 .../metrics/protobuf/MessageSerializerSpec.scala   |   0
 .../typed/internal/protobuf/ShardingMessages.java  |   0
 .../src/main/protobuf/ShardingMessages.proto       |   0
 .../src/main/resources/reference.conf              |   0
 .../sharding/typed/ClusterShardingQuery.scala      |   0
 .../sharding/typed/ClusterShardingSettings.scala   |   0
 .../sharding/typed/Murmur2MessageExtractor.scala   |   0
 .../sharding/typed/ReplicatedEntityProvider.scala  |   0
 .../typed/ReplicatedShardingExtension.scala        |   0
 .../typed/ShardedDaemonProcessSettings.scala       |   0
 .../sharding/typed/ShardingDirectReplication.scala |   0
 .../sharding/typed/ShardingMessageExtractor.scala  |   0
 .../delivery/ShardingConsumerController.scala      |   0
 .../delivery/ShardingProducerController.scala      |   0
 .../internal/ShardingConsumerControllerImpl.scala  |   0
 .../internal/ShardingProducerControllerImpl.scala  |   0
 .../typed/internal/ClusterShardingImpl.scala       |   0
 .../JoinConfigCompatCheckerClusterSharding.scala   |   0
 .../cluster/sharding/typed/internal/Murmur2.scala  |   0
 .../internal/ReplicatedShardingExtensionImpl.scala |   0
 .../typed/internal/ShardedDaemonProcessImpl.scala  |   0
 .../typed/internal/ShardingSerializer.scala        |   0
 .../sharding/typed/internal/ShardingState.scala    |   0
 .../typed/internal/testkit/TestEntityRefImpl.scala |   0
 .../sharding/typed/javadsl/ClusterSharding.scala   |   0
 .../typed/javadsl/ShardedDaemonProcess.scala       |   0
 .../sharding/typed/scaladsl/ClusterSharding.scala  |   0
 .../typed/scaladsl/ShardedDaemonProcess.scala      |   0
 .../sharding/typed/testkit/javadsl/EntityRef.scala |   0
 .../typed/testkit/scaladsl/EntityRef.scala         |   0
 .../src/multi-jvm/resources/logback-test.xml       |   0
 .../ClusterShardingRememberEntitiesPerfSpec.scala  |   0
 .../ClusterShardingPreparingForShutdownSpec.scala  |   0
 .../sharding/typed/ClusterShardingStatsSpec.scala  |   0
 .../typed/MultiDcClusterShardingSpec.scala         |   0
 .../sharding/typed/ReplicatedShardingSpec.scala    |   0
 .../sharding/typed/ShardedDaemonProcessSpec.scala  |   0
 .../typed/delivery/DeliveryThroughputSpec.scala    |   0
 .../jdocs/delivery/PointToPointDocExample.java     |   0
 .../java/jdocs/delivery/ShardingDocExample.java    |   0
 .../java/jdocs/delivery/WorkPullingDocExample.java |   0
 .../sharding/typed/AccountExampleDocTest.java      |   0
 .../cluster/sharding/typed/AccountExampleTest.java |   0
 .../AccountExampleWithEventHandlersInState.java    |   0
 .../typed/AccountExampleWithMutableState.java      |   0
 .../typed/AccountExampleWithNullDurableState.java  |   0
 .../typed/AccountExampleWithNullState.java         |   0
 ...DurableStateStoreQueryUsageCompileOnlyTest.java |   0
 .../ExternalShardAllocationCompileOnlyTest.java    |   0
 .../HelloWorldEventSourcedEntityExampleTest.java   |   0
 .../typed/HelloWorldPersistentEntityExample.java   |   0
 .../typed/ReplicatedShardingCompileOnlySpec.java   |   0
 .../sharding/typed/ShardingCompileOnlyTest.java    |   0
 .../typed/ShardingReplyCompileOnlyTest.java        |   0
 .../sharding/typed/ReplicatedShardingTest.java     |   0
 .../javadsl/ClusterShardingPersistenceTest.java    |   0
 .../ClusterShardingSettingsCompileOnly.java        |   0
 .../ShardedDaemonProcessCompileOnlyTest.java       |   0
 ...edEntityWithEnforcedRepliesCompileOnlyTest.java |   0
 .../src/test/resources/logback-test.xml            |   0
 .../docs/delivery/PointToPointDocExample.scala     |   0
 .../scala/docs/delivery/ShardingDocExample.scala   |   0
 .../docs/delivery/WorkPullingDocExample.scala      |   0
 .../sharding/typed/AccountExampleDocSpec.scala     |   0
 .../sharding/typed/AccountExampleSpec.scala        |   0
 ...tExampleWithCommandHandlersInDurableState.scala |   0
 .../AccountExampleWithCommandHandlersInState.scala |   0
 .../AccountExampleWithEventHandlersInState.scala   |   0
 .../AccountExampleWithOptionDurableState.scala     |   0
 .../typed/AccountExampleWithOptionState.scala      |   0
 ...urableStateStoreQueryUsageCompileOnlySpec.scala |   0
 .../ExternalShardAllocationCompileOnlySpec.scala   |   0
 .../HelloWorldEventSourcedEntityExampleSpec.scala  |   0
 .../typed/HelloWorldPersistentEntityExample.scala  |   0
 .../typed/ReplicatedShardingCompileOnlySpec.scala  |   0
 .../sharding/typed/ShardingCompileOnlySpec.scala   |   0
 .../pekko/cluster/sharding/FlightRecording.scala   |   0
 ...oinConfigCompatCheckerClusterShardingSpec.scala |   0
 .../ReplicatedShardingDirectReplicationSpec.scala  |   0
 .../sharding/typed/ReplicatedShardingSpec.scala    |   0
 .../sharding/typed/ShardingSerializerSpec.scala    |   0
 .../typed/delivery/DurableShardingSpec.scala       |   0
 .../delivery/ReliableDeliveryShardingSpec.scala    |   0
 .../sharding/typed/internal/Murmur2Spec.scala      |   0
 .../scaladsl/ClusterShardingPersistenceSpec.scala  |   0
 .../typed/scaladsl/ClusterShardingSpec.scala       |   0
 .../typed/scaladsl/ClusterShardingStateSpec.scala  |   0
 .../typed/scaladsl/ClusterShardingStatsSpec.scala  |   0
 .../typed/scaladsl/ShardedDaemonProcessSpec.scala  |   0
 .../typed/testkit/scaladsl/TestEntityRefSpec.scala |   0
 .../protobuf/msg/ClusterShardingMessages.java      |   0
 .../main/protobuf/ClusterShardingMessages.proto    |   0
 .../src/main/resources/reference.conf              |   0
 .../cluster/sharding/internal/jfr/Events.scala     |   0
 .../internal/jfr/JFRShardingFlightRecorder.scala   |   0
 .../pekko/cluster/sharding/ClusterSharding.scala   |   0
 .../sharding/ClusterShardingHealthCheck.scala      |   0
 .../sharding/ClusterShardingSerializable.scala     |   0
 .../cluster/sharding/ClusterShardingSettings.scala |   0
 .../sharding/JoinConfigCompatCheckSharding.scala   |   0
 .../OldCoordinatorStateMigrationEventAdapter.scala |   0
 .../RemoveInternalClusterShardingData.scala        |   0
 .../org/apache/pekko/cluster/sharding/Shard.scala  |   0
 .../pekko/cluster/sharding/ShardCoordinator.scala  |   0
 .../pekko/cluster/sharding/ShardRegion.scala       |   0
 .../cluster/sharding/ShardingFlightRecorder.scala  |   0
 .../pekko/cluster/sharding/ShardingLogMarker.scala |   0
 .../pekko/cluster/sharding/ShardingQueries.scala   |   0
 .../sharding/external/ClientTimeoutException.scala |   0
 .../external/ExternalShardAllocation.scala         |   0
 .../external/ExternalShardAllocationStrategy.scala |   0
 .../cluster/sharding/external/ShardLocations.scala |   0
 .../ExternalShardAllocationClientImpl.scala        |   0
 .../javadsl/ExternalShardAllocationClient.scala    |   0
 .../scaladsl/ExternalShardAllocationClient.scala   |   0
 .../AbstractLeastShardAllocationStrategy.scala     |   0
 .../internal/CustomStateStoreModeProvider.scala    |   0
 .../DDataRememberEntitiesCoordinatorStore.scala    |   0
 .../internal/DDataRememberEntitiesProvider.scala   |   0
 .../internal/DDataRememberEntitiesShardStore.scala |   0
 .../internal/EntityPassivationStrategy.scala       |   0
 ...ntSourcedRememberEntitiesCoordinatorStore.scala |   0
 .../EventSourcedRememberEntitiesProvider.scala     |   0
 .../EventSourcedRememberEntitiesShardStore.scala   |   0
 .../internal/LeastShardAllocationStrategy.scala    |   0
 .../sharding/internal/RememberEntitiesStore.scala  |   0
 .../sharding/internal/RememberEntityStarter.scala  |   0
 .../ClusterShardingMessageSerializer.scala         |   0
 .../apache/pekko/cluster/sbr/GlobalRegistry.scala  |   0
 .../pekko/cluster/sbr/GremlinController.scala      |   0
 .../RandomizedBrainResolverIntegrationSpec.scala   |   0
 .../pekko/cluster/sbr/SbrTestLeaseActor.scala      |   0
 .../sbr/SplitBrainResolverIntegrationSpec.scala    |   0
 .../ClusterShardCoordinatorDowning2Spec.scala      |   0
 .../ClusterShardCoordinatorDowningSpec.scala       |   0
 .../ClusterShardingCustomShardAllocationSpec.scala |   0
 .../sharding/ClusterShardingFailureSpec.scala      |   0
 .../sharding/ClusterShardingGetStateSpec.scala     |   0
 .../sharding/ClusterShardingGetStatsSpec.scala     |   0
 ...ClusterShardingGracefulShutdownOldestSpec.scala |   0
 .../ClusterShardingGracefulShutdownSpec.scala      |   0
 .../ClusterShardingIncorrectSetupSpec.scala        |   0
 .../sharding/ClusterShardingLeavingSpec.scala      |   0
 .../sharding/ClusterShardingMinMembersSpec.scala   |   0
 .../sharding/ClusterShardingQueriesSpec.scala      |   0
 ...ardingRegistrationCoordinatedShutdownSpec.scala |   0
 ...rShardingRememberEntitiesNewExtractorSpec.scala |   0
 .../ClusterShardingRememberEntitiesSpec.scala      |   0
 .../ClusterShardingRolePartitioningSpec.scala      |   0
 .../ClusterShardingSingleShardPerEntitySpec.scala  |   0
 .../cluster/sharding/ClusterShardingSpec.scala     |   0
 .../sharding/ExternalShardAllocationSpec.scala     |   0
 .../sharding/MultiDcClusterShardingSpec.scala      |   0
 .../sharding/MultiNodeClusterShardingConfig.scala  |   0
 .../sharding/MultiNodeClusterShardingSpec.scala    |   0
 .../RollingUpdateShardAllocationSpec.scala         |   0
 .../src/test/resources/adaptivity-trace.conf       |   2 +-
 .../src/test/resources/arc-trace-database.conf     |   2 +-
 .../src/test/resources/arc-trace-search.conf       |   2 +-
 .../src/test/resources/lirs-trace-glimpse.conf     |   2 +-
 .../src/test/resources/lirs-trace-multi.conf       |   2 +-
 .../src/test/resources/lirs-trace-postgres.conf    |   2 +-
 .../src/test/resources/lirs2-trace-w106.conf       |   2 +-
 .../src/test/resources/reference.conf              |   0
 .../src/test/resources/synthetic-loop.conf         |   2 +-
 .../src/test/resources/synthetic-zipfian.conf      |   2 +-
 .../src/test/resources/text-moby-dick.conf         |   2 +-
 .../src/test/resources/wikipedia-trace-2018.conf   |   2 +-
 .../sharding/ClusterShardingHealthCheckSpec.scala  |   0
 .../sharding/ClusterShardingInternalsSpec.scala    |   0
 .../sharding/ClusterShardingLeaseSpec.scala        |   0
 .../sharding/ClusterShardingSettingsSpec.scala     |   0
 .../sharding/ConcurrentStartupShardingSpec.scala   |   0
 .../sharding/CoordinatedShutdownShardingSpec.scala |   0
 ...eprecatedLeastShardAllocationStrategySpec.scala |   0
 .../pekko/cluster/sharding/EntitiesSpec.scala      |   0
 .../cluster/sharding/EntityTerminationSpec.scala   |   0
 .../cluster/sharding/GetShardTypeNamesSpec.scala   |   0
 .../JoinConfigCompatCheckShardingSpec.scala        |   0
 ...eastShardAllocationStrategyRandomizedSpec.scala |   0
 .../LeastShardAllocationStrategySpec.scala         |   0
 .../sharding/PersistentShardingMigrationSpec.scala |   0
 .../pekko/cluster/sharding/ProxyShardingSpec.scala |   0
 .../RememberEntitiesAndStartEntitySpec.scala       |   0
 .../RememberEntitiesBatchedUpdatesSpec.scala       |   0
 .../sharding/RememberEntitiesFailureSpec.scala     |   0
 ...ememberEntitiesShardIdExtractorChangeSpec.scala |   0
 .../RemoveInternalClusterShardingDataSpec.scala    |   0
 .../pekko/cluster/sharding/ShardRegionSpec.scala   |   0
 .../cluster/sharding/ShardWithLeaseSpec.scala      |   0
 .../cluster/sharding/ShardingQueriesSpec.scala     |   0
 .../pekko/cluster/sharding/StartEntitySpec.scala   |   0
 .../pekko/cluster/sharding/SupervisionSpec.scala   |   0
 .../ExternalShardAllocationStrategySpec.scala      |   0
 .../internal/RememberEntitiesShardStoreSpec.scala  |   0
 .../internal/RememberEntitiesStarterSpec.scala     |   0
 .../sharding/passivation/CompositeSpec.scala       |   0
 .../passivation/EntityPassivationSpec.scala        |   0
 .../HillClimbingAdmissionOptimizerSpec.scala       |   0
 .../cluster/sharding/passivation/IdleSpec.scala    |   0
 .../passivation/LeastFrequentlyUsedSpec.scala      |   0
 .../passivation/LeastRecentlyUsedSpec.scala        |   0
 .../passivation/MostRecentlyUsedSpec.scala         |   0
 .../passivation/simulator/AccessPattern.scala      |   0
 .../sharding/passivation/simulator/Simulator.scala |   0
 .../passivation/simulator/SimulatorSettings.scala  |   0
 .../passivation/simulator/SimulatorStats.scala     |   0
 .../ClusterShardingMessageSerializerSpec.scala     |   0
 .../client/protobuf/msg/ClusterClientMessages.java |   0
 .../protobuf/msg/DistributedPubSubMessages.java    |   0
 .../src/main/protobuf/ClusterClientMessages.proto  |   0
 .../main/protobuf/DistributedPubSubMessages.proto  |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/cluster/client/ClusterClient.scala       |   0
 .../protobuf/ClusterClientMessageSerializer.scala  |   0
 .../cluster/pubsub/DistributedPubSubMediator.scala |   0
 .../pekko/cluster/pubsub/PerGroupingBuffer.scala   |   0
 .../DistributedPubSubMessageSerializer.scala       |   0
 .../singleton/ClusterSingletonManager.scala        |   0
 .../cluster/singleton/ClusterSingletonProxy.scala  |   0
 .../ClusterSingletonMessageSerializer.scala        |   0
 .../cluster/client/ClusterClientHandoverSpec.scala |   0
 .../pekko/cluster/client/ClusterClientSpec.scala   |   0
 .../cluster/client/ClusterClientStopSpec.scala     |   0
 .../pubsub/DistributedPubSubMediatorSpec.scala     |   0
 .../pubsub/DistributedPubSubRestartSpec.scala      |   0
 .../ClusterSingletonManagerChaosSpec.scala         |   0
 .../ClusterSingletonManagerDownedSpec.scala        |   0
 .../ClusterSingletonManagerLeaseSpec.scala         |   0
 .../ClusterSingletonManagerLeave2Spec.scala        |   0
 .../ClusterSingletonManagerLeaveSpec.scala         |   0
 ...rSingletonManagerPreparingForShutdownSpec.scala |   0
 .../singleton/ClusterSingletonManagerSpec.scala    |   0
 .../ClusterSingletonManagerStartupSpec.scala       |   0
 .../singleton/MultiDcSingletonManagerSpec.scala    |   0
 .../pekko/cluster/client/ClusterClientTest.java    |   0
 .../pubsub/DistributedPubSubMediatorTest.java      |   0
 .../singleton/ClusterSingletonManagerTest.java     |   0
 .../apache/pekko/cluster/singleton/Consumer.java   |   0
 .../cluster/singleton/TestSingletonMessages.java   |   0
 .../ClusterClientMessageSerializerSpec.scala       |   0
 .../DistributedPubSubMediatorDeadLettersSpec.scala |   0
 .../DistributedPubSubMediatorRouterSpec.scala      |   0
 .../DistributedPubSubMessageSerializerSpec.scala   |   0
 .../singleton/ClusterSingletonLeaseSpec.scala      |   0
 .../ClusterSingletonLeavingSpeedSpec.scala         |   0
 .../singleton/ClusterSingletonProxySpec.scala      |   0
 .../singleton/ClusterSingletonRestart2Spec.scala   |   0
 .../singleton/ClusterSingletonRestartSpec.scala    |   0
 .../ClusterSingletonMessageSerializerSpec.scala    |   0
 .../typed/internal/protobuf/ClusterMessages.java   |   0
 .../typed/internal/protobuf/ReliableDelivery.java  |   0
 .../src/main/protobuf/ClusterMessages.proto        |   0
 .../src/main/protobuf/ReliableDelivery.proto       |   0
 .../src/main/resources/reference.conf              |   0
 .../receptionist/ClusterReceptionistProtocol.scala |   0
 .../receptionist/ClusterReceptionistProtocol.scala |   0
 .../receptionist/ClusterReceptionistProtocol.scala |   0
 .../ddata/typed/internal/ReplicatorBehavior.scala  |   0
 .../ddata/typed/javadsl/DistributedData.scala      |   0
 .../cluster/ddata/typed/javadsl/Replicator.scala   |   0
 .../typed/javadsl/ReplicatorMessageAdapter.scala   |   0
 .../ddata/typed/javadsl/ReplicatorSettings.scala   |   0
 .../ddata/typed/scaladsl/DistributedData.scala     |   0
 .../cluster/ddata/typed/scaladsl/Replicator.scala  |   0
 .../typed/scaladsl/ReplicatorMessageAdapter.scala  |   0
 .../ddata/typed/scaladsl/ReplicatorSettings.scala  |   0
 .../cluster/ddata/typed/scaladsl/package.scala     |   0
 .../org/apache/pekko/cluster/typed/Cluster.scala   |   0
 .../pekko/cluster/typed/ClusterSingleton.scala     |   0
 .../typed/internal/AdaptedClusterImpl.scala        |   0
 .../internal/AdaptedClusterSingletonImpl.scala     |   0
 .../internal/PekkoClusterTypedSerializer.scala     |   0
 .../delivery/ReliableDeliverySerializer.scala      |   0
 .../receptionist/ClusterReceptionist.scala         |   0
 .../ClusterReceptionistConfigCompatChecker.scala   |   0
 .../receptionist/ClusterReceptionistSettings.scala |   0
 .../typed/internal/receptionist/Registry.scala     |   0
 .../src/multi-jvm/resources/logback-test.xml       |   0
 .../cluster/typed/ChunkLargeMessageSpec.scala      |   0
 .../typed/MultiDcClusterSingletonSpec.scala        |   0
 .../apache/pekko/cluster/typed/MultiDcPinger.scala |   0
 .../cluster/typed/MultiNodeTypedClusterSpec.scala  |   0
 .../apache/pekko/cluster/typed/PubSubSpec.scala    |   0
 .../ClusterReceptionistUnreachabilitySpec.scala    |   0
 .../ddata/typed/javadsl/ReplicatorDocSample.java   |   0
 .../ddata/typed/javadsl/ReplicatorDocTest.java     |   0
 .../cluster/typed/BasicClusterExampleTest.java     |   0
 .../cluster/typed/PingSerializerExampleTest.java   |   0
 .../pekko/cluster/typed/ReceptionistExample.java   |   0
 .../cluster/typed/SingletonCompileOnlyTest.java    |   0
 .../apache/pekko/cluster/typed/ClusterApiTest.java |   0
 .../src/test/resources/logback-test.xml            |   0
 .../ddata/typed/scaladsl/ReplicatorDocSpec.scala   |   0
 .../cluster/typed/BasicClusterExampleSpec.scala    |   0
 .../cluster/typed/DistributedPubSubExample.scala   |   0
 .../pekko/cluster/typed/PingSerializer.scala       |   0
 .../pekko/cluster/typed/ReceptionistExample.scala  |   0
 .../cluster/typed/SingletonCompileOnlySpec.scala   |   0
 .../typed/scaladsl/ReplicatorCompileOnlyTest.scala |   0
 .../ddata/typed/scaladsl/ReplicatorSpec.scala      |   0
 .../typed/ActorRefIgnoreSerializationSpec.scala    |   0
 .../pekko/cluster/typed/ActorSystemSpec.scala      |   0
 .../cluster/typed/ClusterActorLoggingSpec.scala    |   0
 .../pekko/cluster/typed/ClusterApiSpec.scala       |   0
 .../typed/ClusterDispatcherSelectorSpec.scala      |   0
 .../cluster/typed/ClusterSingletonApiSpec.scala    |   0
 .../typed/ClusterSingletonPoisonPillSpec.scala     |   0
 .../pekko/cluster/typed/GroupRouterSpec.scala      |   0
 .../pekko/cluster/typed/RemoteContextAskSpec.scala |   0
 .../cluster/typed/RemoteDeployNotAllowedSpec.scala |   0
 .../pekko/cluster/typed/RemoteMessageSpec.scala    |   0
 .../internal/PekkoClusterTypedSerializerSpec.scala |   0
 .../delivery/ReliableDeliverySerializerSpec.scala  |   0
 .../receptionist/ClusterReceptionistSpec.scala     |   0
 .../ClusterReceptionistStateSpec.scala             |   0
 {akka-cluster => cluster}/jmx-client/LICENSES      |   0
 {akka-cluster => cluster}/jmx-client/akka-cluster  |   0
 {akka-cluster => cluster}/jmx-client/jmxsh-R5.jar  | Bin
 .../cluster/protobuf/msg/ClusterMessages.java      |   0
 .../src/main/protobuf/ClusterMessages.proto        |   0
 .../src/main/resources/reference.conf              |   0
 .../scala/org/apache/pekko/cluster/Cluster.scala   |   0
 .../pekko/cluster/ClusterActorRefProvider.scala    |   0
 .../org/apache/pekko/cluster/ClusterDaemon.scala   |   0
 .../org/apache/pekko/cluster/ClusterEvent.scala    |   0
 .../apache/pekko/cluster/ClusterHeartbeat.scala    |   0
 .../org/apache/pekko/cluster/ClusterJmx.scala      |   0
 .../org/apache/pekko/cluster/ClusterLogClass.scala |   0
 .../apache/pekko/cluster/ClusterLogMarker.scala    |   0
 .../org/apache/pekko/cluster/ClusterReadView.scala |   0
 .../pekko/cluster/ClusterRemoteWatcher.scala       |   0
 .../org/apache/pekko/cluster/ClusterSettings.scala |   0
 .../pekko/cluster/CoordinatedShutdownLeave.scala   |   0
 .../pekko/cluster/CrossDcClusterHeartbeat.scala    |   0
 .../org/apache/pekko/cluster/DowningProvider.scala |   0
 .../scala/org/apache/pekko/cluster/Gossip.scala    |   0
 .../cluster/JoinConfigCompatCheckCluster.scala     |   0
 .../pekko/cluster/JoinConfigCompatChecker.scala    |   0
 .../scala/org/apache/pekko/cluster/Member.scala    |   0
 .../org/apache/pekko/cluster/MembershipState.scala |   0
 .../org/apache/pekko/cluster/Reachability.scala    |   0
 .../org/apache/pekko/cluster/SeedNodeProcess.scala |   0
 .../org/apache/pekko/cluster/VectorClock.scala     |   0
 .../protobuf/ClusterMessageSerializer.scala        |   0
 .../cluster/routing/ClusterRouterConfig.scala      |   0
 .../apache/pekko/cluster/sbr/DowningStrategy.scala |   0
 .../pekko/cluster/sbr/SplitBrainResolver.scala     |   0
 .../cluster/sbr/SplitBrainResolverProvider.scala   |   0
 .../cluster/sbr/SplitBrainResolverSettings.scala   |   0
 .../cluster/AttemptSysMsgRedeliverySpec.scala      |   0
 .../ClientDowningNodeThatIsUnreachableSpec.scala   |   0
 .../cluster/ClientDowningNodeThatIsUpSpec.scala    |   0
 .../ClusterAccrualFailureDetectorSpec.scala        |   0
 .../pekko/cluster/ClusterDeathWatchSpec.scala      |   0
 .../apache/pekko/cluster/ClusterShutdownSpec.scala |   0
 .../ClusterWatcherNoClusterWatcheeSpec.scala       |   0
 .../org/apache/pekko/cluster/ConvergenceSpec.scala |   0
 .../DeterministicOldestWhenJoiningSpec.scala       |   0
 .../cluster/DisallowJoinOfTwoClustersSpec.scala    |   0
 ...henOtherHasQuarantinedThisActorSystemSpec.scala |   0
 .../pekko/cluster/InitialHeartbeatSpec.scala       |   0
 .../pekko/cluster/InitialMembersOfNewDcSpec.scala  |   0
 .../apache/pekko/cluster/JoinInProgressSpec.scala  |   0
 .../apache/pekko/cluster/JoinSeedNodeSpec.scala    |   0
 .../pekko/cluster/LargeMessageClusterSpec.scala    |   0
 .../cluster/LeaderDowningAllOtherNodesSpec.scala   |   0
 .../LeaderDowningNodeThatIsUnreachableSpec.scala   |   0
 .../apache/pekko/cluster/LeaderElectionSpec.scala  |   0
 .../apache/pekko/cluster/LeaderLeavingSpec.scala   |   0
 .../scala/org/apache/pekko/cluster/MBeanSpec.scala |   0
 .../apache/pekko/cluster/MemberWeaklyUpSpec.scala  |   0
 .../MembershipChangeListenerExitingSpec.scala      |   0
 .../cluster/MembershipChangeListenerUpSpec.scala   |   0
 .../pekko/cluster/MinMembersBeforeUpSpec.scala     |   0
 .../apache/pekko/cluster/MultiDcClusterSpec.scala  |   0
 .../cluster/MultiDcHeartbeatTakingOverSpec.scala   |   0
 .../apache/pekko/cluster/MultiDcJoin2Spec.scala    |   0
 .../org/apache/pekko/cluster/MultiDcJoinSpec.scala |   0
 .../apache/pekko/cluster/MultiDcLastNodeSpec.scala |   0
 .../pekko/cluster/MultiDcSplitBrainSpec.scala      |   0
 .../pekko/cluster/MultiDcSunnyWeatherSpec.scala    |   0
 .../pekko/cluster/MultiNodeClusterSpec.scala       |   0
 .../org/apache/pekko/cluster/NodeChurnSpec.scala   |   0
 .../cluster/NodeDowningAndBeingRemovedSpec.scala   |   0
 .../NodeLeavingAndExitingAndBeingRemovedSpec.scala |   0
 .../pekko/cluster/NodeLeavingAndExitingSpec.scala  |   0
 .../apache/pekko/cluster/NodeMembershipSpec.scala  |   0
 .../org/apache/pekko/cluster/NodeUpSpec.scala      |   0
 .../apache/pekko/cluster/QuickRestartSpec.scala    |   0
 .../cluster/RemoteFeaturesWithClusterSpec.scala    |   0
 .../pekko/cluster/RestartFirstSeedNodeSpec.scala   |   0
 .../apache/pekko/cluster/RestartNode2Spec.scala    |   0
 .../apache/pekko/cluster/RestartNode3Spec.scala    |   0
 .../org/apache/pekko/cluster/RestartNodeSpec.scala |   0
 .../pekko/cluster/SharedMediaDriverSupport.scala   |   0
 .../pekko/cluster/SingletonClusterSpec.scala       |   0
 .../pekko/cluster/SplitBrainQuarantineSpec.scala   |   0
 .../org/apache/pekko/cluster/SplitBrainSpec.scala  |   0
 .../org/apache/pekko/cluster/StreamRefSpec.scala   |   0
 .../org/apache/pekko/cluster/StressSpec.scala      |   0
 .../apache/pekko/cluster/SunnyWeatherSpec.scala    |   0
 .../cluster/SurviveNetworkInstabilitySpec.scala    |   0
 .../org/apache/pekko/cluster/TransitionSpec.scala  |   0
 .../cluster/UnreachableNodeJoinsAgainSpec.scala    |   0
 .../ClusterConsistentHashingGroupSpec.scala        |   0
 .../ClusterConsistentHashingRouterSpec.scala       |   0
 .../cluster/routing/ClusterRoundRobinSpec.scala    |   0
 .../pekko/cluster/routing/UseRoleIgnoredSpec.scala |   0
 .../sbr/DownAllIndirectlyConnected5NodeSpec.scala  |   0
 .../cluster/sbr/DownAllUnstable5NodeSpec.scala     |   0
 .../cluster/sbr/IndirectlyConnected3NodeSpec.scala |   0
 .../cluster/sbr/IndirectlyConnected5NodeSpec.scala |   0
 .../pekko/cluster/sbr/LeaseMajority5NodeSpec.scala |   0
 .../pekko/cluster/ClusterJavaCompileTest.java      |   0
 .../apache/pekko/cluster/ClusterConfigSpec.scala   |   0
 .../ClusterDeathWatchNotificationSpec.scala        |   0
 .../apache/pekko/cluster/ClusterDeployerSpec.scala |   0
 .../cluster/ClusterDomainEventPublisherSpec.scala  |   0
 .../pekko/cluster/ClusterDomainEventSpec.scala     |   0
 .../cluster/ClusterHeartbeatReceiverSpec.scala     |   0
 .../pekko/cluster/ClusterHeartbeatSenderSpec.scala |   0
 .../cluster/ClusterHeartbeatSenderStateSpec.scala  |   0
 .../org/apache/pekko/cluster/ClusterLogSpec.scala  |   0
 .../org/apache/pekko/cluster/ClusterSpec.scala     |   0
 .../org/apache/pekko/cluster/ClusterTestKit.scala  |   0
 .../pekko/cluster/CrossDcHeartbeatSenderSpec.scala |   0
 .../apache/pekko/cluster/DowningProviderSpec.scala |   0
 .../pekko/cluster/FailureDetectorPuppet.scala      |   0
 .../org/apache/pekko/cluster/GossipSpec.scala      |   0
 .../pekko/cluster/GossipTargetSelectorSpec.scala   |   0
 .../pekko/cluster/HeartbeatNodeRingPerfSpec.scala  |   0
 .../pekko/cluster/HeartbeatNodeRingSpec.scala      |   0
 .../cluster/JoinConfigCompatCheckClusterSpec.scala |   0
 .../JoinConfigCompatCheckerRollingUpdateSpec.scala |   0
 .../cluster/JoinConfigCompatCheckerSpec.scala      |   0
 .../JoinConfigCompatPreDefinedChecksSpec.scala     |   0
 .../apache/pekko/cluster/MemberOrderingSpec.scala  |   0
 .../apache/pekko/cluster/MembershipStateSpec.scala |   0
 .../pekko/cluster/ReachabilityPerfSpec.scala       |   0
 .../apache/pekko/cluster/ReachabilitySpec.scala    |   0
 .../cluster/ResetSystemMessageSeqNrSpec.scala      |   0
 .../cluster/ShutdownAfterJoinSeedNodesSpec.scala   |   0
 .../pekko/cluster/StartupWithOneThreadSpec.scala   |   0
 .../org/apache/pekko/cluster/TestMember.scala      |   0
 .../apache/pekko/cluster/VectorClockPerfSpec.scala |   0
 .../org/apache/pekko/cluster/VectorClockSpec.scala |   0
 .../protobuf/ClusterMessageSerializerSpec.scala    |   0
 .../routing/ClusterRouterSupervisorSpec.scala      |   0
 .../pekko/cluster/sbr/LeaseMajoritySpec.scala      |   0
 .../pekko/cluster/sbr/SplitBrainResolverSpec.scala |   0
 .../apache/pekko/cluster/sbr/TestAddresses.scala   |   0
 .../apache/pekko/cluster/testkit/AutoDown.scala    |   0
 .../pekko/cluster/testkit/AutoDownSpec.scala       |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/coordination/lease/LeaseException.scala  |   0
 .../pekko/coordination/lease/LeaseSettings.scala   |   0
 .../coordination/lease/LeaseUsageSettings.scala    |   0
 .../pekko/coordination/lease/TimeoutSettings.scala |   0
 .../coordination/lease/internal/LeaseAdapter.scala |   0
 .../pekko/coordination/lease/javadsl/Lease.scala   |   0
 .../coordination/lease/javadsl/LeaseProvider.scala |   0
 .../pekko/coordination/lease/scaladsl/Lease.scala  |   0
 .../lease/scaladsl/LeaseProvider.scala             |   0
 .../lease/javadsl/LeaseProviderTest.java           |   0
 .../pekko/coordination/lease/TestLease.scala       |   0
 .../pekko/coordination/lease/TestLeaseActor.scala  |   0
 .../coordination/lease/TimeoutSettingsSpec.scala   |   0
 .../lease/scaladsl/LeaseProviderSpec.scala         |   0
 .../src/main/resources/reference.conf              |   0
 .../org/apache/pekko/discovery/Discovery.scala     |   2 +-
 .../apache/pekko/discovery/ServiceDiscovery.scala  |   0
 .../aggregate/AggregateServiceDiscovery.scala      |   0
 .../discovery/config/ConfigServiceDiscovery.scala  |   0
 .../pekko/discovery/dns/DnsServiceDiscovery.scala  |   0
 .../apache/pekko/discovery/CompileOnlyTest.java    |   0
 .../apache/pekko/discovery/CompileOnlySpec.scala   |   0
 .../discovery/DiscoveryConfigurationSpec.scala     |   0
 .../org/apache/pekko/discovery/LookupSpec.scala    |   0
 .../aggregate/AggregateServiceDiscoverySpec.scala  |   0
 .../config/ConfigServiceDiscoverySpec.scala        |   0
 .../config/ConfigServicesParserSpec.scala          |   0
 .../pekko/discovery/dns/DnsDiscoverySpec.scala     |   0
 .../discovery/dns/DnsServiceDiscoverySpec.scala    |   0
 .../ddata/protobuf/msg/ReplicatedDataMessages.java |   0
 .../ddata/protobuf/msg/ReplicatorMessages.java     |   0
 .../src/main/protobuf/ReplicatedDataMessages.proto |   0
 .../src/main/protobuf/ReplicatorMessages.proto     |   0
 .../src/main/resources/reference.conf              |   0
 .../org/apache/pekko/cluster/ddata/GSet.scala      |   0
 .../org/apache/pekko/cluster/ddata/GSet.scala      |   0
 .../cluster/ddata/DeltaPropagationSelector.scala   |   0
 .../pekko/cluster/ddata/DistributedData.scala      |   0
 .../apache/pekko/cluster/ddata/DurableStore.scala  |   0
 .../apache/pekko/cluster/ddata/EstimatedSize.scala |   0
 .../org/apache/pekko/cluster/ddata/FastMerge.scala |   0
 .../org/apache/pekko/cluster/ddata/Flag.scala      |   0
 .../org/apache/pekko/cluster/ddata/GCounter.scala  |   0
 .../scala/org/apache/pekko/cluster/ddata/Key.scala |   0
 .../org/apache/pekko/cluster/ddata/LWWMap.scala    |   0
 .../apache/pekko/cluster/ddata/LWWRegister.scala   |   0
 .../org/apache/pekko/cluster/ddata/ORMap.scala     |   0
 .../apache/pekko/cluster/ddata/ORMultiMap.scala    |   0
 .../org/apache/pekko/cluster/ddata/ORSet.scala     |   0
 .../org/apache/pekko/cluster/ddata/PNCounter.scala |   0
 .../apache/pekko/cluster/ddata/PNCounterMap.scala  |   0
 .../cluster/ddata/PayloadSizeAggregator.scala      |   0
 .../apache/pekko/cluster/ddata/PruningState.scala  |   0
 .../pekko/cluster/ddata/ReplicatedData.scala       |   0
 .../apache/pekko/cluster/ddata/Replicator.scala    |   0
 .../apache/pekko/cluster/ddata/VersionVector.scala |   0
 .../ddata/protobuf/ReplicatedDataSerializer.scala  |   0
 .../protobuf/ReplicatorMessageSerializer.scala     |   0
 .../ddata/protobuf/SerializationSupport.scala      |   0
 .../pekko/cluster/ddata/DurableDataSpec.scala      |   0
 .../pekko/cluster/ddata/DurablePruningSpec.scala   |   0
 .../cluster/ddata/JepsenInspiredInsertSpec.scala   |   0
 .../pekko/cluster/ddata/PerformanceSpec.scala      |   0
 .../pekko/cluster/ddata/ReplicatorChaosSpec.scala  |   0
 .../pekko/cluster/ddata/ReplicatorDeltaSpec.scala  |   0
 .../pekko/cluster/ddata/ReplicatorGossipSpec.scala |   0
 .../cluster/ddata/ReplicatorMapDeltaSpec.scala     |   0
 .../cluster/ddata/ReplicatorORSetDeltaSpec.scala   |   0
 .../cluster/ddata/ReplicatorPruningSpec.scala      |   0
 .../pekko/cluster/ddata/ReplicatorSpec.scala       |   0
 .../pekko/cluster/ddata/STMultiNodeSpec.scala      |   0
 .../ddata/JavaImplOfDeltaReplicatedData.java       |   0
 .../ddata/JavaImplOfDeltaReplicatedData2.java      |   0
 .../cluster/ddata/JavaImplOfReplicatedData.java    |   0
 .../org/apache/pekko/cluster/ddata/ORMapTest.java  |   0
 .../apache/pekko/cluster/ddata/ORMultiMapTest.java |   0
 .../apache/pekko/cluster/ddata/PNCounterTest.java  |   0
 .../pekko/cluster/ddata/DataEnvelopeSpec.scala     |   0
 .../ddata/DeltaPropagationSelectorSpec.scala       |   0
 .../org/apache/pekko/cluster/ddata/FlagSpec.scala  |   0
 .../apache/pekko/cluster/ddata/GCounterSpec.scala  |   0
 .../org/apache/pekko/cluster/ddata/GSetSpec.scala  |   0
 .../apache/pekko/cluster/ddata/LWWMapSpec.scala    |   0
 .../pekko/cluster/ddata/LWWRegisterSpec.scala      |   0
 .../pekko/cluster/ddata/LocalConcurrencySpec.scala |   0
 .../apache/pekko/cluster/ddata/LotsOfDataBot.scala |   0
 .../org/apache/pekko/cluster/ddata/ORMapSpec.scala |   0
 .../pekko/cluster/ddata/ORMultiMapSpec.scala       |   0
 .../org/apache/pekko/cluster/ddata/ORSetSpec.scala |   0
 .../pekko/cluster/ddata/PNCounterMapSpec.scala     |   0
 .../apache/pekko/cluster/ddata/PNCounterSpec.scala |   0
 .../pekko/cluster/ddata/PruningStateSpec.scala     |   0
 .../cluster/ddata/ReplicatorSettingsSpec.scala     |   0
 .../pekko/cluster/ddata/VersionVectorSpec.scala    |   0
 .../pekko/cluster/ddata/WriteAggregatorSpec.scala  |   0
 .../protobuf/ReplicatedDataSerializerSpec.scala    |   0
 .../protobuf/ReplicatorMessageSerializerSpec.scala |   0
 docs/src/main/paradox/actors.md                    |  12 +-
 docs/src/main/paradox/additional/osgi.md           |   2 +-
 docs/src/main/paradox/cluster-client.md            |  30 ++--
 docs/src/main/paradox/cluster-dc.md                |   6 +-
 docs/src/main/paradox/cluster-metrics.md           |   8 +-
 docs/src/main/paradox/cluster-routing.md           |  10 +-
 docs/src/main/paradox/cluster-sharding.md          |  20 +--
 docs/src/main/paradox/cluster-singleton.md         |  22 +--
 docs/src/main/paradox/cluster-usage.md             |  22 +--
 .../paradox/common/binary-compatibility-rules.md   |   6 +-
 docs/src/main/paradox/coordinated-shutdown.md      |   2 +-
 docs/src/main/paradox/coordination.md              |   6 +-
 docs/src/main/paradox/discovery/index.md           |  18 +--
 docs/src/main/paradox/distributed-data.md          |   2 +-
 docs/src/main/paradox/distributed-pub-sub.md       |  40 +++---
 .../paradox/durable-state/persistence-query.md     |   4 +-
 docs/src/main/paradox/event-bus.md                 |   2 +-
 .../paradox/general/configuration-reference.md     |  42 +++---
 .../paradox/general/stream/stream-configuration.md |   2 +-
 docs/src/main/paradox/logging.md                   |  10 +-
 docs/src/main/paradox/multi-jvm-testing.md         |   4 +-
 docs/src/main/paradox/multi-node-testing.md        |  12 +-
 docs/src/main/paradox/persistence-fsm.md           |  60 ++++----
 docs/src/main/paradox/persistence-journals.md      |  18 +--
 docs/src/main/paradox/persistence-query-leveldb.md |   2 +-
 docs/src/main/paradox/persistence-query.md         |   4 +-
 docs/src/main/paradox/persistence.md               |   8 +-
 docs/src/main/paradox/project/links.md             |   4 +-
 .../paradox/project/migration-guide-2.5.x-2.6.x.md |   4 +-
 docs/src/main/paradox/remoting-artery.md           |   2 +-
 docs/src/main/paradox/remoting.md                  |   8 +-
 docs/src/main/paradox/routing.md                   |   2 +-
 docs/src/main/paradox/serialization-jackson.md     | 114 ++++++++--------
 docs/src/main/paradox/serialization.md             |   4 +-
 docs/src/main/paradox/split-brain-resolver.md      |  16 +--
 docs/src/main/paradox/stream/index.md              |   8 +-
 .../main/paradox/stream/operators/ActorFlow/ask.md |   4 +-
 .../stream/operators/ActorFlow/askWithStatus.md    |   4 +-
 .../ActorSink/actorRefWithBackpressure.md          |   4 +-
 .../stream/operators/ActorSource/actorRef.md       |   4 +-
 .../ActorSource/actorRefWithBackpressure.md        |   4 +-
 .../stream/operators/RetryFlow/withBackoff.md      |   4 +-
 .../operators/RetryFlow/withBackoffAndContext.md   |   4 +-
 .../main/paradox/stream/operators/Sink/collect.md  |   2 +-
 .../main/paradox/stream/operators/Sink/foreach.md  |   4 +-
 .../src/main/paradox/stream/operators/Sink/head.md |   2 +-
 .../src/main/paradox/stream/operators/Sink/last.md |   2 +-
 .../paradox/stream/operators/Sink/lastOption.md    |   2 +-
 .../main/paradox/stream/operators/Sink/reduce.md   |   2 +-
 docs/src/main/paradox/stream/operators/Sink/seq.md |   2 +-
 .../main/paradox/stream/operators/Sink/takeLast.md |   2 +-
 .../stream/operators/Source-or-Flow/concat.md      |   2 +-
 .../operators/Source-or-Flow/concatAllLazy.md      |   2 +-
 .../stream/operators/Source-or-Flow/concatLazy.md  |   2 +-
 .../stream/operators/Source-or-Flow/interleave.md  |   2 +-
 .../operators/Source-or-Flow/interleaveAll.md      |   2 +-
 .../stream/operators/Source-or-Flow/merge.md       |   2 +-
 .../stream/operators/Source-or-Flow/mergeAll.md    |   2 +-
 .../operators/Source-or-Flow/mergePreferred.md     |   2 +-
 .../operators/Source-or-Flow/mergePrioritized.md   |   2 +-
 .../stream/operators/Source-or-Flow/mergeSorted.md |   2 +-
 .../stream/operators/Source-or-Flow/orElse.md      |   2 +-
 .../stream/operators/Source-or-Flow/prepend.md     |   2 +-
 .../stream/operators/Source-or-Flow/prependLazy.md |   2 +-
 .../paradox/stream/operators/Source-or-Flow/zip.md |   2 +-
 .../stream/operators/Source-or-Flow/zipWith.md     |   2 +-
 .../operators/Source-or-Flow/zipWithIndex.md       |   2 +-
 .../stream/operators/Source/asSubscriber.md        |   2 +-
 .../main/paradox/stream/operators/Source/cycle.md  |   8 +-
 .../stream/operators/Source/fromPublisher.md       |   2 +-
 .../stream/operators/Source/mergePrioritizedN.md   |   2 +-
 .../main/paradox/stream/operators/Source/repeat.md |   4 +-
 .../main/paradox/stream/operators/Source/single.md |   4 +-
 docs/src/main/paradox/stream/stream-dynamic.md     |   2 +-
 docs/src/main/paradox/stream/stream-graphs.md      |  14 +-
 docs/src/main/paradox/stream/stream-io.md          |   8 +-
 docs/src/main/paradox/stream/stream-refs.md        |   2 +-
 docs/src/main/paradox/testing.md                   |   8 +-
 docs/src/main/paradox/typed/actor-discovery.md     |  24 ++--
 docs/src/main/paradox/typed/actor-lifecycle.md     |  36 ++---
 docs/src/main/paradox/typed/actors.md              |  62 ++++-----
 docs/src/main/paradox/typed/cluster-dc.md          |  16 +--
 .../typed/cluster-sharded-daemon-process.md        |  10 +-
 docs/src/main/paradox/typed/cluster-sharding.md    |  96 ++++++-------
 docs/src/main/paradox/typed/cluster-singleton.md   |  26 ++--
 docs/src/main/paradox/typed/cluster.md             |  40 +++---
 docs/src/main/paradox/typed/coexisting.md          |  38 +++---
 docs/src/main/paradox/typed/dispatchers.md         |   6 +-
 docs/src/main/paradox/typed/distributed-data.md    |  20 +--
 docs/src/main/paradox/typed/distributed-pub-sub.md |  20 +--
 .../typed/durable-state/persistence-style.md       |   6 +-
 .../paradox/typed/durable-state/persistence.md     |  84 ++++++------
 docs/src/main/paradox/typed/extending.md           |  18 +--
 docs/src/main/paradox/typed/fault-tolerance.md     |  40 +++---
 docs/src/main/paradox/typed/from-classic.md        |  12 +-
 docs/src/main/paradox/typed/fsm.md                 |  12 +-
 .../src/main/paradox/typed/interaction-patterns.md |  80 +++++------
 docs/src/main/paradox/typed/logging.md             |  34 ++---
 docs/src/main/paradox/typed/mailboxes.md           |   6 +-
 docs/src/main/paradox/typed/persistence-fsm.md     |  16 +--
 .../src/main/paradox/typed/persistence-snapshot.md |  24 ++--
 docs/src/main/paradox/typed/persistence-style.md   |  12 +-
 docs/src/main/paradox/typed/persistence-testing.md |  16 +--
 docs/src/main/paradox/typed/persistence.md         | 116 ++++++++--------
 docs/src/main/paradox/typed/reliable-delivery.md   |  38 +++---
 .../typed/replicated-eventsourcing-auction.md      |  26 ++--
 .../paradox/typed/replicated-eventsourcing-cart.md |   4 +-
 .../main/paradox/typed/replicated-eventsourcing.md |  44 +++---
 docs/src/main/paradox/typed/routers.md             |  28 ++--
 docs/src/main/paradox/typed/stash.md               |   4 +-
 docs/src/main/paradox/typed/style-guide.md         |  88 ++++++------
 docs/src/main/paradox/typed/testing-async.md       |  66 ++++-----
 docs/src/main/paradox/typed/testing-sync.md        |  36 ++---
 docs/src/main/paradox/typed/testing.md             |   6 +-
 .../testconductor/TestConductorProtocol.java       |   0
 .../src/main/protobuf/TestConductorProtocol.proto  |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/remote/testconductor/Conductor.scala     |   0
 .../pekko/remote/testconductor/DataTypes.scala     |   0
 .../pekko/remote/testconductor/Extension.scala     |   0
 .../apache/pekko/remote/testconductor/Player.scala |   0
 .../remote/testconductor/RemoteConnection.scala    |   0
 .../pekko/remote/testkit/MultiNodeSpec.scala       |   0
 .../pekko/remote/testkit/PerfFlamesSupport.scala   |   0
 .../apache/pekko/osgi/ActorSystemActivator.scala   |   0
 .../pekko/osgi/BundleDelegatingClassLoader.scala   |   0
 .../org/apache/pekko/osgi/DefaultOSGiLogger.scala  |   0
 .../apache/pekko/osgi/OsgiActorSystemFactory.scala |   0
 .../src/test/resources/logback-test.xml            |   2 +-
 .../src/test/scala/docs/osgi/Activator.scala       |   0
 .../src/test/scala/docs/osgi/blueprint.xml         |   0
 .../pekko/osgi/ActorSystemActivatorTest.scala      |   0
 .../org/apache/pekko/osgi/PojoSRTestSupport.scala  |   2 +-
 .../org/apache/pekko/osgi/test/PingPong.scala      |   0
 .../apache/pekko/osgi/test/TestActivators.scala    |   0
 .../query/internal/protobuf/QueryMessages.java     |   0
 .../src/main/protobuf/QueryMessages.proto          |   0
 .../src/main/resources/reference.conf              |   0
 .../persistence/query/DurableStateChange.scala     |   0
 .../pekko/persistence/query/EventEnvelope.scala    |   0
 .../apache/pekko/persistence/query/Offset.scala    |   0
 .../pekko/persistence/query/PersistenceQuery.scala |   0
 .../persistence/query/ReadJournalProvider.scala    |   0
 .../query/internal/QuerySerializer.scala           |   0
 .../CurrentEventsByPersistenceIdQuery.scala        |   0
 .../query/javadsl/CurrentEventsByTagQuery.scala    |   0
 .../query/javadsl/CurrentPersistenceIdsQuery.scala |   0
 ...DurableStateStorePagedPersistenceIdsQuery.scala |   0
 .../query/javadsl/DurableStateStoreQuery.scala     |   0
 .../query/javadsl/EventsByPersistenceIdQuery.scala |   0
 .../query/javadsl/EventsByTagQuery.scala           |   0
 .../query/javadsl/PagedPersistenceIdsQuery.scala   |   0
 .../query/javadsl/PersistenceIdsQuery.scala        |   0
 .../persistence/query/javadsl/ReadJournal.scala    |   0
 .../journal/leveldb/AllPersistenceIdsStage.scala   |   0
 .../persistence/query/journal/leveldb/Buffer.scala |   0
 .../leveldb/EventsByPersistenceIdStage.scala       |   0
 .../query/journal/leveldb/EventsByTagStage.scala   |   0
 .../leveldb/LeveldbReadJournalProvider.scala       |   0
 .../leveldb/javadsl/LeveldbReadJournal.scala       |   0
 .../leveldb/scaladsl/LeveldbReadJournal.scala      |   0
 .../CurrentEventsByPersistenceIdQuery.scala        |   0
 .../query/scaladsl/CurrentEventsByTagQuery.scala   |   0
 .../scaladsl/CurrentPersistenceIdsQuery.scala      |   0
 ...DurableStateStorePagedPersistenceIdsQuery.scala |   0
 .../query/scaladsl/DurableStateStoreQuery.scala    |   0
 .../scaladsl/EventsByPersistenceIdQuery.scala      |   0
 .../query/scaladsl/EventsByTagQuery.scala          |   0
 .../query/scaladsl/PagedPersistenceIdsQuery.scala  |   0
 .../query/scaladsl/PersistenceIdsQuery.scala       |   0
 .../persistence/query/scaladsl/ReadJournal.scala   |   0
 .../persistence/query/typed/EventEnvelope.scala    |   0
 .../typed/javadsl/CurrentEventsBySliceQuery.scala  |   0
 .../javadsl/DurableStateStoreBySliceQuery.scala    |   0
 .../query/typed/javadsl/EventTimestampQuery.scala  |   0
 .../query/typed/javadsl/EventsBySliceQuery.scala   |   0
 .../query/typed/javadsl/LoadEventQuery.scala       |   0
 .../typed/scaladsl/CurrentEventsBySliceQuery.scala |   0
 .../scaladsl/DurableStateStoreBySliceQuery.scala   |   0
 .../query/typed/scaladsl/EventTimestampQuery.scala |   0
 .../query/typed/scaladsl/EventsBySliceQuery.scala  |   0
 .../query/typed/scaladsl/LoadEventQuery.scala      |   0
 .../persistence/query/DummyJavaReadJournal.java    |   0
 .../query/DummyJavaReadJournalForScala.java        |   0
 .../query/DummyJavaReadJournalProvider.java        |   0
 .../persistence/query/PersistenceQueryTest.java    |   0
 .../pekko/persistence/query/DummyReadJournal.scala |   0
 .../pekko/persistence/query/OffsetSpec.scala       |   0
 .../persistence/query/PersistenceQuerySpec.scala   |   0
 .../query/internal/QuerySerializerSpec.scala       |   0
 .../journal/leveldb/AllPersistenceIdsSpec.scala    |   0
 .../query/journal/leveldb/Cleanup.scala            |   0
 .../leveldb/EventsByPersistenceIdSpec.scala        |   0
 .../query/journal/leveldb/EventsByTagSpec.scala    |   0
 .../query/journal/leveldb/TestActor.scala          |   0
 .../leveldb/PersistencePluginProxySpec.scala       |   0
 .../journal/leveldb/SharedLeveldbJournalSpec.scala |   0
 .../persistence/serialization/SerializerSpec.scala |   0
 .../apache/pekko/persistence/CapabilityFlags.scala |   0
 .../org/apache/pekko/persistence/PluginSpec.scala  |   0
 .../apache/pekko/persistence/TestSerializer.scala  |   0
 .../japi/journal/JavaJournalPerfSpec.scala         |   0
 .../persistence/japi/journal/JavaJournalSpec.scala |   0
 .../japi/snapshot/JavaSnapshotStoreSpec.scala      |   0
 .../persistence/journal/JournalPerfSpec.scala      |   0
 .../pekko/persistence/journal/JournalSpec.scala    |   0
 .../pekko/persistence/scalatest/MayVerb.scala      |   0
 .../persistence/scalatest/OptionalTests.scala      |   0
 .../persistence/snapshot/SnapshotStoreSpec.scala   |   0
 .../apache/pekko/persistence/PluginCleanup.scala   |   0
 .../persistence/japi/JavaJournalSpecSpec.scala     |   0
 .../journal/inmem/InmemJournalSpec.scala           |   0
 .../journal/leveldb/LeveldbJournalJavaSpec.scala   |   0
 .../journal/leveldb/LeveldbJournalNativeSpec.scala |   0
 ...bJournalNoAtomicPersistMultipleEventsSpec.scala |   0
 .../snapshot/local/LocalSnapshotStoreSpec.scala    |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/persistence/testkit/EventStorage.scala   |   0
 .../testkit/PersistenceTestKitPlugin.scala         |   0
 .../persistence/testkit/ProcessingPolicy.scala     |   0
 .../persistence/testkit/SnapshotStorage.scala      |   0
 .../persistence/testkit/internal/CurrentTime.scala |   0
 .../internal/EventSourcedBehaviorTestKitImpl.scala |   0
 .../testkit/internal/InMemStorageExtension.scala   |   0
 .../testkit/internal/PersistenceInitImpl.scala     |   0
 .../internal/SerializedEventStorageImpl.scala      |   0
 .../internal/SerializedSnapshotStorageImpl.scala   |   0
 .../testkit/internal/SimpleEventStorageImpl.scala  |   0
 .../internal/SimpleSnapshotStorageImpl.scala       |   0
 .../SnapshotStorageEmulatorExtension.scala         |   0
 .../testkit/internal/TestKitStorage.scala          |   0
 .../javadsl/EventSourcedBehaviorTestKit.scala      |   0
 .../testkit/javadsl/PersistenceInit.scala          |   0
 .../testkit/javadsl/PersistenceTestKit.scala       |   0
 .../testkit/javadsl/SnapshotTestKit.scala          |   0
 .../PersistenceTestKitReadJournalProvider.scala    |   0
 .../internal/EventsByPersistenceIdStage.scala      |   0
 .../javadsl/PersistenceTestKitReadJournal.scala    |   0
 .../scaladsl/PersistenceTestKitReadJournal.scala   |   0
 .../scaladsl/EventSourcedBehaviorTestKit.scala     |   0
 .../testkit/scaladsl/PersistenceInit.scala         |   0
 .../testkit/scaladsl/PersistenceTestKit.scala      |   0
 .../persistence/testkit/scaladsl/TestOps.scala     |   0
 ...rsistenceTestKitDurableStateStoreProvider.scala |   0
 .../PersistenceTestKitDurableStateStore.scala      |   0
 .../PersistenceTestKitDurableStateStore.scala      |   0
 .../src/test/resources/application.conf            |   0
 .../src/test/resources/logback-test.xml            |   0
 .../pekko/persistence/testkit/CommonUtils.scala    |   0
 .../testkit/javadsl/CommonSnapshotTests.scala      |   0
 .../testkit/javadsl/CommonTestKitTests.scala       |   0
 .../persistence/testkit/javadsl/JavaDslUtils.scala |   0
 .../testkit/javadsl/SnapshotNotSerializeSpec.scala |   0
 .../testkit/javadsl/SnapshotSerializeSpec.scala    |   0
 .../testkit/javadsl/TestKitNotSerializeSpec.scala  |   0
 .../testkit/javadsl/TestKitSerializeSpec.scala     |   0
 .../testkit/query/CurrentEventsBySlicesSpec.scala  |   0
 .../testkit/query/CurrentEventsByTagSpec.scala     |   0
 .../testkit/query/EventsByPersistenceIdSpec.scala  |   0
 .../testkit/scaladsl/CommonSnapshotTests.scala     |   0
 .../testkit/scaladsl/CommonTestKitTests.scala      |   0
 ...EventSourcedBehaviorNoSnapshotTestKitSpec.scala |   0
 .../scaladsl/EventSourcedBehaviorTestKitSpec.scala |   0
 .../testkit/scaladsl/MultipleJournalsSpec.scala    |   0
 .../PersistenceTestKitJournalCompatSpec.scala      |   0
 .../testkit/scaladsl/ScalaDslUtils.scala           |   0
 .../scaladsl/SnapshotNotSerializeSpec.scala        |   0
 .../testkit/scaladsl/SnapshotSerializeSpec.scala   |   0
 .../testkit/scaladsl/TestKitNotSerializeSpec.scala |   0
 .../testkit/scaladsl/TestKitSerializeSpec.scala    |   0
 .../PersistenceTestKitDurableStateStoreSpec.scala  |   0
 .../persistence/typed/MyReplicatedBehavior.java    |   0
 .../typed/ReplicatedAuctionExampleTest.java        |   0
 .../persistence/typed/ReplicatedBlogExample.java   |   0
 .../persistence/typed/ReplicatedMovieExample.java  |   0
 .../typed/ReplicatedShoppingCartExample.java       |   0
 .../persistence/typed/ReplicatedStringSet.java     |   0
 .../typed/ReplicatedEventSourcingTest.java         |   0
 .../javadsl/EventSourcedActorFailureTest.java      |   0
 .../javadsl/EventSourcedBehaviorJavaDslTest.java   |   0
 .../src/test/resources/logback-test.xml            |   0
 .../typed/ReplicatedAuctionExampleSpec.scala       |   0
 .../typed/ReplicatedBlogExampleSpec.scala          |   0
 .../ReplicatedEventSourcingCompileOnlySpec.scala   |   0
 .../ReplicatedMovieWatchListExampleSpec.scala      |   0
 .../typed/ReplicatedShoppingCartExampleSpec.scala  |   0
 .../persistence/typed/EventPublishingSpec.scala    |   0
 .../typed/EventSourcedBehaviorLoggingSpec.scala    |   0
 .../typed/MultiJournalReplicationSpec.scala        |   0
 .../typed/ReplicatedEventPublishingSpec.scala      |   0
 .../typed/ReplicatedEventSourcingSpec.scala        |   0
 .../typed/ReplicatedEventSourcingTaggingSpec.scala |   0
 .../persistence/typed/ReplicationBaseSpec.scala    |   0
 .../typed/ReplicationIllegalAccessSpec.scala       |   0
 .../typed/ReplicationSnapshotSpec.scala            |   0
 .../pekko/persistence/typed/crdt/CounterSpec.scala |   0
 .../pekko/persistence/typed/crdt/LwwSpec.scala     |   0
 .../pekko/persistence/typed/crdt/ORSetSpec.scala   |   0
 .../ReplicatedEventSourcingJacksonSpec.scala       |   0
 .../scaladsl/EventSourcedBehaviorFailureSpec.scala |   0
 .../EventSourcedBehaviorInterceptorSpec.scala      |   0
 .../EventSourcedBehaviorRecoveryTimeoutSpec.scala  |   0
 .../scaladsl/EventSourcedBehaviorReplySpec.scala   |   0
 .../EventSourcedBehaviorRetentionSpec.scala        |   0
 .../typed/scaladsl/EventSourcedBehaviorSpec.scala  |   0
 .../scaladsl/EventSourcedBehaviorStashSpec.scala   |   0
 .../scaladsl/EventSourcedBehaviorTimersSpec.scala  |   0
 .../scaladsl/EventSourcedBehaviorWatchSpec.scala   |   0
 .../scaladsl/EventSourcedEventAdapterSpec.scala    |   0
 .../scaladsl/EventSourcedSequenceNumberSpec.scala  |   0
 .../scaladsl/EventSourcedSnapshotAdapterSpec.scala |   0
 .../scaladsl/EventSourcedStashOverflowSpec.scala   |   0
 .../typed/scaladsl/LoggerSourceSpec.scala          |   0
 .../typed/scaladsl/NullEmptyStateSpec.scala        |   0
 .../typed/scaladsl/OptionalSnapshotStoreSpec.scala |   0
 .../typed/scaladsl/PerformanceSpec.scala           |   0
 .../typed/scaladsl/PrimitiveStateSpec.scala        |   0
 .../typed/scaladsl/SlowInMemorySnapshotStore.scala |   0
 .../typed/scaladsl/SnapshotMutableStateSpec.scala  |   0
 .../SnapshotRecoveryWithEmptyJournalSpec.scala     |   0
 .../DurableStateBehaviorInterceptorSpec.scala      |   0
 .../scaladsl/DurableStateBehaviorReplySpec.scala   |   0
 .../scaladsl/DurableStateBehaviorTimersSpec.scala  |   0
 .../state/scaladsl/DurableStateRevisionSpec.scala  |   0
 .../typed/state/scaladsl/NullEmptyStateSpec.scala  |   0
 .../typed/state/scaladsl/PrimitiveStateSpec.scala  |   0
 .../serialization/ReplicatedEventSourcing.java     |   0
 .../main/protobuf/ReplicatedEventSourcing.proto    |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/persistence/typed/EventAdapter.scala     |   0
 .../persistence/typed/EventRejectedException.scala |   0
 .../persistence/typed/EventSourcedSignal.scala     |   0
 .../pekko/persistence/typed/PersistenceId.scala    |   0
 .../pekko/persistence/typed/PublishedEvent.scala   |   0
 .../apache/pekko/persistence/typed/ReplicaId.scala |   0
 .../pekko/persistence/typed/ReplicationId.scala    |   0
 .../pekko/persistence/typed/SnapshotAdapter.scala  |   0
 .../typed/SnapshotSelectionCriteria.scala          |   0
 .../pekko/persistence/typed/crdt/Counter.scala     |   0
 .../pekko/persistence/typed/crdt/LwwTime.scala     |   0
 .../pekko/persistence/typed/crdt/ORSet.scala       |   0
 .../pekko/persistence/typed/crdt/OpCrdt.scala      |   0
 .../typed/delivery/EventSourcedProducerQueue.scala |   0
 .../persistence/typed/internal/BehaviorSetup.scala |   0
 .../persistence/typed/internal/EffectImpl.scala    |   0
 .../typed/internal/EventSourcedBehaviorImpl.scala  |   0
 .../typed/internal/EventSourcedSettings.scala      |   0
 .../typed/internal/ExternalInteractions.scala      |   0
 .../typed/internal/FastForwardingFilter.scala      |   0
 .../typed/internal/JournalFailureException.scala   |   0
 .../typed/internal/NoOpSnapshotAdapter.scala       |   0
 .../persistence/typed/internal/RecoveryImpl.scala  |   0
 .../typed/internal/ReplayingEvents.scala           |   0
 .../typed/internal/ReplayingSnapshot.scala         |   0
 .../typed/internal/ReplicationSetup.scala          |   0
 .../typed/internal/RequestingRecoveryPermit.scala  |   0
 .../typed/internal/RetentionCriteriaImpl.scala     |   0
 .../pekko/persistence/typed/internal/Running.scala |   0
 .../persistence/typed/internal/SideEffect.scala    |   0
 .../typed/internal/StashManagement.scala           |   0
 .../persistence/typed/internal/VersionVector.scala |   0
 .../persistence/typed/javadsl/CommandHandler.scala |   0
 .../typed/javadsl/CommandHandlerWithReply.scala    |   0
 .../pekko/persistence/typed/javadsl/Effect.scala   |   0
 .../persistence/typed/javadsl/EventHandler.scala   |   0
 .../typed/javadsl/EventSourcedBehavior.scala       |   0
 .../typed/javadsl/PersistentFSMMigration.scala     |   0
 .../pekko/persistence/typed/javadsl/Recovery.scala |   0
 .../javadsl/ReplicatedEventSourcedBehavior.scala   |   0
 .../typed/javadsl/ReplicatedEventSourcing.scala    |   0
 .../typed/javadsl/RetentionCriteria.scala          |   0
 .../persistence/typed/javadsl/SignalHandler.scala  |   0
 .../pekko/persistence/typed/scaladsl/Effect.scala  |   0
 .../typed/scaladsl/EventSourcedBehavior.scala      |   0
 .../typed/scaladsl/PersistentFSMMigration.scala    |   0
 .../persistence/typed/scaladsl/Recovery.scala      |   0
 .../typed/scaladsl/ReplicatedEventSourcing.scala   |   0
 .../typed/scaladsl/RetentionCriteria.scala         |   0
 .../ReplicatedEventSourcingSerializer.scala        |   0
 .../typed/state/DurableStateSignal.scala           |   0
 .../typed/state/internal/BehaviorSetup.scala       |   0
 .../state/internal/DurableStateBehaviorImpl.scala  |   0
 .../state/internal/DurableStateSettings.scala      |   0
 .../internal/DurableStateStoreException.scala      |   0
 .../internal/DurableStateStoreInteractions.scala   |   0
 .../typed/state/internal/EffectImpl.scala          |   0
 .../typed/state/internal/NoOpSnapshotAdapter.scala |   0
 .../typed/state/internal/Recovering.scala          |   0
 .../state/internal/RequestingRecoveryPermit.scala  |   0
 .../persistence/typed/state/internal/Running.scala |   0
 .../typed/state/internal/SideEffect.scala          |   0
 .../typed/state/internal/StashManagement.scala     |   0
 .../typed/state/javadsl/CommandHandler.scala       |   0
 .../state/javadsl/CommandHandlerWithReply.scala    |   0
 .../typed/state/javadsl/DurableStateBehavior.scala |   0
 .../persistence/typed/state/javadsl/Effect.scala   |   0
 .../typed/state/javadsl/SignalHandler.scala        |   0
 .../state/scaladsl/DurableStateBehavior.scala      |   0
 .../persistence/typed/state/scaladsl/Effect.scala  |   0
 .../typed/BasicPersistentBehaviorTest.java         |   0
 .../pekko/persistence/typed/BlogPostEntity.java    |   0
 .../typed/BlogPostEntityDurableState.java          |   0
 .../typed/DurableStatePersistentBehaviorTest.java  |   0
 .../pekko/persistence/typed/MovieWatchList.java    |   0
 .../pekko/persistence/typed/NullBlogState.java     |   0
 .../pekko/persistence/typed/OptionalBlogState.java |   0
 ...rsistentFsmToTypedMigrationCompileOnlyTest.java |   0
 .../pekko/persistence/typed/StashingExample.java   |   0
 .../persistence/typed/WebStoreCustomerFSM.java     |   0
 .../pekko/persistence/typed/auction/Auction.java   |   0
 .../persistence/typed/auction/AuctionCommand.java  |   0
 .../persistence/typed/auction/AuctionEntity.java   |   0
 .../persistence/typed/auction/AuctionEvent.java    |   0
 .../persistence/typed/auction/AuctionState.java    |   0
 .../persistence/typed/auction/AuctionStatus.java   |   0
 .../pekko/persistence/typed/auction/Bid.java       |   0
 .../persistence/typed/auction/BidResultStatus.java |   0
 .../typed/javadsl/LoggerSourceTest.java            |   0
 .../typed/javadsl/NullEmptyStateTest.java          |   0
 .../javadsl/PersistentActorCompileOnlyTest.java    |   0
 .../typed/javadsl/PrimitiveStateTest.java          |   0
 .../src/test/resources/logback-test.xml            |   0
 .../typed/BasicPersistentBehaviorCompileOnly.scala |   0
 .../pekko/persistence/typed/BlogPostEntity.scala   |   0
 .../typed/BlogPostEntityDurableState.scala         |   0
 ...DurableStatePersistentBehaviorCompileOnly.scala |   0
 .../pekko/persistence/typed/MovieWatchList.scala   |   0
 .../typed/PersistentFsmToTypedMigrationSpec.scala  |   0
 .../pekko/persistence/typed/StashingExample.scala  |   0
 .../typed/ClusterSingletonPersistenceSpec.scala    |   0
 .../persistence/typed/ManyRecoveriesSpec.scala     |   0
 .../persistence/typed/PersistenceIdSpec.scala      |   0
 .../ReplicatedEventSourcingSerializationSpec.scala |   0
 .../typed/StashingWhenSnapshottingSpec.scala       |   0
 .../delivery/EventSourcedProducerQueueSpec.scala   |   0
 ...DeliveryWithEventSourcedProducerQueueSpec.scala |   0
 ...kPullingWithEventSourcedProducerQueueSpec.scala |   0
 .../typed/internal/RecoveryPermitterSpec.scala     |   0
 .../typed/internal/RetentionCriteriaSpec.scala     |   0
 .../typed/internal/StashStateSpec.scala            |   0
 .../scaladsl/PersistentActorCompileOnlyTest.scala  |   0
 .../typed/scaladsl/SnapshotIsOptionalSpec.scala    |   0
 .../ReplicatedEventSourcingSerializerSpec.scala    |   0
 .../fsm/japi/pf/FSMStateFunctionBuilder.java       |   0
 .../persistence/fsm/japi/pf/FSMStopBuilder.java    |   0
 .../journal/japi/AsyncRecoveryPlugin.java          |   0
 .../persistence/journal/japi/AsyncWritePlugin.java |   0
 .../persistence/serialization/MessageFormats.java  |   0
 .../snapshot/japi/SnapshotStorePlugin.java         |   0
 .../src/main/protobuf/MessageFormats.proto         |   0
 .../src/main/resources/reference.conf              |   0
 .../org/apache/pekko/persistence/TraitOrder.scala  |   0
 .../org/apache/pekko/persistence/TraitOrder.scala  |   0
 .../pekko/persistence/AtLeastOnceDelivery.scala    |   0
 .../apache/pekko/persistence/Eventsourced.scala    |   0
 .../apache/pekko/persistence/JournalProtocol.scala |   0
 .../org/apache/pekko/persistence/Persistence.scala |   0
 .../pekko/persistence/PersistencePlugin.scala      |   0
 .../org/apache/pekko/persistence/Persistent.scala  |   0
 .../apache/pekko/persistence/PersistentActor.scala |   0
 .../org/apache/pekko/persistence/Protocol.scala    |   0
 .../pekko/persistence/RecoveryPermitter.scala      |   0
 .../pekko/persistence/SnapshotProtocol.scala       |   0
 .../org/apache/pekko/persistence/Snapshotter.scala |   0
 .../pekko/persistence/fsm/PersistentFSM.scala      |   0
 .../pekko/persistence/fsm/PersistentFSMBase.scala  |   0
 .../pekko/persistence/journal/AsyncRecovery.scala  |   0
 .../persistence/journal/AsyncWriteJournal.scala    |   0
 .../persistence/journal/AsyncWriteProxy.scala      |   0
 .../pekko/persistence/journal/EventAdapter.scala   |   0
 .../pekko/persistence/journal/EventAdapters.scala  |   0
 .../journal/PersistencePluginProxy.scala           |   0
 .../pekko/persistence/journal/ReplayFilter.scala   |   0
 .../apache/pekko/persistence/journal/Tagged.scala  |   0
 .../persistence/journal/WriteJournalBase.scala     |   0
 .../persistence/journal/inmem/InmemJournal.scala   |   0
 .../persistence/journal/japi/AsyncRecovery.scala   |   0
 .../journal/japi/AsyncWriteJournal.scala           |   0
 .../journal/leveldb/LeveldbCompaction.scala        |   0
 .../journal/leveldb/LeveldbIdMapping.scala         |   0
 .../journal/leveldb/LeveldbJournal.scala           |   0
 .../persistence/journal/leveldb/LeveldbKey.scala   |   0
 .../journal/leveldb/LeveldbRecovery.scala          |   0
 .../persistence/journal/leveldb/LeveldbStore.scala |   0
 .../journal/leveldb/SharedLeveldbStore.scala       |   0
 .../serialization/MessageSerializer.scala          |   0
 .../serialization/SnapshotSerializer.scala         |   0
 .../pekko/persistence/serialization/package.scala  |   0
 .../persistence/snapshot/NoSnapshotStore.scala     |   0
 .../pekko/persistence/snapshot/SnapshotStore.scala |   0
 .../persistence/snapshot/japi/SnapshotStore.scala  |   0
 .../snapshot/local/LocalSnapshotStore.scala        |   0
 .../state/DurableStateStoreProvider.scala          |   0
 .../state/DurableStateStoreRegistry.scala          |   0
 .../state/javadsl/DurableStateStore.scala          |   0
 .../state/javadsl/DurableStateUpdateStore.scala    |   0
 .../state/scaladsl/DurableStateStore.scala         |   0
 .../state/scaladsl/DurableStateUpdateStore.scala   |   0
 .../persistence/fsm/AbstractPersistentFSMTest.java |   0
 .../persistence/AtLeastOnceDeliveryCrashSpec.scala |   0
 .../AtLeastOnceDeliveryFailureSpec.scala           |   0
 .../persistence/AtLeastOnceDeliverySpec.scala      |   0
 .../apache/pekko/persistence/AtomicWriteSpec.scala |   0
 .../persistence/EndToEndEventAdapterSpec.scala     |   0
 .../pekko/persistence/EventAdapterSpec.scala       |   0
 .../EventSourcedActorDeleteFailureSpec.scala       |   0
 .../persistence/EventSourcedActorFailureSpec.scala |   0
 .../apache/pekko/persistence/LoadPluginSpec.scala  |   0
 .../pekko/persistence/ManyRecoveriesSpec.scala     |   0
 .../pekko/persistence/OptimizedRecoverySpec.scala  |   0
 .../persistence/OptionalSnapshotStoreSpec.scala    |   0
 .../apache/pekko/persistence/PerformanceSpec.scala |   0
 .../apache/pekko/persistence/PersistenceSpec.scala |   0
 .../PersistentActorBoundedStashingSpec.scala       |   0
 .../PersistentActorJournalProtocolSpec.scala       |   0
 .../PersistentActorRecoveryTimeoutSpec.scala       |   0
 .../pekko/persistence/PersistentActorSpec.scala    |   0
 .../persistence/PersistentActorStashingSpec.scala  |   0
 .../pekko/persistence/RecoveryPermitterSpec.scala  |   0
 .../apache/pekko/persistence/SliceRangesSpec.scala |   0
 .../persistence/SnapshotDecodeFailureSpec.scala    |   0
 .../persistence/SnapshotDirectoryFailureSpec.scala |   0
 .../SnapshotFailureRobustnessSpec.scala            |   0
 .../SnapshotRecoveryLocalStoreSpec.scala           |   0
 .../SnapshotRecoveryWithEmptyJournalSpec.scala     |   0
 .../persistence/SnapshotSerializationSpec.scala    |   0
 .../apache/pekko/persistence/SnapshotSpec.scala    |   0
 .../persistence/TimerPersistentActorSpec.scala     |   0
 .../pekko/persistence/fsm/PersistentFSMSpec.scala  |   0
 .../journal/InmemEventAdaptersSpec.scala           |   0
 .../persistence/journal/ReplayFilterSpec.scala     |   0
 .../persistence/journal/SteppingInmemJournal.scala |   0
 .../persistence/journal/chaos/ChaosJournal.scala   |   0
 .../journal/inmem/InmemJournalSpec.scala           |   0
 .../leveldb/CompactionSegmentManagementSpec.scala  |   0
 .../journal/leveldb/JournalCompactionSpec.scala    |   0
 .../serialization/MessageSerializerSpec.scala      |   0
 .../apache/pekko/pki/pem/DERPrivateKeyLoader.scala |   0
 .../org/apache/pekko/pki/pem/PEMDecoder.scala      |   0
 .../src/test/resources/certificate.pem             |   0
 .../src/test/resources/multi-prime-pkcs1.pem       |   0
 {akka-pki => pki}/src/test/resources/pkcs1.pem     |   0
 {akka-pki => pki}/src/test/resources/pkcs8.pem     |   0
 .../pekko/pki/pem/DERPrivateKeyLoaderSpec.scala    |   0
 .../org/apache/pekko/pki/pem/PEMDecoderSpec.scala  |   0
 project/MiMa.scala                                 |   2 +-
 project/Paradox.scala                              |   2 +-
 project/PekkoDisciplinePlugin.scala                |  70 +++++-----
 project/Protobuf.scala                             |   2 +-
 project/StreamOperatorsIndexGenerator.scala        |  70 +++++-----
 project/TestExtras.scala                           |   6 +-
 project/project-info.conf                          | 144 +++++++++----------
 .../org/apache/pekko/protobuf/AbstractMessage.java |   0
 .../apache/pekko/protobuf/AbstractMessageLite.java |   0
 .../org/apache/pekko/protobuf/AbstractParser.java  |   0
 .../apache/pekko/protobuf/BlockingRpcChannel.java  |   0
 .../org/apache/pekko/protobuf/BlockingService.java |   0
 .../apache/pekko/protobuf/BoundedByteString.java   |   0
 .../java/org/apache/pekko/protobuf/ByteString.java |   0
 .../apache/pekko/protobuf/CodedInputStream.java    |   0
 .../apache/pekko/protobuf/CodedOutputStream.java   |   0
 .../apache/pekko/protobuf/DescriptorProtos.java    |   0
 .../org/apache/pekko/protobuf/Descriptors.java     |   0
 .../org/apache/pekko/protobuf/DynamicMessage.java  |   0
 .../apache/pekko/protobuf/ExtensionRegistry.java   |   0
 .../pekko/protobuf/ExtensionRegistryLite.java      |   0
 .../java/org/apache/pekko/protobuf/FieldSet.java   |   0
 .../apache/pekko/protobuf/GeneratedMessage.java    |   0
 .../pekko/protobuf/GeneratedMessageLite.java       |   0
 .../java/org/apache/pekko/protobuf/Internal.java   |   0
 .../protobuf/InvalidProtocolBufferException.java   |   0
 .../java/org/apache/pekko/protobuf/LazyField.java  |   0
 .../apache/pekko/protobuf/LazyStringArrayList.java |   0
 .../org/apache/pekko/protobuf/LazyStringList.java  |   0
 .../apache/pekko/protobuf/LiteralByteString.java   |   0
 .../java/org/apache/pekko/protobuf/Message.java    |   0
 .../org/apache/pekko/protobuf/MessageLite.java     |   0
 .../pekko/protobuf/MessageLiteOrBuilder.java       |   0
 .../apache/pekko/protobuf/MessageOrBuilder.java    |   0
 .../java/org/apache/pekko/protobuf/Parser.java     |   0
 .../apache/pekko/protobuf/ProtocolMessageEnum.java |   0
 .../pekko/protobuf/RepeatedFieldBuilder.java       |   0
 .../org/apache/pekko/protobuf/RopeByteString.java  |   0
 .../org/apache/pekko/protobuf/RpcCallback.java     |   0
 .../java/org/apache/pekko/protobuf/RpcChannel.java |   0
 .../org/apache/pekko/protobuf/RpcController.java   |   0
 .../java/org/apache/pekko/protobuf/RpcUtil.java    |   0
 .../java/org/apache/pekko/protobuf/Service.java    |   0
 .../apache/pekko/protobuf/ServiceException.java    |   0
 .../apache/pekko/protobuf/SingleFieldBuilder.java  |   0
 .../org/apache/pekko/protobuf/SmallSortedMap.java  |   0
 .../java/org/apache/pekko/protobuf/TextFormat.java |   0
 .../protobuf/UninitializedMessageException.java    |   0
 .../org/apache/pekko/protobuf/UnknownFieldSet.java |   0
 .../pekko/protobuf/UnmodifiableLazyStringList.java |   0
 .../main/java/org/apache/pekko/protobuf/Utf8.java  |   0
 .../java/org/apache/pekko/protobuf/WireFormat.java |   0
 .../scala/org/apache/pekko/io/DnsSpec.scala        |   0
 .../pekko/remote/AttemptSysMsgRedeliverySpec.scala |   0
 .../pekko/remote/LookupRemoteActorSpec.scala       |   0
 .../apache/pekko/remote/NewRemoteActorSpec.scala   |   0
 .../remote/PiercingShouldKeepQuarantineSpec.scala  |   0
 .../apache/pekko/remote/RemoteDeliverySpec.scala   |   0
 .../remote/RemoteDeploymentDeathWatchSpec.scala    |   0
 .../apache/pekko/remote/RemoteFeaturesSpec.scala   |   0
 .../pekko/remote/RemoteNodeDeathWatchSpec.scala    |   0
 .../remote/RemoteNodeRestartDeathWatchSpec.scala   |   0
 .../remote/RemoteQuarantinePiercingSpec.scala      |   0
 .../pekko/remote/RemoteReDeploymentSpec.scala      |   0
 .../pekko/remote/RemotingMultiNodeSpec.scala       |   0
 .../apache/pekko/remote/TransportFailSpec.scala    |   0
 .../remote/artery/BenchmarkFileReporter.scala      |   2 +-
 .../pekko/remote/artery/DirectMemorySpec.scala     |   0
 .../artery/DirectMemorySpecMultiJvmNode1.opts      |   0
 .../artery/DirectMemorySpecMultiJvmNode2.opts      |   0
 .../pekko/remote/artery/FanInThrougputSpec.scala   |   0
 .../pekko/remote/artery/FanOutThrougputSpec.scala  |   0
 .../artery/HandshakeRestartReceiverSpec.scala      |   0
 .../apache/pekko/remote/artery/LatencySpec.scala   |   4 +-
 .../pekko/remote/artery/MaxThroughputSpec.scala    |   4 +-
 .../apache/pekko/remote/artery/PlotResult.scala    |   0
 .../artery/RemoteRestartedQuarantinedSpec.scala    |   0
 ...dStreamRestartWithCompressionInFlightSpec.scala |   0
 .../artery/SurviveNetworkPartitionSpec.scala       |   0
 .../apache/pekko/remote/artery/TestMessage.scala   |   0
 .../pekko/remote/artery/TestRateReporter.scala     |   0
 .../apache/pekko/remote/artery/UdpPortActor.scala  |   0
 .../artery/aeron/AeronStreamConcistencySpec.scala  |   0
 .../artery/aeron/AeronStreamLatencySpec.scala      |   0
 .../aeron/AeronStreamMaxThroughputSpec.scala       |   0
 .../artery/aeron/AeronStreamMultiNodeSpec.scala    |   0
 .../remote/classic/RemoteGatePiercingSpec.scala    |   0
 .../remote/classic/RemoteNodeRestartGateSpec.scala |   0
 .../RemoteNodeShutdownAndComesBackSpec.scala       |   0
 .../pekko/remote/classic/Ticket15109Spec.scala     |   0
 .../pekko/remote/routing/RemoteRandomSpec.scala    |   0
 .../remote/routing/RemoteRoundRobinSpec.scala      |   0
 .../remote/routing/RemoteScatterGatherSpec.scala   |   0
 .../pekko/remote/sample/MultiNodeSample.scala      |   0
 .../remote/testconductor/TestConductorSpec.scala   |   0
 .../pekko/remote/testkit/MultiNodeSpecSpec.scala   |   0
 .../pekko/remote/artery/protobuf/TestMessages.java |   0
 .../src/test/protobuf/TestMessages.proto           |   0
 .../remote/artery/ArteryFailedToBindSpec.scala     |   0
 .../remote/classic/RemotingFailedToBindSpec.scala  |   0
 .../pekko/remote/testconductor/BarrierSpec.scala   |   0
 .../remote/testconductor/ControllerSpec.scala      |   0
 .../pekko/remote/testkit/LogRoleReplace.scala      |   0
 .../pekko/remote/testkit/STMultiNodeSpec.scala     |   0
 .../scala/org/scalatest/extra/QuietReporter.scala  |   0
 .../apache/pekko/remote/ArteryControlFormats.java  |   0
 .../org/apache/pekko/remote/ContainerFormats.java  |   0
 .../apache/pekko/remote/SystemMessageFormats.java  |   0
 .../java/org/apache/pekko/remote/WireFormats.java  |   0
 .../pekko/remote/artery/AbstractAssociation.java   |   0
 .../pekko/remote/artery/aeron/AeronErrorLog.java   |   0
 .../remote/artery/compress/CountMinSketch.java     |   0
 .../src/main/protobuf/ArteryControlFormats.proto   |   0
 .../src/main/protobuf/ContainerFormats.proto       |   0
 .../src/main/protobuf/SystemMessageFormats.proto   |   0
 .../src/main/protobuf/WireFormats.proto            |   0
 .../src/main/resources/reference.conf              |   0
 .../apache/pekko/remote/artery/jfr/Events.scala    |   0
 .../artery/jfr/JFRRemotingFlightRecorder.scala     |   0
 .../org/apache/pekko/remote/AckedDelivery.scala    |   0
 .../apache/pekko/remote/AddressUidExtension.scala  |   0
 .../pekko/remote/BoundAddressesExtension.scala     |   0
 .../org/apache/pekko/remote/ByteStringUtils.scala  |   0
 .../pekko/remote/DeadlineFailureDetector.scala     |   0
 .../remote/DefaultFailureDetectorRegistry.scala    |   0
 .../scala/org/apache/pekko/remote/Endpoint.scala   |   0
 .../org/apache/pekko/remote/FailureDetector.scala  |   0
 .../pekko/remote/FailureDetectorRegistry.scala     |   0
 .../apache/pekko/remote/MessageSerializer.scala    |   0
 .../pekko/remote/PhiAccrualFailureDetector.scala   |   0
 .../pekko/remote/RemoteActorRefProvider.scala      |   0
 .../org/apache/pekko/remote/RemoteDaemon.scala     |   0
 .../org/apache/pekko/remote/RemoteDeployer.scala   |   0
 .../pekko/remote/RemoteDeploymentWatcher.scala     |   0
 .../org/apache/pekko/remote/RemoteLogMarker.scala  |   0
 .../pekko/remote/RemoteMetricsExtension.scala      |   0
 .../org/apache/pekko/remote/RemoteSettings.scala   |   0
 .../org/apache/pekko/remote/RemoteTransport.scala  |   0
 .../org/apache/pekko/remote/RemoteWatcher.scala    |   0
 .../scala/org/apache/pekko/remote/Remoting.scala   |   0
 .../pekko/remote/RemotingLifecycleEvent.scala      |   0
 .../org/apache/pekko/remote/UniqueAddress.scala    |   0
 .../pekko/remote/artery/ArterySettings.scala       |   0
 .../pekko/remote/artery/ArteryTransport.scala      |   0
 .../apache/pekko/remote/artery/Association.scala   |   0
 .../org/apache/pekko/remote/artery/Codecs.scala    |   0
 .../org/apache/pekko/remote/artery/Control.scala   |   0
 .../pekko/remote/artery/EnvelopeBufferPool.scala   |   0
 .../remote/artery/FixedSizePartitionHub.scala      |   0
 .../artery/FlushBeforeDeathWatchNotification.scala |   0
 .../pekko/remote/artery/FlushOnShutdown.scala      |   0
 .../org/apache/pekko/remote/artery/Handshake.scala |   0
 .../pekko/remote/artery/ImmutableLongMap.scala     |   0
 .../pekko/remote/artery/InboundEnvelope.scala      |   0
 .../remote/artery/InboundQuarantineCheck.scala     |   0
 .../pekko/remote/artery/LruBoundedCache.scala      |   0
 .../pekko/remote/artery/MessageDispatcher.scala    |   0
 .../apache/pekko/remote/artery/ObjectPool.scala    |   0
 .../pekko/remote/artery/OutboundEnvelope.scala     |   0
 .../pekko/remote/artery/QuarantinedEvent.scala     |   0
 .../pekko/remote/artery/RemoteInstrument.scala     |   0
 .../remote/artery/RemotingFlightRecorder.scala     |   0
 .../pekko/remote/artery/RestartCounter.scala       |   0
 .../org/apache/pekko/remote/artery/SendQueue.scala |   0
 .../remote/artery/SystemMessageDelivery.scala      |   0
 .../org/apache/pekko/remote/artery/TestStage.scala |   0
 .../pekko/remote/artery/aeron/AeronSink.scala      |   0
 .../pekko/remote/artery/aeron/AeronSource.scala    |   0
 .../artery/aeron/ArteryAeronUdpTransport.scala     |   0
 .../pekko/remote/artery/aeron/TaskRunner.scala     |   0
 .../artery/compress/CompressionProtocol.scala      |   0
 .../remote/artery/compress/CompressionTable.scala  |   0
 .../artery/compress/DecompressionTable.scala       |   0
 .../artery/compress/InboundCompressions.scala      |   0
 .../remote/artery/compress/TopHeavyHitters.scala   |   0
 .../remote/artery/tcp/ArteryTcpTransport.scala     |   0
 .../artery/tcp/ConfigSSLEngineProvider.scala       |   0
 .../remote/artery/tcp/SSLEngineProvider.scala      |   0
 .../remote/artery/tcp/SecureRandomFactory.scala    |   0
 .../pekko/remote/artery/tcp/TcpFraming.scala       |   0
 .../artery/tcp/ssl/PemManagersProvider.scala       |   0
 .../tcp/ssl/RotatingKeysSSLEngineProvider.scala    |   0
 .../remote/artery/tcp/ssl/SSLEngineConfig.scala    |   0
 .../remote/artery/tcp/ssl/SessionVerifier.scala    |   0
 .../pekko/remote/artery/tcp/ssl/X509Readers.scala  |   0
 .../pekko/remote/routing/RemoteRouterConfig.scala  |   0
 .../pekko/remote/security/provider/SeedSize.scala  |   0
 .../serialization/ActorRefResolveCache.scala       |   0
 .../serialization/ArteryMessageSerializer.scala    |   0
 .../serialization/DaemonMsgCreateSerializer.scala  |   0
 .../serialization/MessageContainerSerializer.scala |   0
 .../serialization/MiscMessageSerializer.scala      |   0
 .../serialization/PrimitiveSerializers.scala       |   0
 .../remote/serialization/ProtobufSerializer.scala  |   0
 .../serialization/SystemMessageSerializer.scala    |   0
 .../ThrowableNotSerializableException.scala        |   0
 .../remote/serialization/ThrowableSupport.scala    |   0
 .../serialization/WrappedPayloadSupport.scala      |   0
 .../transport/AbstractTransportAdapter.scala       |   0
 .../FailureInjectorTransportAdapter.scala          |   0
 .../pekko/remote/transport/PekkoPduCodec.scala     |   0
 .../remote/transport/PekkoProtocolTransport.scala  |   0
 .../pekko/remote/transport/TestTransport.scala     |   0
 .../transport/ThrottlerTransportAdapter.scala      |   0
 .../apache/pekko/remote/transport/Transport.scala  |   0
 .../remote/transport/netty/NettyHelpers.scala      |   0
 .../remote/transport/netty/NettySSLSupport.scala   |   0
 .../remote/transport/netty/NettyTransport.scala    |   2 +-
 .../remote/transport/netty/SSLEngineProvider.scala |   0
 .../pekko/remote/transport/netty/TcpSupport.scala  |   0
 .../org/apache/pekko/remote/ProtobufProtocol.java  |   0
 .../apache/pekko/remote/artery/RateReporter.java   |   0
 .../pekko/remote/artery/aeron/AeronStat.java       |   0
 .../remote/protobuf/v3/ProtobufProtocolV3.java     |   0
 .../transport/ThrottlerTransportAdapterTest.java   |   0
 .../src/test/protobuf/ProtobufProtocol.proto       |   0
 .../src/test/protobuf/ProtobufProtocolV3.proto     |   0
 .../src/test/resources/Makefile                    |   2 +-
 .../src/test/resources/aeron.properties            |   0
 .../src/test/resources/domain.crt                  |   0
 .../src/test/resources/keystore                    | Bin
 .../src/test/resources/ssl/README.md               |   0
 .../artery-nodes/artery-node001.example.com.crt    |  36 ++---
 .../artery-nodes/artery-node001.example.com.p12    | Bin
 .../artery-nodes/artery-node001.example.com.pem    |   0
 .../artery-nodes/artery-node002.example.com.crt    |  36 ++---
 .../artery-nodes/artery-node002.example.com.p12    | Bin
 .../artery-nodes/artery-node002.example.com.pem    |   0
 .../artery-nodes/artery-node003.example.com.crt    |  36 ++---
 .../artery-nodes/artery-node003.example.com.p12    | Bin
 .../artery-nodes/artery-node003.example.com.pem    |   0
 .../src/test/resources/ssl/client.example.com.crt  |  26 ++--
 .../src/test/resources/ssl/client.example.com.p12  | Bin
 .../src/test/resources/ssl/exampleca.crt           |  22 +--
 .../src/test/resources/ssl/exampleca.p12           | Bin
 .../resources/ssl/gen-artery-nodes.example.com.sh  |   0
 .../src/test/resources/ssl/gen-functions.sh        |   0
 .../src/test/resources/ssl/genca.sh                |   0
 .../src/test/resources/ssl/gencerts.sh             |   0
 .../src/test/resources/ssl/island.example.com.crt  |  26 ++--
 .../src/test/resources/ssl/island.example.com.p12  | Bin
 .../src/test/resources/ssl/node.example.com.crt    |  36 ++---
 .../src/test/resources/ssl/node.example.com.p12    | Bin
 .../src/test/resources/ssl/node.example.com.pem    |   0
 .../src/test/resources/ssl/one.example.com.crt     |  26 ++--
 .../src/test/resources/ssl/one.example.com.p12     | Bin
 .../src/test/resources/ssl/password                |   0
 .../src/test/resources/ssl/pem/README.md           |   4 +-
 .../src/test/resources/ssl/pem/pkcs1.pem           |   0
 .../resources/ssl/pem/selfsigned-certificate.pem   |   0
 .../test/resources/ssl/rsa-client.example.com.crt  |  36 ++---
 .../test/resources/ssl/rsa-client.example.com.p12  | Bin
 .../test/resources/ssl/rsa-client.example.com.pem  |   0
 .../src/test/resources/ssl/two.example.com.crt     |  26 ++--
 .../src/test/resources/ssl/two.example.com.p12     | Bin
 .../src/test/resources/truststore                  | Bin
 .../artery/jfr/JFRRemotingFlightRecorderSpec.scala |   0
 .../pekko/remote/AccrualFailureDetectorSpec.scala  |   0
 .../apache/pekko/remote/AckedDeliverySpec.scala    |   0
 .../org/apache/pekko/remote/DaemonicSpec.scala     |   0
 .../pekko/remote/DeadlineFailureDetectorSpec.scala |   0
 .../apache/pekko/remote/EndpointRegistrySpec.scala |   0
 .../pekko/remote/FailureDetectorRegistrySpec.scala |   0
 .../org/apache/pekko/remote/LogSourceSpec.scala    |   0
 .../apache/pekko/remote/MessageLoggingSpec.scala   |   0
 .../apache/pekko/remote/NetworkFailureSpec.scala   |   0
 .../pekko/remote/RemoteActorMailboxSpec.scala      |   0
 .../org/apache/pekko/remote/RemoteConfigSpec.scala |   0
 .../remote/RemoteConsistentHashingRouterSpec.scala |   0
 .../apache/pekko/remote/RemoteDeployerSpec.scala   |   0
 .../apache/pekko/remote/RemoteFeaturesSpec.scala   |   0
 .../org/apache/pekko/remote/RemoteRouterSpec.scala |   0
 .../pekko/remote/Ticket1978CommunicationSpec.scala |   0
 .../apache/pekko/remote/Ticket1978ConfigSpec.scala |   0
 .../remote/TransientSerializationErrorSpec.scala   |   0
 .../pekko/remote/TypedActorRemoteDeploySpec.scala  |   0
 .../ActorRefResolveCacheQuarantineSpec.scala       |   0
 .../pekko/remote/artery/ArteryMultiNodeSpec.scala  |   0
 .../pekko/remote/artery/ArterySpecSupport.scala    |   0
 .../remote/artery/BindCanonicalAddressSpec.scala   |   0
 .../pekko/remote/artery/DuplicateFlushSpec.scala   |   0
 .../remote/artery/DuplicateHandshakeSpec.scala     |   0
 .../pekko/remote/artery/EnvelopeBufferSpec.scala   |   0
 .../pekko/remote/artery/FlushOnShutdownSpec.scala  |   0
 .../pekko/remote/artery/HandshakeDenySpec.scala    |   0
 .../pekko/remote/artery/HandshakeFailureSpec.scala |   0
 .../pekko/remote/artery/HandshakeRetrySpec.scala   |   0
 .../pekko/remote/artery/ImmutableLongMapSpec.scala |   0
 .../remote/artery/InboundControlJunctionSpec.scala |   0
 .../pekko/remote/artery/InboundHandshakeSpec.scala |   0
 .../remote/artery/LargeMessagesStreamSpec.scala    |   0
 .../pekko/remote/artery/LateConnectSpec.scala      |   0
 .../pekko/remote/artery/LruBoundedCacheSpec.scala  |   0
 .../pekko/remote/artery/MetadataCarryingSpec.scala |   0
 .../artery/OutboundControlJunctionSpec.scala       |   0
 .../remote/artery/OutboundHandshakeSpec.scala      |   0
 .../remote/artery/OutboundIdleShutdownSpec.scala   |   0
 .../remote/artery/RemoteActorRefProviderSpec.scala |   0
 .../remote/artery/RemoteActorSelectionSpec.scala   |   0
 .../pekko/remote/artery/RemoteConnectionSpec.scala |   0
 .../pekko/remote/artery/RemoteDeathWatchSpec.scala |   0
 .../pekko/remote/artery/RemoteDeployerSpec.scala   |   0
 .../pekko/remote/artery/RemoteDeploymentSpec.scala |   0
 .../pekko/remote/artery/RemoteFailureSpec.scala    |   0
 .../RemoteInstrumentsSerializationSpec.scala       |   0
 .../remote/artery/RemoteInstrumentsSpec.scala      |   0
 .../artery/RemoteMessageSerializationSpec.scala    |   0
 .../pekko/remote/artery/RemoteRouterSpec.scala     |   0
 .../remote/artery/RemoteSendConsistencySpec.scala  |   0
 .../pekko/remote/artery/RemoteWatcherSpec.scala    |   0
 .../remote/artery/RemotingFlightRecorderSpec.scala |   0
 .../pekko/remote/artery/RestartCounterSpec.scala   |   0
 .../artery/RollingEventLogSimulationSpec.scala     |   0
 .../apache/pekko/remote/artery/SendQueueSpec.scala |   0
 .../remote/artery/SerializationErrorSpec.scala     |   0
 .../SerializationTransportInformationSpec.scala    |   0
 .../remote/artery/SystemMessageAckerSpec.scala     |   0
 .../remote/artery/SystemMessageDeliverySpec.scala  |   0
 .../apache/pekko/remote/artery/TestContext.scala   |   0
 .../artery/TransientSerializationErrorSpec.scala   |   0
 .../apache/pekko/remote/artery/UntrustedSpec.scala |   0
 .../pekko/remote/artery/aeron/AeronSinkSpec.scala  |   0
 .../compress/CompressionIntegrationSpec.scala      |   0
 .../artery/compress/CompressionTableSpec.scala     |   0
 .../artery/compress/CompressionTestUtils.scala     |   0
 .../HandshakeShouldDropCompressionTableSpec.scala  |   0
 .../remote/artery/compress/HeavyHittersSpec.scala  |   0
 .../artery/compress/OutboundCompressionSpec.scala  |   0
 .../artery/tcp/SecureRandomFactorySpec.scala       |   0
 .../pekko/remote/artery/tcp/TcpFramingSpec.scala   |   0
 .../pekko/remote/artery/tcp/TlsTcpSpec.scala       |   0
 .../artery/tcp/ssl/CipherSuiteSupportCheck.scala   |   0
 .../artery/tcp/ssl/PeerSubjectVerifierSpec.scala   |   0
 .../artery/tcp/ssl/PemManagersProviderSpec.scala   |   0
 .../ssl/RotatingKeysSSLEngineProviderSpec.scala    |   2 +-
 .../remote/artery/tcp/ssl/TlsResourcesSpec.scala   |   0
 .../remote/artery/tcp/ssl/X509ReadersSpec.scala    |   0
 .../pekko/remote/classic/ActorsLeakSpec.scala      |   0
 .../remote/classic/RemoteDeathWatchSpec.scala      |   0
 .../classic/RemoteDeploymentAllowListSpec.scala    |   0
 .../pekko/remote/classic/RemoteInitErrorSpec.scala |   0
 .../pekko/remote/classic/RemoteSettingsSpec.scala  |   0
 .../pekko/remote/classic/RemoteWatcherSpec.scala   |   0
 .../apache/pekko/remote/classic/RemotingSpec.scala |   0
 .../pekko/remote/classic/UntrustedSpec.scala       |   0
 .../classic/transport/GenericTransportSpec.scala   |   0
 .../classic/transport/PekkoProtocolSpec.scala      |   0
 .../transport/PekkoProtocolStressTest.scala        |   0
 .../transport/SwitchableLoggedBehaviorSpec.scala   |   0
 .../SystemMessageDeliveryStressTest.scala          |   0
 .../classic/transport/TestTransportSpec.scala      |   0
 .../classic/transport/ThrottleModeSpec.scala       |   0
 .../transport/ThrottlerTransportAdapterSpec.scala  |   0
 .../transport/netty/NettyTransportSpec.scala       |   0
 .../AllowJavaSerializationOffSpec.scala            |   0
 .../ArteryMessageSerializerSpec.scala              |   0
 ...reateSerializerAllowJavaSerializationSpec.scala |   0
 .../MessageContainerSerializerSpec.scala           |   0
 .../serialization/MiscMessageSerializerSpec.scala  |   0
 .../PrimitivesSerializationSpec.scala              |   2 +-
 .../serialization/ProtobufSerializerSpec.scala     |   0
 .../SerializationTransportInformationSpec.scala    |   0
 .../SystemMessageSerializationSpec.scala           |   0
 scripts/multi-node-log-replace.sh                  |   2 +-
 .../src/main/resources/reference.conf              |   0
 .../serialization/jackson/ActorRefModule.scala     |   0
 .../serialization/jackson/ActorSystemAccess.scala  |   0
 .../serialization/jackson/AddressModule.scala      |   0
 .../jackson/AkkaSerializationModule.scala          |   0
 .../jackson/FiniteDurationModule.scala             |   0
 .../serialization/jackson/JacksonMigration.scala   |   0
 .../serialization/jackson/JacksonModule.scala      |   2 +-
 .../jackson/JacksonObjectMapperProvider.scala      |   0
 .../serialization/jackson/JacksonSerializer.scala  |   0
 .../serialization/jackson/PekkoJacksonModule.scala |   0
 .../serialization/jackson/StreamRefModule.scala    |   0
 .../jackson/TypedActorRefModule.scala              |   0
 .../serialization/jackson/MySerializable.java      |   0
 .../jackson/SerializationDocTest.java              |   0
 .../pekko/serialization/jackson/v1/Customer.java   |   0
 .../pekko/serialization/jackson/v1/ItemAdded.java  |   0
 .../pekko/serialization/jackson/v1/OrderAdded.java |   0
 .../jackson/v1withv2/ItemAddedMigration.java       |   0
 .../pekko/serialization/jackson/v2a/Address.java   |   0
 .../pekko/serialization/jackson/v2a/Customer.java  |   0
 .../jackson/v2a/CustomerMigration.java             |   0
 .../pekko/serialization/jackson/v2a/ItemAdded.java |   0
 .../serialization/jackson/v2a/OrderPlaced.java     |   0
 .../jackson/v2a/OrderPlacedMigration.java          |   0
 .../pekko/serialization/jackson/v2b/ItemAdded.java |   0
 .../jackson/v2b/ItemAddedMigration.java            |   0
 .../pekko/serialization/jackson/v2c/ItemAdded.java |   0
 .../jackson/v2c/ItemAddedMigration.java            |   0
 .../jackson/JavaTestEventMigrationV2.java          |   0
 .../jackson/JavaTestEventMigrationV2WithV3.java    |   0
 .../jackson/JavaTestEventMigrationV3.java          |   0
 .../serialization/jackson/JavaTestMessages.java    |   0
 .../src/test/resources/reference.conf              |   0
 .../jackson/CustomAdtSerializer.scala              |   0
 .../jackson/SerializationDocSpec.scala             |   0
 .../pekko/serialization/jackson/v1/Customer.scala  |   0
 .../pekko/serialization/jackson/v1/ItemAdded.scala |   0
 .../serialization/jackson/v1/OrderAdded.scala      |   0
 .../jackson/v1withv2/ItemAddedMigration.scala      |   0
 .../pekko/serialization/jackson/v2a/Address.scala  |   0
 .../pekko/serialization/jackson/v2a/Customer.scala |   0
 .../jackson/v2a/CustomerMigration.scala            |   0
 .../serialization/jackson/v2a/ItemAdded.scala      |   0
 .../serialization/jackson/v2a/OrderPlaced.scala    |   0
 .../jackson/v2a/OrderPlacedMigration.scala         |   0
 .../serialization/jackson/v2b/ItemAdded.scala      |   0
 .../jackson/v2b/ItemAddedMigration.scala           |   0
 .../serialization/jackson/v2c/ItemAdded.scala      |   0
 .../jackson/v2c/ItemAddedMigration.scala           |   0
 .../serialization/jackson/CborSerializable.scala   |   0
 .../jackson/JacksonSerializerSpec.scala            |   0
 .../serialization/jackson/JsonSerializable.scala   |   0
 .../jackson/ScalaTestEventMigration.scala          |   0
 .../org/apache/pekko/event/slf4j/Slf4jLogger.scala |   0
 .../src/test/resources/logback-test.xml            |   0
 .../apache/pekko/event/slf4j/Slf4jLoggerSpec.scala |   0
 .../pekko/event/slf4j/Slf4jLoggingFilterSpec.scala |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/stream/testkit/StreamTestKit.scala       |   0
 .../pekko/stream/testkit/TestGraphStage.scala      |   0
 .../stream/testkit/javadsl/StreamTestKit.scala     |   0
 .../pekko/stream/testkit/javadsl/TestSink.scala    |   0
 .../pekko/stream/testkit/javadsl/TestSource.scala  |   0
 .../stream/testkit/scaladsl/StreamTestKit.scala    |   0
 .../pekko/stream/testkit/scaladsl/TestSink.scala   |   0
 .../pekko/stream/testkit/scaladsl/TestSource.scala |   0
 .../src/test/resources/reference.conf              |   0
 .../impl/fusing/GraphInterpreterSpecKit.scala      |   0
 .../pekko/stream/testkit/BaseTwoStreamsSetup.scala |   0
 .../apache/pekko/stream/testkit/ChainSetup.scala   |   0
 .../apache/pekko/stream/testkit/ScriptedTest.scala |   0
 .../apache/pekko/stream/testkit/StreamSpec.scala   |   0
 .../stream/testkit/StreamTestDefaultMailbox.scala  |   0
 .../pekko/stream/testkit/StreamTestKitSpec.scala   |   0
 .../testkit/TestPublisherSubscriberSpec.scala      |   0
 .../pekko/stream/testkit/TwoStreamsSetup.scala     |   0
 .../org/apache/pekko/stream/testkit/Utils.scala    |   0
 ...IterablePublisherViaJavaFlowPublisherTest.scala |   0
 .../pekko/stream/tck/ActorSystemLifecycle.scala    |   0
 .../stream/tck/AkkaSubscriberVerification.scala    |   0
 .../stream/tck/CancelledSinkSubscriberTest.scala   |   0
 .../org/apache/pekko/stream/tck/ConcatTest.scala   |   0
 .../pekko/stream/tck/EmptyPublisherTest.scala      |   0
 .../pekko/stream/tck/FanoutPublisherTest.scala     |   0
 .../pekko/stream/tck/FilePublisherTest.scala       |   0
 .../tck/FlatMapConcatDoubleSubscriberTest.scala    |   0
 .../pekko/stream/tck/FlatMapPrefixTest.scala       |   0
 .../org/apache/pekko/stream/tck/FlattenTest.scala  |   0
 .../pekko/stream/tck/FoldSinkSubscriberTest.scala  |   0
 .../stream/tck/ForeachSinkSubscriberTest.scala     |   0
 .../pekko/stream/tck/FusableProcessorTest.scala    |   0
 .../pekko/stream/tck/FuturePublisherTest.scala     |   0
 .../org/apache/pekko/stream/tck/GroupByTest.scala  |   0
 .../pekko/stream/tck/InputStreamSourceTest.scala   |   0
 .../pekko/stream/tck/IterablePublisherTest.scala   |   0
 .../org/apache/pekko/stream/tck/MapTest.scala      |   0
 .../apache/pekko/stream/tck/MaybeSourceTest.scala  |   0
 .../tck/PekkoIdentityProcessorVerification.scala   |   0
 .../stream/tck/PekkoPublisherVerification.scala    |   0
 .../pekko/stream/tck/PrefixAndTailTest.scala       |   0
 .../pekko/stream/tck/SingleElementSourceTest.scala |   0
 .../pekko/stream/tck/SinkholeSubscriberTest.scala  |   0
 .../apache/pekko/stream/tck/SplitWhenTest.scala    |   0
 .../org/apache/pekko/stream/tck/Timeouts.scala     |   0
 .../pekko/stream/tck/TransformProcessorTest.scala  |   0
 .../pekko/stream/tck/VirtualPublisherTest.scala    |   0
 .../stream/javadsl/JavaFlowSupportCompileTest.java |   0
 .../pekko/stream/StreamAttributeDocTest.java       |   0
 .../java/org/apache/pekko/stream/StreamTest.java   |   0
 .../pekko/stream/io/InputStreamSinkTest.java       |   0
 .../pekko/stream/io/OutputStreamSinkTest.java      |   0
 .../pekko/stream/io/OutputStreamSourceTest.java    |   0
 .../pekko/stream/io/SinkAsJavaSourceTest.java      |   0
 .../pekko/stream/javadsl/AttributesTest.java       |   0
 .../stream/javadsl/FlowLogWithMarkerTest.java      |   0
 .../org/apache/pekko/stream/javadsl/FlowTest.java  |   0
 .../pekko/stream/javadsl/FlowThrottleTest.java     |   0
 .../pekko/stream/javadsl/FlowWithContextTest.java  |   0
 .../javadsl/FlowWithContextThrottleTest.java       |   0
 .../apache/pekko/stream/javadsl/FramingTest.java   |   0
 .../apache/pekko/stream/javadsl/GraphDslTest.java  |   0
 .../pekko/stream/javadsl/JsonFramingTest.java      |   0
 .../pekko/stream/javadsl/KillSwitchTest.java       |   0
 .../stream/javadsl/LazyAndFutureFlowTest.java      |   0
 .../stream/javadsl/LazyAndFutureSourcesTest.java   |   0
 .../apache/pekko/stream/javadsl/RetryFlowTest.java |   0
 .../pekko/stream/javadsl/RunnableGraphTest.java    |   0
 .../org/apache/pekko/stream/javadsl/SetupTest.java |   0
 .../org/apache/pekko/stream/javadsl/SinkTest.java  |   0
 .../pekko/stream/javadsl/SourceRunWithTest.java    |   0
 .../apache/pekko/stream/javadsl/SourceTest.java    |   0
 .../pekko/stream/javadsl/SourceUnfoldTest.java     |   0
 .../javadsl/SourceWithContextThrottleTest.java     |   0
 .../org/apache/pekko/stream/javadsl/TcpTest.java   |   0
 .../pekko/stream/stage/JavaIdentityStage.java      |   0
 .../org/apache/pekko/stream/stage/StageTest.java   |   0
 .../src/test/resources/badtruststore               | Bin
 .../src/test/resources/keystore                    | Bin
 .../src/test/resources/reference.conf              |   0
 .../src/test/resources/tcp-spec-keystore.p12       | Bin
 .../src/test/resources/truststore                  | Bin
 .../stream/scaladsl/FlowPublisherSinkSpec.scala    |   0
 .../pekko/stream/ActorMaterializerSpec.scala       |   0
 .../apache/pekko/stream/DslConsistencySpec.scala   |   0
 .../pekko/stream/DslFactoriesConsistencySpec.scala |   0
 .../scala/org/apache/pekko/stream/FusingSpec.scala |   0
 .../pekko/stream/SourceLocationAttributeSpec.scala |   0
 .../pekko/stream/StreamAttributeDocSpec.scala      |   0
 .../apache/pekko/stream/StreamDispatcherSpec.scala |   0
 .../pekko/stream/SystemMaterializerSpec.scala      |   0
 .../pekko/stream/impl/FanoutProcessorSpec.scala    |   0
 .../apache/pekko/stream/impl/FixedBufferSpec.scala |   0
 .../pekko/stream/impl/GraphStageLogicSpec.scala    |   0
 .../stream/impl/LinearTraversalBuilderSpec.scala   |   0
 .../impl/ResizableMultiReaderRingBufferSpec.scala  |   0
 .../pekko/stream/impl/SubInletOutletSpec.scala     |   0
 .../apache/pekko/stream/impl/TimeoutsSpec.scala    |   0
 .../pekko/stream/impl/TraversalBuilderSpec.scala   |   0
 .../pekko/stream/impl/TraversalTestUtils.scala     |   0
 .../impl/fusing/ActorGraphInterpreterSpec.scala    |   0
 .../stream/impl/fusing/AsyncCallbackSpec.scala     |   0
 .../stream/impl/fusing/ChasingEventsSpec.scala     |   0
 .../fusing/GraphInterpreterFailureModesSpec.scala  |   0
 .../impl/fusing/GraphInterpreterPortsSpec.scala    |   0
 .../stream/impl/fusing/GraphInterpreterSpec.scala  |   0
 .../pekko/stream/impl/fusing/InterpreterSpec.scala |   0
 .../stream/impl/fusing/InterpreterStressSpec.scala |   0
 .../impl/fusing/InterpreterSupervisionSpec.scala   |   0
 .../stream/impl/fusing/KeepGoingStageSpec.scala    |   0
 .../impl/fusing/LifecycleInterpreterSpec.scala     |   0
 .../apache/pekko/stream/impl/io/TLSUtilsSpec.scala |   0
 .../pekko/stream/io/ByteStringParserSpec.scala     |   0
 .../apache/pekko/stream/io/DeprecatedTlsSpec.scala |   0
 .../org/apache/pekko/stream/io/FileSinkSpec.scala  |   0
 .../apache/pekko/stream/io/FileSourceSpec.scala    |   0
 .../pekko/stream/io/InputStreamSinkSpec.scala      |   0
 .../pekko/stream/io/InputStreamSourceSpec.scala    |   0
 .../pekko/stream/io/OutputStreamSinkSpec.scala     |   0
 .../pekko/stream/io/OutputStreamSourceSpec.scala   |   0
 .../org/apache/pekko/stream/io/TcpHelper.scala     |   0
 .../scala/org/apache/pekko/stream/io/TcpSpec.scala |   0
 .../scala/org/apache/pekko/stream/io/TlsSpec.scala |   0
 .../stream/io/compression/CodecSpecSupport.scala   |   0
 .../pekko/stream/io/compression/CoderSpec.scala    |   0
 .../io/compression/CompressionTestingTools.scala   |   0
 .../pekko/stream/io/compression/DeflateSpec.scala  |   0
 .../pekko/stream/io/compression/GzipSpec.scala     |   0
 .../GzipWithCustomCompressionLevelSpec.scala       |   0
 .../scaladsl/ActorRefBackpressureSinkSpec.scala    |   0
 .../scaladsl/ActorRefBackpressureSourceSpec.scala  |   0
 .../pekko/stream/scaladsl/ActorRefSinkSpec.scala   |   0
 .../pekko/stream/scaladsl/ActorRefSourceSpec.scala |   0
 .../scaladsl/AggregateWithBoundarySpec.scala       |   0
 .../pekko/stream/scaladsl/AttributesSpec.scala     |   0
 .../pekko/stream/scaladsl/BidiFlowSpec.scala       |   0
 .../stream/scaladsl/BoundedSourceQueueSpec.scala   |   0
 .../stream/scaladsl/CancellationStrategySpec.scala |   0
 .../pekko/stream/scaladsl/CollectionSinkSpec.scala |   0
 .../pekko/stream/scaladsl/CompressionSpec.scala    |   0
 .../scaladsl/CoupledTerminationFlowSpec.scala      |   0
 .../pekko/stream/scaladsl/FailedSourceSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowAlsoToAllSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowAppendSpec.scala     |   0
 .../apache/pekko/stream/scaladsl/FlowAskSpec.scala |   0
 .../pekko/stream/scaladsl/FlowBatchSpec.scala      |   0
 .../stream/scaladsl/FlowBatchWeightedSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowBufferSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowCollectSpec.scala    |   0
 .../stream/scaladsl/FlowCollectTypeSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowCompileSpec.scala    |   0
 .../stream/scaladsl/FlowConcatAllLazySpec.scala    |   0
 .../pekko/stream/scaladsl/FlowConcatAllSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowConcatSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowConflateSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowDelaySpec.scala      |   0
 .../pekko/stream/scaladsl/FlowDetacherSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowDispatcherSpec.scala |   0
 .../pekko/stream/scaladsl/FlowDropSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowDropWhileSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowDropWithinSpec.scala |   0
 .../pekko/stream/scaladsl/FlowExpandSpec.scala     |   0
 .../stream/scaladsl/FlowExtrapolateSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowFilterSpec.scala     |   0
 .../stream/scaladsl/FlowFlatMapPrefixSpec.scala    |   0
 .../stream/scaladsl/FlowFlattenMergeSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowFoldAsyncSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowFoldSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowForeachSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowFromFutureSpec.scala |   0
 .../pekko/stream/scaladsl/FlowFutureFlowSpec.scala |   0
 .../pekko/stream/scaladsl/FlowGroupBySpec.scala    |   0
 .../pekko/stream/scaladsl/FlowGroupedSpec.scala    |   0
 .../stream/scaladsl/FlowGroupedWeightedSpec.scala  |   0
 .../stream/scaladsl/FlowGroupedWithinSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowIdleInjectSpec.scala |   0
 .../stream/scaladsl/FlowInitialDelaySpec.scala     |   0
 .../stream/scaladsl/FlowInterleaveAllSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowInterleaveSpec.scala |   0
 .../stream/scaladsl/FlowIntersperseSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowIteratorSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowJoinSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowKillSwitchSpec.scala |   0
 .../pekko/stream/scaladsl/FlowLimitSpec.scala      |   0
 .../stream/scaladsl/FlowLimitWeightedSpec.scala    |   0
 .../apache/pekko/stream/scaladsl/FlowLogSpec.scala |   0
 .../stream/scaladsl/FlowLogWithMarkerSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowMapAsyncSpec.scala   |   0
 .../scaladsl/FlowMapAsyncUnorderedSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowMapConcatSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowMapErrorSpec.scala   |   0
 .../apache/pekko/stream/scaladsl/FlowMapSpec.scala |   0
 .../pekko/stream/scaladsl/FlowMergeAllSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowMergeSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowMonitorSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowOnCompleteSpec.scala |   0
 .../pekko/stream/scaladsl/FlowOrElseSpec.scala     |   0
 .../stream/scaladsl/FlowPrefixAndTailSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowPrependSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowRecoverSpec.scala    |   0
 .../stream/scaladsl/FlowRecoverWithSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowReduceSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowScanAsyncSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowScanSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowSectionSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowSlidingSpec.scala    |   0
 .../apache/pekko/stream/scaladsl/FlowSpec.scala    |   0
 .../pekko/stream/scaladsl/FlowSplitAfterSpec.scala |   0
 .../pekko/stream/scaladsl/FlowSplitWhenSpec.scala  |   0
 .../scaladsl/FlowStatefulMapConcatSpec.scala       |   0
 .../stream/scaladsl/FlowStatefulMapSpec.scala      |   0
 .../stream/scaladsl/FlowSupervisionSpec.scala      |   0
 .../pekko/stream/scaladsl/FlowTakeSpec.scala       |   0
 .../pekko/stream/scaladsl/FlowTakeWhileSpec.scala  |   0
 .../pekko/stream/scaladsl/FlowTakeWithinSpec.scala |   0
 .../pekko/stream/scaladsl/FlowThrottleSpec.scala   |   0
 .../pekko/stream/scaladsl/FlowWatchSpec.scala      |   0
 .../stream/scaladsl/FlowWatchTerminationSpec.scala |   0
 .../pekko/stream/scaladsl/FlowWireTapSpec.scala    |   0
 .../stream/scaladsl/FlowWithContextLogSpec.scala   |   0
 .../stream/scaladsl/FlowWithContextSpec.scala      |   0
 .../scaladsl/FlowWithContextThrottleSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowZipAllSpec.scala     |   0
 .../apache/pekko/stream/scaladsl/FlowZipSpec.scala |   0
 .../stream/scaladsl/FlowZipWithIndexSpec.scala     |   0
 .../pekko/stream/scaladsl/FlowZipWithSpec.scala    |   0
 .../apache/pekko/stream/scaladsl/FramingSpec.scala |   0
 .../stream/scaladsl/FromMaterializationSpec.scala  |   0
 .../stream/scaladsl/GraphBackedFlowSpec.scala      |   0
 .../pekko/stream/scaladsl/GraphBalanceSpec.scala   |   0
 .../pekko/stream/scaladsl/GraphBroadcastSpec.scala |   0
 .../pekko/stream/scaladsl/GraphConcatSpec.scala    |   0
 .../stream/scaladsl/GraphDSLCompileSpec.scala      |   0
 .../pekko/stream/scaladsl/GraphMatValueSpec.scala  |   0
 .../stream/scaladsl/GraphMergeLatestSpec.scala     |   0
 .../stream/scaladsl/GraphMergePreferredSpec.scala  |   0
 .../scaladsl/GraphMergePrioritizedNSpec.scala      |   0
 .../scaladsl/GraphMergePrioritizedSpec.scala       |   0
 .../stream/scaladsl/GraphMergeSequenceSpec.scala   |   0
 .../stream/scaladsl/GraphMergeSortedSpec.scala     |   0
 .../pekko/stream/scaladsl/GraphMergeSpec.scala     |   0
 .../stream/scaladsl/GraphOpsIntegrationSpec.scala  |   0
 .../pekko/stream/scaladsl/GraphPartialSpec.scala   |   0
 .../pekko/stream/scaladsl/GraphPartitionSpec.scala |   0
 .../stream/scaladsl/GraphStageTimersSpec.scala     |   0
 .../pekko/stream/scaladsl/GraphUnzipSpec.scala     |   0
 .../pekko/stream/scaladsl/GraphUnzipWithSpec.scala |   0
 .../pekko/stream/scaladsl/GraphWireTapSpec.scala   |   0
 .../pekko/stream/scaladsl/GraphZipLatestSpec.scala |   0
 .../stream/scaladsl/GraphZipLatestWithSpec.scala   |   0
 .../pekko/stream/scaladsl/GraphZipNSpec.scala      |   0
 .../pekko/stream/scaladsl/GraphZipSpec.scala       |   0
 .../pekko/stream/scaladsl/GraphZipWithNSpec.scala  |   0
 .../pekko/stream/scaladsl/GraphZipWithSpec.scala   |   0
 .../pekko/stream/scaladsl/HeadSinkSpec.scala       |   0
 .../org/apache/pekko/stream/scaladsl/HubSpec.scala |   0
 .../pekko/stream/scaladsl/JsonFramingSpec.scala    |   0
 .../pekko/stream/scaladsl/LastSinkSpec.scala       |   0
 .../pekko/stream/scaladsl/LazilyAsyncSpec.scala    |   0
 .../pekko/stream/scaladsl/LazyFlowSpec.scala       |   0
 .../pekko/stream/scaladsl/LazySinkSpec.scala       |   0
 .../pekko/stream/scaladsl/LazySourceSpec.scala     |   0
 .../pekko/stream/scaladsl/MaybeSourceSpec.scala    |   0
 .../pekko/stream/scaladsl/NeverSourceSpec.scala    |   0
 .../pekko/stream/scaladsl/PublisherSinkSpec.scala  |   0
 .../pekko/stream/scaladsl/QueueSinkSpec.scala      |   0
 .../pekko/stream/scaladsl/QueueSourceSpec.scala    |   0
 .../apache/pekko/stream/scaladsl/RestartSpec.scala |   0
 .../pekko/stream/scaladsl/RetryFlowSpec.scala      |   0
 .../pekko/stream/scaladsl/ReverseArrowSpec.scala   |   0
 .../pekko/stream/scaladsl/RunnableGraphSpec.scala  |   0
 .../apache/pekko/stream/scaladsl/SeqSinkSpec.scala |   0
 .../apache/pekko/stream/scaladsl/SetupSpec.scala   |   0
 .../stream/scaladsl/SinkAsJavaStreamSpec.scala     |   0
 .../stream/scaladsl/SinkForeachAsyncSpec.scala     |   0
 .../stream/scaladsl/SinkForeachParallelSpec.scala  |   0
 .../apache/pekko/stream/scaladsl/SinkSpec.scala    |   0
 .../stream/scaladsl/SourceFromPublisherSpec.scala  |   0
 .../apache/pekko/stream/scaladsl/SourceSpec.scala  |   0
 .../stream/scaladsl/SourceWithContextSpec.scala    |   0
 .../pekko/stream/scaladsl/StageActorRefSpec.scala  |   0
 .../stream/scaladsl/StreamConvertersSpec.scala     |   0
 .../pekko/stream/scaladsl/StreamRefsSpec.scala     |   0
 .../pekko/stream/scaladsl/SubscriberSinkSpec.scala |   0
 .../stream/scaladsl/SubscriberSourceSpec.scala     |   0
 .../SubstreamSubscriptionTimeoutSpec.scala         |   0
 .../pekko/stream/scaladsl/TakeLastSinkSpec.scala   |   0
 .../apache/pekko/stream/scaladsl/TestConfig.scala  |   0
 .../pekko/stream/scaladsl/TickSourceSpec.scala     |   0
 .../scaladsl/UnfoldResourceAsyncSourceSpec.scala   |   0
 .../stream/scaladsl/UnfoldResourceSourceSpec.scala |   0
 .../stream/scaladsl/WithContextUsageSpec.scala     |   0
 .../stream/snapshot/MaterializerStateSpec.scala    |   0
 .../pekko/stream/typed/javadsl/ActorFlow.scala     |   0
 .../pekko/stream/typed/javadsl/ActorSink.scala     |   0
 .../pekko/stream/typed/javadsl/ActorSource.scala   |   0
 .../apache/pekko/stream/typed/javadsl/PubSub.scala |   0
 .../pekko/stream/typed/scaladsl/ActorFlow.scala    |   0
 .../pekko/stream/typed/scaladsl/ActorSink.scala    |   0
 .../pekko/stream/typed/scaladsl/ActorSource.scala  |   0
 .../pekko/stream/typed/scaladsl/PubSub.scala       |   0
 .../java/docs/javadsl/ActorFlowCompileTest.java    |   0
 .../pekko/stream/typed/ActorSinkExample.java       |   0
 .../stream/typed/ActorSinkWithAckExample.java      |   0
 .../pekko/stream/typed/ActorSourceExample.java     |   0
 .../typed/ActorSourceWithBackpressureExample.java  |   0
 .../typed/javadsl/ActorSourceSinkCompileTest.java  |   0
 .../javadsl/CustomGuardianAndMaterializerTest.java |   0
 .../src/test/resources/logback-test.xml            |   0
 .../stream/typed/ActorSourceSinkExample.scala      |   0
 .../test/scala/docs/scaladsl/ActorFlowSpec.scala   |   0
 .../typed/scaladsl/ActorSourceSinkSpec.scala       |   0
 .../typed/scaladsl/MaterializerForTypedSpec.scala  |   0
 .../pekko/stream/typed/scaladsl/PubSubSpec.scala   |   0
 .../akka/stream/FanInShapeN.scala.template         |   0
 .../akka/stream/FanOutShapeN.scala.template        |   0
 .../akka/stream/javadsl/GraphCreate.scala.template |   0
 .../akka/stream/javadsl/UnzipWith.scala.template   |   0
 .../stream/javadsl/ZipLatestWith.scala.template    |   0
 .../akka/stream/javadsl/ZipWith.scala.template     |   0
 .../akka/stream/scaladsl/GraphApply.scala.template |   0
 .../stream/scaladsl/UnzipWithApply.scala.template  |   0
 .../scaladsl/ZipLatestWithApply.scala.template     |   0
 .../stream/scaladsl/ZipWithApply.scala.template    |   0
 .../pekko/stream/javadsl/JavaFlowSupport.java      |   0
 .../org/apache/pekko/stream/StreamRefMessages.java |   0
 .../apache/pekko/stream/javadsl/AsPublisher.java   |   0
 .../pekko/stream/javadsl/FramingTruncation.java    |   0
 .../src/main/protobuf/StreamRefMessages.proto      |   0
 .../src/main/resources/reference.conf              |   0
 .../akka/stream/impl/JavaFlowAndRsConverters.scala |   0
 .../akka/stream/scaladsl/JavaFlowSupport.scala     |   0
 .../typesafe/sslconfig/pekko/PekkoSSLConfig.scala  |   0
 .../sslconfig/pekko/SSLEngineConfigurator.scala    |   0
 .../sslconfig/pekko/util/PekkoLoggerBridge.scala   |   0
 .../apache/pekko/stream/ActorMaterializer.scala    |   0
 .../scala/org/apache/pekko/stream/Attributes.scala |   0
 .../apache/pekko/stream/BoundedSourceQueue.scala   |   0
 .../apache/pekko/stream/CompletionStrategy.scala   |   0
 .../scala/org/apache/pekko/stream/FanInShape.scala |   0
 .../org/apache/pekko/stream/FanInShape1N.scala     |   0
 .../org/apache/pekko/stream/FanOutShape.scala      |   0
 .../org/apache/pekko/stream/FlowMonitor.scala      |   0
 .../main/scala/org/apache/pekko/stream/Graph.scala |   0
 .../scala/org/apache/pekko/stream/IOResult.scala   |   0
 .../scala/org/apache/pekko/stream/KillSwitch.scala |   0
 .../org/apache/pekko/stream/Materializer.scala     |   0
 .../pekko/stream/MaterializerLoggingProvider.scala |   0
 .../pekko/stream/NeverMaterializedException.scala  |   0
 .../org/apache/pekko/stream/OverflowStrategy.scala |   0
 .../org/apache/pekko/stream/QueueOfferResult.scala |   0
 .../org/apache/pekko/stream/RestartSettings.scala  |   0
 .../main/scala/org/apache/pekko/stream/Shape.scala |   0
 .../org/apache/pekko/stream/SslTlsOptions.scala    |   0
 .../pekko/stream/StreamDetachedException.scala     |   0
 .../pekko/stream/StreamLimitReachedException.scala |   0
 .../apache/pekko/stream/StreamRefSettings.scala    |   0
 .../scala/org/apache/pekko/stream/StreamRefs.scala |   0
 .../apache/pekko/stream/StreamTcpException.scala   |   0
 .../stream/SubscriptionWithCancelException.scala   |   0
 .../pekko/stream/SubstreamCancelStrategy.scala     |   0
 .../org/apache/pekko/stream/Supervision.scala      |   0
 .../apache/pekko/stream/SystemMaterializer.scala   |   0
 .../org/apache/pekko/stream/ThrottleMode.scala     |   0
 .../stream/TooManySubstreamsOpenException.scala    |   0
 .../apache/pekko/stream/UniformFanInShape.scala    |   0
 .../apache/pekko/stream/UniformFanOutShape.scala   |   0
 .../stream/WatchedActorTerminatedException.scala   |   0
 .../pekko/stream/impl/ActorMaterializerImpl.scala  |   0
 .../apache/pekko/stream/impl/ActorProcessor.scala  |   0
 .../apache/pekko/stream/impl/ActorPublisher.scala  |   0
 .../impl/ActorRefBackpressureSinkStage.scala       |   0
 .../stream/impl/ActorRefBackpressureSource.scala   |   0
 .../pekko/stream/impl/ActorRefSinkStage.scala      |   0
 .../apache/pekko/stream/impl/ActorRefSource.scala  |   0
 .../pekko/stream/impl/ActorSubscriberMessage.scala |   0
 .../pekko/stream/impl/BoundedSourceQueue.scala     |   0
 .../org/apache/pekko/stream/impl/Buffers.scala     |   0
 .../pekko/stream/impl/CompletedPublishers.scala    |   0
 .../org/apache/pekko/stream/impl/ConstantFun.scala |   0
 .../pekko/stream/impl/ContextPropagation.scala     |   0
 .../org/apache/pekko/stream/impl/EmptySource.scala |   0
 .../stream/impl/ExposedPublisherReceive.scala      |   0
 .../apache/pekko/stream/impl/FailedSource.scala    |   0
 .../scala/org/apache/pekko/stream/impl/FanIn.scala |   0
 .../org/apache/pekko/stream/impl/FanOut.scala      |   0
 .../apache/pekko/stream/impl/FanoutProcessor.scala |   0
 .../pekko/stream/impl/JavaStreamSource.scala       |   0
 .../pekko/stream/impl/JsonObjectParser.scala       |   0
 .../org/apache/pekko/stream/impl/LazySource.scala  |   0
 .../pekko/stream/impl/MaterializerGuardian.scala   |   0
 .../org/apache/pekko/stream/impl/MaybeSource.scala |   0
 .../org/apache/pekko/stream/impl/Messages.scala    |   0
 .../org/apache/pekko/stream/impl/Modules.scala     |   0
 .../impl/PhasedFusingActorMaterializer.scala       |   0
 .../org/apache/pekko/stream/impl/QueueSource.scala |   0
 .../stream/impl/ReactiveStreamsCompliance.scala    |   0
 .../impl/ResizableMultiReaderRingBuffer.scala      |   0
 .../pekko/stream/impl/RetryFlowCoordinator.scala   |   0
 .../apache/pekko/stream/impl/SeqActorName.scala    |   0
 .../org/apache/pekko/stream/impl/SetupStage.scala  |   0
 .../apache/pekko/stream/impl/SingleConcat.scala    |   0
 .../pekko/stream/impl/SinkholeSubscriber.scala     |   0
 .../scala/org/apache/pekko/stream/impl/Sinks.scala |   0
 .../org/apache/pekko/stream/impl/Stages.scala      |   0
 .../apache/pekko/stream/impl/StreamLayout.scala    |   0
 .../stream/impl/StreamSubscriptionTimeout.scala    |   0
 .../org/apache/pekko/stream/impl/SubFlowImpl.scala |   0
 .../pekko/stream/impl/SubscriberManagement.scala   |   0
 .../org/apache/pekko/stream/impl/Throttle.scala    |   0
 .../org/apache/pekko/stream/impl/Timers.scala      |   0
 .../org/apache/pekko/stream/impl/Transfer.scala    |   0
 .../pekko/stream/impl/TraversalBuilder.scala       |   0
 .../org/apache/pekko/stream/impl/Unfold.scala      |   0
 .../pekko/stream/impl/UnfoldResourceSource.scala   |   0
 .../stream/impl/UnfoldResourceSourceAsync.scala    |   0
 .../stream/impl/fusing/ActorGraphInterpreter.scala |   0
 .../stream/impl/fusing/AggregateWithBoundary.scala |   0
 .../pekko/stream/impl/fusing/FlatMapPrefix.scala   |   0
 .../pekko/stream/impl/fusing/FutureFlow.scala      |   0
 .../stream/impl/fusing/GraphInterpreter.scala      |   0
 .../pekko/stream/impl/fusing/GraphStages.scala     |   0
 .../org/apache/pekko/stream/impl/fusing/Ops.scala  |   0
 .../pekko/stream/impl/fusing/StreamOfStreams.scala |   0
 .../pekko/stream/impl/io/ByteStringParser.scala    |   0
 .../pekko/stream/impl/io/FileOutputStage.scala     |   0
 .../apache/pekko/stream/impl/io/IOSources.scala    |   0
 .../stream/impl/io/InputStreamSinkStage.scala      |   0
 .../pekko/stream/impl/io/InputStreamSource.scala   |   0
 .../stream/impl/io/OutputStreamGraphStage.scala    |   0
 .../stream/impl/io/OutputStreamSourceStage.scala   |   0
 .../org/apache/pekko/stream/impl/io/TLSActor.scala |   0
 .../apache/pekko/stream/impl/io/TcpStages.scala    |   0
 .../apache/pekko/stream/impl/io/TlsModule.scala    |   0
 .../impl/io/compression/CompressionUtils.scala     |   0
 .../stream/impl/io/compression/Compressor.scala    |   0
 .../impl/io/compression/DeflateCompressor.scala    |   0
 .../impl/io/compression/DeflateDecompressor.scala  |   0
 .../io/compression/DeflateDecompressorBase.scala   |   0
 .../impl/io/compression/GzipCompressor.scala       |   0
 .../impl/io/compression/GzipDecompressor.scala     |   0
 .../org/apache/pekko/stream/impl/package.scala     |   0
 .../pekko/stream/impl/streamref/SinkRefImpl.scala  |   0
 .../stream/impl/streamref/SourceRefImpl.scala      |   0
 .../impl/streamref/StreamRefResolverImpl.scala     |   0
 .../impl/streamref/StreamRefSettingsImpl.scala     |   0
 .../stream/impl/streamref/StreamRefsMaster.scala   |   0
 .../stream/impl/streamref/StreamRefsProtocol.scala |   0
 .../org/apache/pekko/stream/javadsl/BidiFlow.scala |   0
 .../apache/pekko/stream/javadsl/Compression.scala  |   0
 .../stream/javadsl/CoupledTerminationFlow.scala    |   0
 .../pekko/stream/javadsl/DelayStrategy.scala       |   0
 .../org/apache/pekko/stream/javadsl/FileIO.scala   |   0
 .../org/apache/pekko/stream/javadsl/Flow.scala     |   0
 .../pekko/stream/javadsl/FlowWithContext.scala     |   0
 .../org/apache/pekko/stream/javadsl/Framing.scala  |   0
 .../org/apache/pekko/stream/javadsl/Graph.scala    |   0
 .../org/apache/pekko/stream/javadsl/Hub.scala      |   0
 .../apache/pekko/stream/javadsl/JsonFraming.scala  |   0
 .../org/apache/pekko/stream/javadsl/Keep.scala     |   0
 .../apache/pekko/stream/javadsl/MergeLatest.scala  |   0
 .../org/apache/pekko/stream/javadsl/Queue.scala    |   0
 .../apache/pekko/stream/javadsl/RestartFlow.scala  |   0
 .../apache/pekko/stream/javadsl/RestartSink.scala  |   0
 .../pekko/stream/javadsl/RestartSource.scala       |   0
 .../apache/pekko/stream/javadsl/RetryFlow.scala    |   0
 .../org/apache/pekko/stream/javadsl/Sink.scala     |   0
 .../org/apache/pekko/stream/javadsl/Source.scala   |   0
 .../pekko/stream/javadsl/SourceWithContext.scala   |   0
 .../pekko/stream/javadsl/StreamConverters.scala    |   0
 .../apache/pekko/stream/javadsl/StreamRefs.scala   |   0
 .../org/apache/pekko/stream/javadsl/SubFlow.scala  |   0
 .../apache/pekko/stream/javadsl/SubSource.scala    |   0
 .../org/apache/pekko/stream/javadsl/TLS.scala      |   0
 .../org/apache/pekko/stream/javadsl/Tcp.scala      |   0
 .../org/apache/pekko/stream/javadsl/package.scala  |   0
 .../apache/pekko/stream/scaladsl/BidiFlow.scala    |   0
 .../apache/pekko/stream/scaladsl/Compression.scala |   0
 .../stream/scaladsl/CoupledTerminationFlow.scala   |   0
 .../pekko/stream/scaladsl/DelayStrategy.scala      |   0
 .../org/apache/pekko/stream/scaladsl/FileIO.scala  |   0
 .../org/apache/pekko/stream/scaladsl/Flow.scala    |   0
 .../pekko/stream/scaladsl/FlowWithContext.scala    |   0
 .../pekko/stream/scaladsl/FlowWithContextOps.scala |   0
 .../org/apache/pekko/stream/scaladsl/Framing.scala |   0
 .../org/apache/pekko/stream/scaladsl/Graph.scala   |   0
 .../org/apache/pekko/stream/scaladsl/Hub.scala     |   0
 .../apache/pekko/stream/scaladsl/JsonFraming.scala |   0
 .../pekko/stream/scaladsl/Materialization.scala    |   0
 .../apache/pekko/stream/scaladsl/MergeLatest.scala |   0
 .../org/apache/pekko/stream/scaladsl/Queue.scala   |   0
 .../apache/pekko/stream/scaladsl/RestartFlow.scala |   0
 .../apache/pekko/stream/scaladsl/RestartSink.scala |   0
 .../pekko/stream/scaladsl/RestartSource.scala      |   0
 .../apache/pekko/stream/scaladsl/RetryFlow.scala   |   0
 .../org/apache/pekko/stream/scaladsl/Sink.scala    |   0
 .../org/apache/pekko/stream/scaladsl/Source.scala  |   0
 .../pekko/stream/scaladsl/SourceWithContext.scala  |   0
 .../pekko/stream/scaladsl/StreamConverters.scala   |   0
 .../apache/pekko/stream/scaladsl/StreamRefs.scala  |   0
 .../org/apache/pekko/stream/scaladsl/SubFlow.scala |   0
 .../org/apache/pekko/stream/scaladsl/TLS.scala     |   0
 .../org/apache/pekko/stream/scaladsl/Tcp.scala     |   0
 .../org/apache/pekko/stream/scaladsl/package.scala |   0
 .../stream/serialization/StreamRefSerializer.scala |   0
 .../pekko/stream/snapshot/MaterializerState.scala  |   0
 .../org/apache/pekko/stream/stage/GraphStage.scala |   0
 .../apache/pekko/stream/stage/StageLogging.scala   |   0
 .../src/main/resources/reference.conf              |   0
 .../pekko/testkit/CallingThreadDispatcher.scala    |   0
 .../testkit/ExplicitlyTriggeredScheduler.scala     |   0
 .../apache/pekko/testkit/JavaSerializable.scala    |   0
 .../org/apache/pekko/testkit/SocketUtil.scala      |   0
 .../org/apache/pekko/testkit/TestActorRef.scala    |   0
 .../org/apache/pekko/testkit/TestActors.scala      |   0
 .../org/apache/pekko/testkit/TestBarrier.scala     |   0
 .../apache/pekko/testkit/TestEventListener.scala   |   0
 .../org/apache/pekko/testkit/TestException.scala   |   0
 .../org/apache/pekko/testkit/TestFSMRef.scala      |   0
 .../apache/pekko/testkit/TestJavaSerializer.scala  |   0
 .../scala/org/apache/pekko/testkit/TestKit.scala   |   0
 .../apache/pekko/testkit/TestKitExtension.scala    |   0
 .../org/apache/pekko/testkit/TestKitUtils.scala    |   0
 .../scala/org/apache/pekko/testkit/TestLatch.scala |   0
 .../apache/pekko/testkit/javadsl/EventFilter.scala |   0
 .../org/apache/pekko/testkit/javadsl/TestKit.scala |   0
 .../scala/org/apache/pekko/testkit/package.scala   |   0
 .../testkit/PekkoJUnitActorSystemResource.java     |   0
 .../pekko/testkit/TestActorRefJavaCompile.java     |   0
 .../pekko/testkit/javadsl/TestKitApiTest.java      |   0
 .../src/test/resources/reference.conf              |   0
 .../org/apache/pekko/testkit/AbstractSpec.scala    |   0
 .../scala/org/apache/pekko/testkit/Coroner.scala   |   0
 .../org/apache/pekko/testkit/CoronerSpec.scala     |   0
 .../apache/pekko/testkit/DefaultTimeoutSpec.scala  |   0
 .../testkit/ExplicitlyTriggeredSchedulerSpec.scala |   0
 .../apache/pekko/testkit/ImplicitSenderSpec.scala  |   0
 .../scala/org/apache/pekko/testkit/PekkoSpec.scala |   0
 .../org/apache/pekko/testkit/PekkoSpecSpec.scala   |   0
 .../apache/pekko/testkit/TestActorRefSpec.scala    |   0
 .../org/apache/pekko/testkit/TestActorsSpec.scala  |   0
 .../pekko/testkit/TestEventListenerSpec.scala      |   0
 .../org/apache/pekko/testkit/TestFSMRefSpec.scala  |   0
 .../org/apache/pekko/testkit/TestProbeSpec.scala   |   0
 .../scala/org/apache/pekko/testkit/TestTags.scala  |   0
 .../org/apache/pekko/testkit/TestTimeSpec.scala    |   0
 .../apache/pekko/testkit/WithLogCapturing.scala    |   0
 .../pekko/testkit/metrics/AveragingGauge.scala     |   0
 .../testkit/metrics/FileDescriptorMetricSet.scala  |   0
 .../pekko/testkit/metrics/HdrHistogram.scala       |   0
 .../testkit/metrics/KnownOpsInTimespanTimer.scala  |   0
 .../testkit/metrics/MemoryUsageSnapshotting.scala  |   0
 .../pekko/testkit/metrics/MetricKeyDSL.scala       |   0
 .../apache/pekko/testkit/metrics/MetricsKit.scala  |   0
 .../pekko/testkit/metrics/MetricsKitOps.scala      |   0
 .../pekko/testkit/metrics/MetricsKitSpec.scala     |   0
 .../metrics/reporter/PekkoConsoleReporter.scala    |   0
 2930 files changed, 1466 insertions(+), 1462 deletions(-)

diff --git a/.github/autolabeler.yml b/.github/autolabeler.yml
index bc4599aa88..1573656333 100644
--- a/.github/autolabeler.yml
+++ b/.github/autolabeler.yml
@@ -2,4 +2,4 @@
 
 dependency-change: "/project/Dependencies.scala"
 
-'t:stream': ["/akka-stream", "/akka-stream-testkit", "/akka-stream-tests", "/akka-stream-tests-tck", "/akka-stream-typed"]
+'t:stream': ["/stream", "/stream-testkit", "/stream-tests", "/stream-tests-tck", "/stream-typed"]
diff --git a/.github/workflows/nightly-builds.yml b/.github/workflows/nightly-builds.yml
index 2c88e35d86..f9ea5181ca 100644
--- a/.github/workflows/nightly-builds.yml
+++ b/.github/workflows/nightly-builds.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Enable jvm-opts
         run: cp .jvmopts-ci .jvmopts
 
-      - name: sbt akka-cluster-metrics/test
+      - name: sbt cluster-metrics/test
         run: |-
           sbt \
             -Djava.security.egd=file:/dev/./urandom \
@@ -44,7 +44,7 @@ jobs:
             -Dmultinode.Xmx256M \
             -Dmultinode.Xlog:gc \
             -Dmultinode.XX:+AlwaysActAsServerClassMachine \
-            clean akka-cluster-metrics/test
+            clean cluster-metrics/test
 
 # comment out test report until an apache or GitHub published action (action-surefire-report) can be found or added allowlist from INFRA
 #      - name: Test Reports
@@ -80,9 +80,9 @@ jobs:
       fail-fast: false
       matrix:
         command:
-          - akka-cluster/test akka-distributed-data/test akka-cluster-tools/test akka-cluster-metrics/test
-          - akka-cluster-sharding/test
-          - akka-cluster-typed/test akka-cluster-sharding-typed/test
+          - cluster/test distributed-data/test cluster-tools/test cluster-metrics/test
+          - cluster-sharding/test
+          - cluster-typed/test cluster-sharding-typed/test
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -240,8 +240,8 @@ jobs:
       fail-fast: false
       matrix:
         command:
-          - akka-remote/test akka-remote-tests/test
-          - akka-cluster/test akka-cluster-typed/test
+          - remote/test remote-tests/test
+          - cluster/test cluster-typed/test
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/.github/workflows/scala3-build.yml b/.github/workflows/scala3-build.yml
index 61e7b962b8..e047178a00 100644
--- a/.github/workflows/scala3-build.yml
+++ b/.github/workflows/scala3-build.yml
@@ -19,17 +19,17 @@ jobs:
     strategy:
       matrix:
         command:
-          - akka-testkit/test akka-actor-tests/test
-          - akka-actor-testkit-typed/test akka-actor-typed-tests/test
-          - akka-bench-jmh/test
-          - akka-cluster/test akka-cluster-tools/test akka-cluster-typed/test akka-distributed-data/test akka-cluster-metrics/test akka-cluster-sharding/test akka-cluster-sharding-typed/test
-          - akka-discovery/test akka-coordination/test
-          - akka-persistence/test akka-persistence-shared/test akka-persistence-query/test akka-persistence-typed/test akka-persistence-testkit/test akka-persistence-tck/test akka-persistence-typed-tests/test
-          - akka-pki/test akka-slf4j/test
-          - akka-serialization-jackson/test
-          - akka-stream/test akka-stream-testkit/test akka-stream-tests/test akka-stream-typed/test
-          - akka-stream-tests-tck/test
-          - akka-remote/test akka-remote-tests/test akka-protobuf/test akka-protobuf-v3/test
+          - testkit/test actor-tests/test
+          - actor-testkit-typed/test actor-typed-tests/test
+          - bench-jmh/test
+          - cluster/test cluster-tools/test cluster-typed/test distributed-data/test cluster-metrics/test cluster-sharding/test cluster-sharding-typed/test
+          - discovery/test coordination/test
+          - persistence/test persistence-shared/test persistence-query/test persistence-typed/test persistence-testkit/test persistence-tck/test persistence-typed-tests/test
+          - pki/test slf4j/test
+          - serialization-jackson/test
+          - stream/test stream-testkit/test stream-tests/test stream-typed/test
+          - stream-tests-tck/test
+          - remote/test remote-tests/test protobuf/test protobuf-v3/test
       fail-fast: true
     steps:
       - name: Checkout
diff --git a/.github/workflows/scala3-compile.yml b/.github/workflows/scala3-compile.yml
index 442014abb5..075f46e872 100644
--- a/.github/workflows/scala3-compile.yml
+++ b/.github/workflows/scala3-compile.yml
@@ -16,17 +16,17 @@ jobs:
     strategy:
       matrix:
         command:
-          - akka-testkit/Test/compile akka-actor-tests/Test/compile
-          - akka-actor-testkit-typed/Test/compile akka-actor-typed-tests/Test/compile
-          - akka-bench-jmh/Test/compile
-          - akka-cluster/Test/compile akka-cluster-tools/Test/compile akka-cluster-typed/Test/compile akka-distributed-data/Test/compile akka-cluster-metrics/Test/compile akka-cluster-sharding/Test/compile akka-cluster-sharding-typed/Test/compile
-          - akka-discovery/Test/compile akka-coordination/Test/compile
-          - akka-persistence/Test/compile akka-persistence-shared/Test/compile akka-persistence-query/Test/compile akka-persistence-typed/Test/compile akka-persistence-testkit/Test/compile akka-persistence-tck/Test/compile akka-persistence-typed-tests/Test/compile
-          - akka-pki/Test/compile akka-slf4j/Test/compile
-          - akka-serialization-jackson/Test/compile
-          - akka-stream/Test/compile akka-stream-testkit/Test/compile akka-stream-tests/Test/compile akka-stream-typed/Test/compile
-          - akka-stream-tests-tck/Test/compile
-          - akka-remote/Test/compile akka-remote-tests/Test/compile akka-protobuf/Test/compile akka-protobuf-v3/Test/compile
+          - testkit/Test/compile actor-tests/Test/compile
+          - actor-testkit-typed/Test/compile actor-typed-tests/Test/compile
+          - bench-jmh/Test/compile
+          - cluster/Test/compile cluster-tools/Test/compile cluster-typed/Test/compile distributed-data/Test/compile cluster-metrics/Test/compile cluster-sharding/Test/compile cluster-sharding-typed/Test/compile
+          - discovery/Test/compile coordination/Test/compile
+          - persistence/Test/compile persistence-shared/Test/compile persistence-query/Test/compile persistence-typed/Test/compile persistence-testkit/Test/compile persistence-tck/Test/compile persistence-typed-tests/Test/compile
+          - pki/Test/compile slf4j/Test/compile
+          - serialization-jackson/Test/compile
+          - stream/Test/compile stream-testkit/Test/compile stream-tests/Test/compile stream-typed/Test/compile
+          - stream-tests-tck/Test/compile
+          - remote/Test/compile remote-tests/Test/compile protobuf/Test/compile protobuf-v3/Test/compile
       fail-fast: true
     steps:
       - name: Checkout
diff --git a/.gitignore b/.gitignore
index fdb1c7885e..d76f538aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,7 +48,7 @@ activemq-data
 docs/_build/
 docs/exts/
 docs/rst_preprocessed/
-akka-osgi/src/main/resources/*.conf
+osgi/src/main/resources/*.conf
 akka.sublime-project
 akka.sublime-workspace
 akka.tmproj
@@ -64,7 +64,7 @@ metals.sbt
 mongoDB/
 multiverse.log
 out
-project/akka-build.properties
+project/pekko-build.properties
 project/boot/*
 project/plugins/project
 redis/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 849de21260..8cdf5c91a8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -217,8 +217,8 @@ The Pekko build includes a special task called `validatePullRequest`, which inve
 (uncommitted changes) in your local working directory and figures out which projects are impacted by those changes,
 then running tests only on those projects.
 
-For example, changing something in `akka-actor` would cause tests to be run in all projects which depend on it
-(e.g. `akka-actor-tests`, `akka-stream`, `docs` etc.).
+For example, changing something in `actor` would cause tests to be run in all projects which depend on it
+(e.g. `actor-tests`, `stream`, `docs` etc.).
 
 To use the task, simply type `validatePullRequest`, and the output should include entries like shown below:
 
@@ -258,7 +258,7 @@ PR fails due to binary compatibility issues, you may see an error like this:
 In such situations it's good to consult with a core team member whether the violation can be safely ignored or if it would indeed
 break binary compatibility. If the violation can be ignored add exclude statements from the mima output to
 a new file named `<module>/src/main/mima-filters/<last-version>.backwards.excludes/<pr-or-issue>-<issue-number>-<description>.excludes`,
-e.g. `akka-actor/src/main/mima-filters/2.6.0.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment
+e.g. `actor/src/main/mima-filters/2.6.0.backwards.excludes/pr-12345-rename-internal-classes.excludes`. Make sure to add a comment
 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:
@@ -424,8 +424,8 @@ For first time contributors, the workflow will be run after an approval from a c
 
 To speed up PR validation times the Akka build contains a special sbt task called `validatePullRequest`,
 which is smart enough to figure out which projects should be built if a PR only has changes in some parts of the project.
-For example, if your PR only touches `akka-persistence`, no `akka-remote` tests need to be run, however the task
-will validate all projects that depend on `akka-persistence` (including samples).
+For example, if your PR only touches `persistence`, no `remote` tests need to be run, however the task
+will validate all projects that depend on `persistence` (including samples).
 Also, tests tagged as `PerformanceTest`, `TimingTest`, `LongRunningTest`, and all multi-node tests are excluded from PR validation.
 
 You can exclude the same kind of tests in your local build by starting sbt with:
@@ -494,7 +494,7 @@ There are a number of ways timeouts can be defined in Pekko tests. The following
 
 Special care should be given to `expectNoMessage` calls, which indeed will wait for the entire timeout before continuing. Therefore a shorter timeout should be used in those, for example `200.millis` or `300.millis`. Prefer the method without timeout parameter, which will use the configured `expect-no-message-default` timeout.
 
-You can read up on `remaining` and friends in [TestKit.scala](https://github.com/apache/incubator-pekko/blob/main/akka-testkit/src/main/scala/akka/testkit/TestKit.scala).
+You can read up on `remaining` and friends in [TestKit.scala](https://github.com/apache/incubator-pekko/blob/main/testkit/src/main/scala/org/apache/pekko/testkit/TestKit.scala).
 
 ### Contributing modules
 
diff --git a/LICENSE b/LICENSE
index c145bf1419..6e91bd37ca 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,6 +207,6 @@ Licenses for dependency projects can be found here:
 
 ---------------
 
-akka-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
-moved into the source package `akka.protobuf` so as to avoid version conflicts.
+pekko-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
+moved into the source package `org.apache.pekko.protobuf` so as to avoid version conflicts.
 For license information see COPYING.protobuf
diff --git a/akka-actor-testkit-typed/src/main/resources/reference.conf b/actor-testkit-typed/src/main/resources/reference.conf
similarity index 100%
rename from akka-actor-testkit-typed/src/main/resources/reference.conf
rename to actor-testkit-typed/src/main/resources/reference.conf
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/CapturedLogEvent.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/Effect.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/FishingOutcome.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/LoggingEvent.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestException.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/TestKitSettings.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ActorSystemStub.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/BehaviorTestKitImpl.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/CapturingAppender.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/ControlledExecutor.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/DebugRef.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/EffectfulActorContext.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LogbackUtil.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/LoggingTestKitImpl.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/StubbedActorContext.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestAppender.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestInboxImpl.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestKitUtils.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/internal/TestProbeImpl.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/Effects.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturing.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/ManualTime.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/SerializationTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestInbox.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestKitJunitResource.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/javadsl/TestProbe.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitBase.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/Effects.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LogCapturing.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTime.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestWithActorTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/SerializationTestKit.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestInbox.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbe.scala
diff --git a/akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala b/actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala
rename to actor-testkit-typed/src/main/scala/org/apache/pekko/actor/testkit/typed/scaladsl/package.scala
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/AsyncTestingExampleTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/JunitIntegrationExampleTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/LogCapturingExampleTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/ManualTimerExampleTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/SyncTestingExampleTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java b/actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java
rename to actor-testkit-typed/src/test/java/jdocs/org/apache/pekko/actor/testkit/typed/javadsl/TestConfigExample.java
diff --git a/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
rename to actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitApiTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
rename to actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/ActorTestKitTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
rename to actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/BehaviorTestKitTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
rename to actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/LoggingTestKitTest.java
diff --git a/akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java b/actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
similarity index 100%
rename from akka-actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
rename to actor-testkit-typed/src/test/java/org/apache/pekko/actor/testkit/typed/javadsl/TestProbeTest.java
diff --git a/akka-actor-testkit-typed/src/test/resources/application-test.conf b/actor-testkit-typed/src/test/resources/application-test.conf
similarity index 100%
rename from akka-actor-testkit-typed/src/test/resources/application-test.conf
rename to actor-testkit-typed/src/test/resources/application-test.conf
diff --git a/akka-actor-testkit-typed/src/test/resources/application.conf b/actor-testkit-typed/src/test/resources/application.conf
similarity index 100%
rename from akka-actor-testkit-typed/src/test/resources/application.conf
rename to actor-testkit-typed/src/test/resources/application.conf
diff --git a/akka-actor-testkit-typed/src/test/resources/logback-test.xml b/actor-testkit-typed/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-actor-testkit-typed/src/test/resources/logback-test.xml
rename to actor-testkit-typed/src/test/resources/logback-test.xml
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala b/actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
rename to actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/AsyncTestingExampleSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala b/actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
rename to actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ManualTimerExampleSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala b/actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala
rename to actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/ScalaTestIntegrationExampleSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala b/actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
rename to actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/SyncTestingExampleSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala b/actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala
rename to actor-testkit-typed/src/test/scala/docs/org/apache/pekko/actor/testkit/typed/scaladsl/TestConfigExample.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
rename to actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/ActorTestKitSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
rename to actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/BehaviorTestKitSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala
rename to actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/LoggingEventFilterSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
rename to actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestAppenderSpec.scala
diff --git a/akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala b/actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala
similarity index 100%
rename from akka-actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala
rename to actor-testkit-typed/src/test/scala/org/apache/pekko/actor/testkit/typed/scaladsl/TestProbeSpec.scala
diff --git a/akka-actor-tests/src/test/bind/etc/bind.keys b/actor-tests/src/test/bind/etc/bind.keys
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/bind.keys
rename to actor-tests/src/test/bind/etc/bind.keys
diff --git a/akka-actor-tests/src/test/bind/etc/db.0 b/actor-tests/src/test/bind/etc/db.0
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.0
rename to actor-tests/src/test/bind/etc/db.0
diff --git a/akka-actor-tests/src/test/bind/etc/db.127 b/actor-tests/src/test/bind/etc/db.127
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.127
rename to actor-tests/src/test/bind/etc/db.127
diff --git a/akka-actor-tests/src/test/bind/etc/db.255 b/actor-tests/src/test/bind/etc/db.255
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.255
rename to actor-tests/src/test/bind/etc/db.255
diff --git a/akka-actor-tests/src/test/bind/etc/db.bar.example b/actor-tests/src/test/bind/etc/db.bar.example
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.bar.example
rename to actor-tests/src/test/bind/etc/db.bar.example
diff --git a/akka-actor-tests/src/test/bind/etc/db.empty b/actor-tests/src/test/bind/etc/db.empty
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.empty
rename to actor-tests/src/test/bind/etc/db.empty
diff --git a/akka-actor-tests/src/test/bind/etc/db.foo.test b/actor-tests/src/test/bind/etc/db.foo.test
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.foo.test
rename to actor-tests/src/test/bind/etc/db.foo.test
diff --git a/akka-actor-tests/src/test/bind/etc/db.local b/actor-tests/src/test/bind/etc/db.local
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.local
rename to actor-tests/src/test/bind/etc/db.local
diff --git a/akka-actor-tests/src/test/bind/etc/db.root b/actor-tests/src/test/bind/etc/db.root
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/db.root
rename to actor-tests/src/test/bind/etc/db.root
diff --git a/akka-actor-tests/src/test/bind/etc/named.conf b/actor-tests/src/test/bind/etc/named.conf
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/named.conf
rename to actor-tests/src/test/bind/etc/named.conf
diff --git a/akka-actor-tests/src/test/bind/etc/named.conf.default-zones b/actor-tests/src/test/bind/etc/named.conf.default-zones
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/named.conf.default-zones
rename to actor-tests/src/test/bind/etc/named.conf.default-zones
diff --git a/akka-actor-tests/src/test/bind/etc/named.conf.local b/actor-tests/src/test/bind/etc/named.conf.local
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/named.conf.local
rename to actor-tests/src/test/bind/etc/named.conf.local
diff --git a/akka-actor-tests/src/test/bind/etc/named.conf.options b/actor-tests/src/test/bind/etc/named.conf.options
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/named.conf.options
rename to actor-tests/src/test/bind/etc/named.conf.options
diff --git a/akka-actor-tests/src/test/bind/etc/rndc.key b/actor-tests/src/test/bind/etc/rndc.key
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/rndc.key
rename to actor-tests/src/test/bind/etc/rndc.key
diff --git a/akka-actor-tests/src/test/bind/etc/zones.rfc1918 b/actor-tests/src/test/bind/etc/zones.rfc1918
similarity index 100%
rename from akka-actor-tests/src/test/bind/etc/zones.rfc1918
rename to actor-tests/src/test/bind/etc/zones.rfc1918
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/AbstractFSMActorTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/ActorCreationTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/ActorSelectionTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/ActorSystemTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/AddressTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java b/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/JavaAPI.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java b/actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/JavaAPITestActor.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java b/actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/JavaExtension.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java b/actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/NonPublicClass.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java b/actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/NonStaticCreator.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java b/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPI.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java b/actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/StashJavaAPITestActors.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java b/actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/TestAnnotation.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java b/actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
rename to actor-tests/src/test/java/org/apache/pekko/actor/setup/ActorSystemSetupTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java b/actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java
rename to actor-tests/src/test/java/org/apache/pekko/dispatch/JavaFutureTests.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java b/actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
rename to actor-tests/src/test/java/org/apache/pekko/event/ActorWithMDC.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java b/actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
rename to actor-tests/src/test/java/org/apache/pekko/event/LoggingAdapterTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java b/actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
rename to actor-tests/src/test/java/org/apache/pekko/japi/JavaAPITestBase.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
rename to actor-tests/src/test/java/org/apache/pekko/japi/MatchBuilderTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java
rename to actor-tests/src/test/java/org/apache/pekko/japi/ThrowablesTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
rename to actor-tests/src/test/java/org/apache/pekko/japi/pf/PFBuilderTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java b/actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
rename to actor-tests/src/test/java/org/apache/pekko/japi/pf/ReceiveBuilderTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
rename to actor-tests/src/test/java/org/apache/pekko/pattern/CircuitBreakerTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
rename to actor-tests/src/test/java/org/apache/pekko/pattern/PatternsTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java b/actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
rename to actor-tests/src/test/java/org/apache/pekko/pattern/StatusReplyTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java b/actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
rename to actor-tests/src/test/java/org/apache/pekko/util/ByteStringTest.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java b/actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
rename to actor-tests/src/test/java/org/apache/pekko/util/JavaDuration.java
diff --git a/akka-actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java b/actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java
similarity index 100%
rename from akka-actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java
rename to actor-tests/src/test/java/org/apache/pekko/util/LineNumberSpecCodeForJava.java
diff --git a/akka-actor-tests/src/test/resources/reference.conf b/actor-tests/src/test/resources/reference.conf
similarity index 100%
rename from akka-actor-tests/src/test/resources/reference.conf
rename to actor-tests/src/test/resources/reference.conf
diff --git a/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala b/actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala
rename to actor-tests/src/test/scala-2.12/org/apache/pekko/util/LineNumberSpec.scala
diff --git a/akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala b/actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala
rename to actor-tests/src/test/scala-2.12/org/apache/pekko/util/TypedMultiMapSpec.scala
diff --git a/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala b/actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala
rename to actor-tests/src/test/scala-2.13/org/apache/pekko/util/LineNumberSpec.scala
diff --git a/akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala b/actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala
rename to actor-tests/src/test/scala-2.13/org/apache/pekko/util/TypedMultiMapSpec.scala
diff --git a/akka-actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala b/actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala
rename to actor-tests/src/test/scala-3/org/apache/pekko/util/LineNumberSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/Messages.scala b/actor-tests/src/test/scala/org/apache/pekko/Messages.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/Messages.scala
rename to actor-tests/src/test/scala/org/apache/pekko/Messages.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/PekkoExceptionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/PekkoExceptionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/PekkoExceptionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/PekkoExceptionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/PekkoVersionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/PekkoVersionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/PekkoVersionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/PekkoVersionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorConfigurationVerificationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorCreationPerfSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorLifeCycleSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorMailboxSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorPathSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorRefSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorSelectionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemDispatcherSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorSystemSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorTimeoutSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithBoundedStashSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ActorWithStashSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/Bench.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ConsistencySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/CoordinatedShutdownSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSupressionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/DeadLetterSuspensionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/DeathWatchSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/DeployerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/DynamicAccessSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ExtensionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/FSMActorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/FSMTimingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/FSMTransitionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ForwardActorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/FunctionRefSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/HotSwapSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/LocalActorRefProviderSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/PropsCreationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ProviderSelectionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/ReceiveTimeoutSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/RelativeActorPathSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/RestartStrategySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/SchedulerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/Supervisor.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorHierarchySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorMiscSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/SupervisorTreeSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/Ticket669Spec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/TimerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/TypedActorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/UidClashTest.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/ActorModelSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/BalancingDispatcherSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatcherActorsSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/DispatchersSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dispatch/PinnedActorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/dungeon/DispatchSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/routing/ListenerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/actor/setup/ActorSystemSetupSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
similarity index 96%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
index 1103e66e3e..1a11eaef7e 100644
--- a/akka-actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/config/ConfigSpec.scala
@@ -21,7 +21,7 @@ import pekko.testkit.PekkoSpec
 class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.findClassLoader())) with Assertions {
 
   "The default configuration file (i.e. reference.conf)" must {
-    "contain all configuration properties for akka-actor that are used in code with their correct defaults" in {
+    "contain all configuration properties for pekko-actor that are used in code with their correct defaults" in {
 
       val settings = system.settings
       val config = settings.config
@@ -174,7 +174,7 @@ class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.fi
   }
 
   "SLF4J Settings" must {
-    "not be amended for default reference in akka-actor" in {
+    "not be amended for default reference in pekko-actor" in {
       val dynamicAccess = system.asInstanceOf[ExtendedActorSystem].dynamicAccess
       val config = ActorSystem.Settings.amendSlf4jConfig(ConfigFactory.defaultReference(), dynamicAccess)
       config.getStringList("pekko.loggers").size() should ===(1)
@@ -182,7 +182,7 @@ class ConfigSpec extends PekkoSpec(ConfigFactory.defaultReference(ActorSystem.fi
       config.getString("pekko.logging-filter") should ===(classOf[DefaultLoggingFilter].getName)
     }
 
-    "not be amended when akka-slf4j is not in classpath" in {
+    "not be amended when pekko-slf4j is not in classpath" in {
       val dynamicAccess = system.asInstanceOf[ExtendedActorSystem].dynamicAccess
       val config = ActorSystem.Settings.amendSlf4jConfig(
         ConfigFactory.parseString("pekko.use-slf4j = on").withFallback(ConfigFactory.defaultReference()),
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala b/actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dataflow/Future2Actor.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/ControlAwareDispatcherSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/DispatcherShutdownSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/ExecutionContextSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/ForkJoinPoolStarvationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/MailboxConfigSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/PriorityDispatcherSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/SameThreadExecutionContextSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/StablePriorityDispatcherSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/dispatch/sysmsg/SystemMessageListSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/AddressTerminatedTopicBenchSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/EventBusSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/EventStreamSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/LoggerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/LoggingReceiveSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/MarkerLoggingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/event/jul/JavaLoggerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/CapacityLimitSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/InetAddressDnsResolverSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/SimpleDnsCacheSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/TcpConnectionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/TcpIntegrationSpecSupport.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/TcpListenerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/UdpConnectedIntegrationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/UdpIntegrationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/AsyncDnsResolverIntegrationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/DnsSettingsSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
similarity index 94%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
index e89b877640..b9e1e644f7 100644
--- a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
+++ b/actor-tests/src/test/scala/org/apache/pekko/io/dns/DockerBindDnsService.scala
@@ -53,13 +53,13 @@ abstract class DockerBindDnsService(config: Config) extends PekkoSpec(config) wi
             "53/tcp" -> List(PortBinding.of("", hostPort)).asJava,
             "53/udp" -> List(PortBinding.of("", hostPort)).asJava).asJava)
           .binds(HostConfig.Bind
-            .from(new java.io.File("akka-actor-tests/src/test/bind/").getAbsolutePath)
+            .from(new java.io.File("actor-tests/src/test/bind/").getAbsolutePath)
             .to("/data/bind")
             .build())
           .build())
       .build()
 
-    val containerName = "akka-test-dns-" + getClass.getCanonicalName
+    val containerName = "pekko-test-dns-" + getClass.getCanonicalName
 
     client
       .listContainers(ListContainersParam.allContainers())
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/NameserverAddressParserSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsManagerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolverSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/DnsClientSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/MessageSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/ResolvConfParserSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/io/dns/internal/TcpDnsClientSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/AskSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffOnRestartSupervisorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/BackoffSupervisorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerMTSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/CircuitBreakerStressSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/PatternSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/PipeToSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/PromiseRefSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/RetrySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/StatusReplySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/pattern/extended/ExplicitAskSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/BalancingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/BroadcastSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/ConfiguredLocalRoutingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/ConsistentHashingRouterSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/MetricsBasedResizerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/RandomSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/ResizerSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/RoundRobinSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/RouteeCreationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/RoutingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/ScatterGatherFirstCompletedSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/SmallestMailboxSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/routing/TailChoppingSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/AsyncSerializeSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/DisabledJavaSerializerWarningSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/NoVerification.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/PrimitivesSerializationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/SerializationSetupSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/serialization/SerializeSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/testkit/CallingThreadDispatcherModelSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/AsciiStringCopySpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/BoundedBlockingQueueSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ByteIteratorSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ByteStringInitializationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ByteStringSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/DoubleLinkedListSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/DurationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/FrequencyListSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/FrequencySketchSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ImmutableIntMapSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/IndexSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala b/actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/LineNumberSpecCodeForScala.scala
diff --git a/actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala
new file mode 100644
index 0000000000..a4ab6066c8
--- /dev/null
+++ b/actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
+ */
+
+package org.apache.pekko.util
+
+import org.apache.pekko.testkit.PekkoSpec
+
+class ManifestInfoSpec extends PekkoSpec {
+  "ManifestInfo" should {
+    "produce a clear message" in {
+      val versions = Map(
+        "pekko-actor" -> new ManifestInfo.Version("2.6.4"),
+        "pekko-persistence" -> new ManifestInfo.Version("2.5.3"),
+        "pekko-cluster" -> new ManifestInfo.Version("2.5.3"),
+        "unrelated" -> new ManifestInfo.Version("2.5.3"))
+      val allModules = List("pekko-actor", "pekko-persistence", "pekko-cluster")
+      ManifestInfo.checkSameVersion("Pekko", allModules, versions) shouldBe Some(
+        "You are using version 2.6.4 of Pekko, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
+        "You can solve this by adding an explicit dependency on version 2.6.4 of the [pekko-persistence, pekko-cluster] artifacts to your project. " +
+        "Here's a complete collection of detected artifacts: (2.5.3, [pekko-cluster, pekko-persistence]), (2.6.4, [pekko-actor]). " +
+        "See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
+    }
+
+    "support dynver" in {
+      val versions = Map(
+        "pekko-actor" -> new ManifestInfo.Version("2.6.4"),
+        "pekko-persistence" -> new ManifestInfo.Version("2.6.4+10-abababef"))
+      val allModules = List("pekko-actor", "pekko-persistence")
+      ManifestInfo.checkSameVersion("Pekko", allModules, versions) shouldBe Some(
+        "You are using version 2.6.4+10-abababef of Pekko, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
+        "You can solve this by adding an explicit dependency on version 2.6.4+10-abababef of the [pekko-actor] artifacts to your project. " +
+        "Here's a complete collection of detected artifacts: (2.6.4, [pekko-actor]), (2.6.4+10-abababef, [pekko-persistence]). " +
+        "See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
+    }
+  }
+}
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/MessageBufferSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/PrettyDurationSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/RecencyListSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ReflectSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/SegmentedRecencyListSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/SwitchSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/TokenBucketSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/VersionSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala b/actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/WildcardIndexSpec.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala b/actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala
rename to actor-tests/src/test/scala/org/apache/pekko/util/ZipfianGenerator.scala
diff --git a/akka-actor-tests/src/test/scala/other/SerializerOutsidePekkoPackage.scala b/actor-tests/src/test/scala/other/SerializerOutsidePekkoPackage.scala
similarity index 100%
rename from akka-actor-tests/src/test/scala/other/SerializerOutsidePekkoPackage.scala
rename to actor-tests/src/test/scala/other/SerializerOutsidePekkoPackage.scala
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/Aggregator.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/AggregatorTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSample.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/BubblingSampleTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/DispatchersDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/FSMDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/GracefulStopDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsAskWithStatusTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/InteractionPatternsTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/IntroTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/LoggingDocExamples.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/MailboxDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/OOIntroTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/RouterTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/SpawnProtocolDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocSample.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StashDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/StyleGuideDocExamples.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/TailChopping.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/coexistence/TypedWatchingClassicTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/extensions/ExtensionDocTest.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/ClassicSample.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/fromclassic/TypedSample.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/pubsub/PubSubExample.java
diff --git a/akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java b/actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
rename to actor-typed-tests/src/test/java/jdocs/org/apache/pekko/typed/supervision/SupervisionCompileOnlyTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ActorSystemTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/DispatcherSelectorTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/ExtensionsTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/MailboxSelectorTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/SchedulerTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/eventstream/EventStreamTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorCompile.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextAskTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorContextPipeToSelfTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ActorLoggingTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/AdapterTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/BehaviorBuilderTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/InterceptTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/ReceiveBuilderTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/RoutersTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/StashBufferTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/javadsl/WatchTest.java
diff --git a/akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java b/actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
similarity index 100%
rename from akka-actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
rename to actor-typed-tests/src/test/java/org/apache/pekko/actor/typed/receptionist/ReceptionistApiTest.java
diff --git a/akka-actor-typed-tests/src/test/resources/logback-doc-dev.xml b/actor-typed-tests/src/test/resources/logback-doc-dev.xml
similarity index 100%
rename from akka-actor-typed-tests/src/test/resources/logback-doc-dev.xml
rename to actor-typed-tests/src/test/resources/logback-doc-dev.xml
diff --git a/akka-actor-typed-tests/src/test/resources/logback-doc-prod.xml b/actor-typed-tests/src/test/resources/logback-doc-prod.xml
similarity index 100%
rename from akka-actor-typed-tests/src/test/resources/logback-doc-prod.xml
rename to actor-typed-tests/src/test/resources/logback-doc-prod.xml
diff --git a/akka-actor-typed-tests/src/test/resources/logback-doc-test.xml b/actor-typed-tests/src/test/resources/logback-doc-test.xml
similarity index 100%
rename from akka-actor-typed-tests/src/test/resources/logback-doc-test.xml
rename to actor-typed-tests/src/test/resources/logback-doc-test.xml
diff --git a/akka-actor-typed-tests/src/test/resources/logback-test.xml b/actor-typed-tests/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-actor-typed-tests/src/test/resources/logback-test.xml
rename to actor-typed-tests/src/test/resources/logback-test.xml
diff --git a/akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf b/actor-typed-tests/src/test/resources/mailbox-config-sample.conf
similarity index 100%
rename from akka-actor-typed-tests/src/test/resources/mailbox-config-sample.conf
rename to actor-typed-tests/src/test/resources/mailbox-config-sample.conf
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/Aggregator.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/AggregatorSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/DispatchersDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FSMDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/FaultToleranceDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/GracefulStopDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/InteractionPatternsSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/IntroSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/LoggingDocExamples.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/MailboxDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/OOIntroSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/RouterSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/SpawnProtocolDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StashDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/StyleGuideDocExamples.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/TailChopping.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/ClassicWatchingTypedSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/coexistence/TypedWatchingClassicSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/extensions/ExtensionDocSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/ClassicSample.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/fromclassic/TypedSample.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/myapp/package.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/pubsub/PubSubExample.scala
diff --git a/akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala b/actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala
rename to actor-typed-tests/src/test/scala/docs/org/apache/pekko/typed/supervision/SupervisionCompileOnly.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorContextSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefIgnoreSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ActorRefResolverSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/AskSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/BehaviorSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/DeferredSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/ExtensionsSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/InterceptSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LocalActorRefProviderLogMessagesSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/LogMessagesSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MailboxSelectorSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/MonitorSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/OrElseSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/PropsSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SchedulerSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SpawnProtocolSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/SupervisionSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TerminatedSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TimerSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/TransformMessagesSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/WatchSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/ClassicSupervisingTypedSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/coexistence/TypedSupervisingClassicSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ConsumerControllerSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerControllerSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueueSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/DurableWorkPullingSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ProducerControllerSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryRandomSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliverySpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestConsumer.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestDurableProducerQueue.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducer.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWithAsk.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/TestProducerWorkPulling.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/delivery/WorkPullingSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/eventstream/EventStreamSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorRefSerializationSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/ActorSystemSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/adpater/PropsAdapterSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionistSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializationSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogicSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/javadsl/AdaptationFailureSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/pubsub/LocalPubSubSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/receptionist/ReceptionistApiSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextAskSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextDelegateSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorContextPipeToSelfSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
similarity index 99%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
index 2091cba18a..29cf6fbbe5 100644
--- a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
+++ b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorLoggingSpec.scala
@@ -251,7 +251,7 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
         }
     }
 
-    "use Slf4jLogger from akka-slf4j automatically" in {
+    "use Slf4jLogger from pekko-slf4j automatically" in {
       LoggingTestKit.info("via Slf4jLogger").expect {
         // this will log via classic eventStream
         system.toClassic.log.info("via Slf4jLogger")
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ActorThreadSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/AdaptationFailureSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/DispatcherSelectorSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/GracefulStopSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/LoggerOpsSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/MessageAdapterSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/OnSignalSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/ReceivePartialSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/RoutersSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashBufferSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StashSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/StopSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/AdapterSpec.scala
diff --git a/akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala b/actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
similarity index 100%
rename from akka-actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
rename to actor-typed-tests/src/test/scala/org/apache/pekko/actor/typed/scaladsl/adapter/GuardianStartupSpec.scala
diff --git a/akka-actor-typed/src/main/resources/reference.conf b/actor-typed/src/main/resources/reference.conf
similarity index 100%
rename from akka-actor-typed/src/main/resources/reference.conf
rename to actor-typed/src/main/resources/reference.conf
diff --git a/akka-actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala b/actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
rename to actor-typed/src/main/scala-2.12/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
diff --git a/akka-actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala b/actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
rename to actor-typed/src/main/scala-2.13/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
diff --git a/akka-actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala b/actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
rename to actor-typed/src/main/scala-3/org/apache/pekko/actor/typed/internal/receptionist/Platform.scala
diff --git a/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala b/actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala
rename to actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/Events.scala
diff --git a/akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala b/actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
rename to actor-typed/src/main/scala-jdk-9/org/apache/pekko/actor/typed/internal/jfr/JFRActorFlightRecorder.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRef.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorRefResolver.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/ActorSystem.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/Behavior.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/BehaviorInterceptor.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/Dispatchers.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/Extensions.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/LogOptions.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/MessageAndSignals.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/Props.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/Scheduler.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/SpawnProtocol.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/SupervisorStrategy.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/TypedActorContext.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ConsumerController.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/DurableProducerQueue.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/ProducerController.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/WorkPullingProducerController.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ChunkedMessage.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ConsumerControllerImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/DeliverySerializable.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/ProducerControllerImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/delivery/internal/WorkPullingProducerControllerImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/eventstream/EventStream.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorContextImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorFlightRecorder.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorMdc.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ActorRefImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/BehaviorImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/EventStreamExtension.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/ExtensionsImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InterceptorImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalMessage.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/InternalRecipientRef.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/LoggerClass.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/MiscMessageSerializer.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PoisonPill.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/PropsImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/StashBufferImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/Supervision.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/SystemMessage.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/TimerSchedulerImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/WithMdcBehaviorInterceptor.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorContextAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorRefFactoryAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/ActorSystemAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/AdapterExtension.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/EventStreamAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/GuardianStartupBehavior.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/PropsAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/adapter/SchedulerAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/pubsub/TopicImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/LocalReceptionist.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
similarity index 95%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
index 063d2fd3ab..ee45700969 100644
--- a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
+++ b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistImpl.scala
@@ -27,7 +27,7 @@ import pekko.annotation.InternalApi
             case e =>
               throw new RuntimeException(
                 "ClusterReceptionist could not be loaded dynamically. Make sure you have " +
-                "'akka-cluster-typed' in the classpath.",
+                "'pekko-cluster-typed' in the classpath.",
                 e)
           }
           .get
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ReceptionistMessages.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKey.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/receptionist/ServiceKeySerializer.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/GroupRouterImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/PoolRouterImpl.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/internal/routing/RoutingLogic.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AbstractBehavior.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ActorContext.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Adapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/AskPattern.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/BehaviorBuilder.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Behaviors.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Receive.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/ReceiveBuilder.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/Routers.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/StashBuffer.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/javadsl/TimerScheduler.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/pubsub/Topic.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/receptionist/Receptionist.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AbstractBehavior.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/ActorContext.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/AskPattern.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Behaviors.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/Routers.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/StashBuffer.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/TimerScheduler.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/PropsAdapter.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/adapter/package.scala
diff --git a/akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala b/actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala
similarity index 100%
rename from akka-actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala
rename to actor-typed/src/main/scala/org/apache/pekko/actor/typed/scaladsl/package.scala
diff --git a/akka-actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template b/actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template
similarity index 100%
rename from akka-actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template
rename to actor/src/main/boilerplate/org/apache/pekko/japi/function/Functions.scala.template
diff --git a/akka-actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template b/actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template
similarity index 100%
rename from akka-actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template
rename to actor/src/main/boilerplate/org/apache/pekko/japi/tuple/Tuples.scala.template
diff --git a/akka-actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java b/actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
rename to actor/src/main/java/org/apache/pekko/actor/AbstractActorRef.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java b/actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java
rename to actor/src/main/java/org/apache/pekko/actor/AbstractScheduler.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java b/actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
rename to actor/src/main/java/org/apache/pekko/actor/dungeon/AbstractActorCell.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java b/actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java
rename to actor/src/main/java/org/apache/pekko/annotation/ApiMayChange.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java b/actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java
rename to actor/src/main/java/org/apache/pekko/annotation/DoNotInherit.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/annotation/InternalApi.java b/actor/src/main/java/org/apache/pekko/annotation/InternalApi.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/annotation/InternalApi.java
rename to actor/src/main/java/org/apache/pekko/annotation/InternalApi.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java b/actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java
rename to actor/src/main/java/org/apache/pekko/annotation/InternalStableApi.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java b/actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java
rename to actor/src/main/java/org/apache/pekko/dispatch/AbstractBoundedNodeQueue.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java b/actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java
rename to actor/src/main/java/org/apache/pekko/dispatch/AbstractMailbox.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java b/actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java
rename to actor/src/main/java/org/apache/pekko/dispatch/AbstractMessageDispatcher.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java b/actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java
rename to actor/src/main/java/org/apache/pekko/dispatch/AbstractNodeQueue.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java b/actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java
rename to actor/src/main/java/org/apache/pekko/dispatch/affinity/OnSpinWait.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/JAPI.java b/actor/src/main/java/org/apache/pekko/japi/JAPI.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/JAPI.java
rename to actor/src/main/java/org/apache/pekko/japi/JAPI.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java b/actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/AbstractMatch.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/AbstractPFBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/DeciderBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/FI.java b/actor/src/main/java/org/apache/pekko/japi/pf/FI.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/FI.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/FI.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/FSMStateFunctionBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/FSMStopBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/FSMTransitionHandlerBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/Match.java b/actor/src/main/java/org/apache/pekko/japi/pf/Match.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/Match.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/Match.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/PFBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/ReceiveBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java b/actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/UnitMatch.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java b/actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java
rename to actor/src/main/java/org/apache/pekko/japi/pf/UnitPFBuilder.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java b/actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
rename to actor/src/main/java/org/apache/pekko/pattern/AbstractCircuitBreaker.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java b/actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java
rename to actor/src/main/java/org/apache/pekko/pattern/AbstractPromiseActorRef.java
diff --git a/akka-actor/src/main/java/org/apache/pekko/util/Unsafe.java b/actor/src/main/java/org/apache/pekko/util/Unsafe.java
similarity index 100%
rename from akka-actor/src/main/java/org/apache/pekko/util/Unsafe.java
rename to actor/src/main/java/org/apache/pekko/util/Unsafe.java
diff --git a/akka-actor/src/main/resources/reference.conf b/actor/src/main/resources/reference.conf
similarity index 100%
rename from akka-actor/src/main/resources/reference.conf
rename to actor/src/main/resources/reference.conf
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala b/actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/compat/Future.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala b/actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/compat/PartialFunction.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala b/actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala b/actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/util/ByteIterator.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/util/ByteString.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/CompatImpl.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
diff --git a/akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
rename to actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
diff --git a/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala b/actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala
rename to actor/src/main/scala-2.13+/org/apache/pekko/compat/Future.scala
diff --git a/akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala b/actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala
rename to actor/src/main/scala-2.13+/org/apache/pekko/compat/PartialFunction.scala
diff --git a/akka-actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala b/actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
rename to actor/src/main/scala-2.13+/org/apache/pekko/dispatch/internal/SameThreadExecutionContext.scala
diff --git a/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala b/actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
rename to actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/ccompatUsedUntil213.scala
diff --git a/akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala b/actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala
rename to actor/src/main/scala-2.13+/org/apache/pekko/util/ccompat/package.scala
diff --git a/akka-actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala b/actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
rename to actor/src/main/scala-2.13/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
diff --git a/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala
rename to actor/src/main/scala-2.13/org/apache/pekko/util/ByteIterator.scala
diff --git a/akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
similarity index 100%
rename from akka-actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
rename to actor/src/main/scala-2.13/org/apache/pekko/util/ByteString.scala
diff --git a/akka-actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala b/actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
similarity index 100%
rename from akka-actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
rename to actor/src/main/scala-3/org/apache/pekko/dispatch/internal/ScalaBatchable.scala
diff --git a/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala b/actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala
similarity index 100%
rename from akka-actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala
rename to actor/src/main/scala-3/org/apache/pekko/util/ByteIterator.scala
diff --git a/akka-actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala b/actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
similarity index 100%
rename from akka-actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
rename to actor/src/main/scala-3/org/apache/pekko/util/ByteString.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/Done.scala b/actor/src/main/scala/org/apache/pekko/Done.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/Done.scala
rename to actor/src/main/scala/org/apache/pekko/Done.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/Main.scala b/actor/src/main/scala/org/apache/pekko/Main.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/Main.scala
rename to actor/src/main/scala/org/apache/pekko/Main.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/NotUsed.scala b/actor/src/main/scala/org/apache/pekko/NotUsed.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/NotUsed.scala
rename to actor/src/main/scala/org/apache/pekko/NotUsed.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/PekkoException.scala b/actor/src/main/scala/org/apache/pekko/PekkoException.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/PekkoException.scala
rename to actor/src/main/scala/org/apache/pekko/PekkoException.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/PekkoVersion.scala b/actor/src/main/scala/org/apache/pekko/PekkoVersion.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/PekkoVersion.scala
rename to actor/src/main/scala/org/apache/pekko/PekkoVersion.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
rename to actor/src/main/scala/org/apache/pekko/actor/AbstractActor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
rename to actor/src/main/scala/org/apache/pekko/actor/AbstractFSM.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala b/actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
rename to actor/src/main/scala/org/apache/pekko/actor/AbstractProps.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala b/actor/src/main/scala/org/apache/pekko/actor/Actor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Actor.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Actor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorCell.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorLogMarker.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorPath.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorRef.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorRefProvider.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorSelection.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
similarity index 97%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
index 8ee86950ee..3ab996cf1e 100644
--- a/akka-actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
+++ b/actor/src/main/scala/org/apache/pekko/actor/ActorSystem.scala
@@ -835,10 +835,10 @@ private[pekko] class ActorSystemImpl(
           case _ =>
             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 [${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
+                s"""Detected ${cause.getClass.getName} error, which MAY be caused by incompatible Pekko versions on the classpath.
+                  | Please note that a given Pekko version MUST be the same across all modules of Pekko that you are using,
+                  | e.g. if you use pekko-actor [${pekko.Version.current} (resolved from current classpath)] all other core
+                  | Akka modules MUST be of the same version. External projects like Connectors, Persistence plugins or Pekko
                   | HTTP etc. have their own version numbers - please make sure you're using a compatible set of libraries.
                  """.stripMargin.replaceAll("[\r\n]", ""))
 
@@ -985,36 +985,36 @@ private[pekko] class ActorSystemImpl(
   // Used for ManifestInfo.checkSameVersion
   private def allModules: List[String] =
     List(
-      "akka-actor",
-      "akka-actor-testkit-typed",
-      "akka-actor-typed",
-      "akka-cluster",
-      "akka-cluster-metrics",
-      "akka-cluster-sharding",
-      "akka-cluster-sharding-typed",
-      "akka-cluster-tools",
-      "akka-cluster-typed",
-      "akka-coordination",
-      "akka-discovery",
-      "akka-distributed-data",
-      "akka-testkit",
-      "akka-multi-node-testkit",
-      "akka-osgi",
-      "akka-persistence",
-      "akka-persistence-query",
-      "akka-persistence-shared",
-      "akka-persistence-testkit",
-      "akka-persistence-typed",
-      "akka-pki",
-      "akka-protobuf",
-      "akka-protobuf-v3",
-      "akka-remote",
-      "akka-serialization-jackson",
-      "akka-slf4j",
-      "akka-stream",
-      "akka-stream-testkit",
-      "akka-stream-typed",
-      "akka-stream-testkit")
+      "pekko-actor",
+      "pekko-actor-testkit-typed",
+      "pekko-actor-typed",
+      "pekko-cluster",
+      "pekko-cluster-metrics",
+      "pekko-cluster-sharding",
+      "pekko-cluster-sharding-typed",
+      "pekko-cluster-tools",
+      "pekko-cluster-typed",
+      "pekko-coordination",
+      "pekko-discovery",
+      "pekko-distributed-data",
+      "pekko-testkit",
+      "pekko-multi-node-testkit",
+      "pekko-osgi",
+      "pekko-persistence",
+      "pekko-persistence-query",
+      "pekko-persistence-shared",
+      "pekko-persistence-testkit",
+      "pekko-persistence-typed",
+      "pekko-pki",
+      "pekko-protobuf",
+      "pekko-protobuf-v3",
+      "pekko-remote",
+      "pekko-serialization-jackson",
+      "pekko-slf4j",
+      "pekko-stream",
+      "pekko-stream-testkit",
+      "pekko-stream-typed",
+      "pekko-stream-testkit")
 
   @volatile private var _initialized = false
 
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Address.scala b/actor/src/main/scala/org/apache/pekko/actor/Address.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Address.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Address.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala b/actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ClassicActorSystemProvider.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala b/actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
rename to actor/src/main/scala/org/apache/pekko/actor/CoordinatedShutdown.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Deployer.scala b/actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Deployer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala b/actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
rename to actor/src/main/scala/org/apache/pekko/actor/DynamicAccess.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Extension.scala b/actor/src/main/scala/org/apache/pekko/actor/Extension.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Extension.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Extension.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/FSM.scala b/actor/src/main/scala/org/apache/pekko/actor/FSM.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/FSM.scala
rename to actor/src/main/scala/org/apache/pekko/actor/FSM.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala b/actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
rename to actor/src/main/scala/org/apache/pekko/actor/FaultHandling.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala b/actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
rename to actor/src/main/scala/org/apache/pekko/actor/IndirectActorProducer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala b/actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
rename to actor/src/main/scala/org/apache/pekko/actor/LightArrayRevolverScheduler.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Props.scala b/actor/src/main/scala/org/apache/pekko/actor/Props.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Props.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Props.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala b/actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
rename to actor/src/main/scala/org/apache/pekko/actor/ReflectiveDynamicAccess.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala b/actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
rename to actor/src/main/scala/org/apache/pekko/actor/RepointableActorRef.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala b/actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Scheduler.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Stash.scala b/actor/src/main/scala/org/apache/pekko/actor/Stash.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Stash.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Stash.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/Timers.scala b/actor/src/main/scala/org/apache/pekko/actor/Timers.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/Timers.scala
rename to actor/src/main/scala/org/apache/pekko/actor/Timers.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala b/actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
rename to actor/src/main/scala/org/apache/pekko/actor/TypedActor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/Children.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/ChildrenContainer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/DeathWatch.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/Dispatch.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/FaultHandling.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/ReceiveTimeout.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala b/actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
rename to actor/src/main/scala/org/apache/pekko/actor/dungeon/TimerSchedulerImpl.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/package.scala b/actor/src/main/scala/org/apache/pekko/actor/package.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/package.scala
rename to actor/src/main/scala/org/apache/pekko/actor/package.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala b/actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
rename to actor/src/main/scala/org/apache/pekko/actor/setup/ActorSystemSetup.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/BalancingDispatcher.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala b/actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/BatchingExecutor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala b/actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/CachingConfig.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/Dispatcher.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/Dispatchers.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala b/actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/ForkJoinExecutorConfigurator.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/Future.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/Future.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/Mailbox.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala b/actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/Mailboxes.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala b/actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala b/actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala b/actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/affinity/AffinityPool.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala b/actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
rename to actor/src/main/scala/org/apache/pekko/dispatch/sysmsg/SystemMessage.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala b/actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
rename to actor/src/main/scala/org/apache/pekko/event/ActorClassificationUnsubscriber.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala b/actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
rename to actor/src/main/scala/org/apache/pekko/event/AddressTerminatedTopic.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala b/actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
rename to actor/src/main/scala/org/apache/pekko/event/DeadLetterListener.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala b/actor/src/main/scala/org/apache/pekko/event/EventBus.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/EventBus.scala
rename to actor/src/main/scala/org/apache/pekko/event/EventBus.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/EventStream.scala b/actor/src/main/scala/org/apache/pekko/event/EventStream.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/EventStream.scala
rename to actor/src/main/scala/org/apache/pekko/event/EventStream.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala b/actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
rename to actor/src/main/scala/org/apache/pekko/event/EventStreamUnsubscriber.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala b/actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
rename to actor/src/main/scala/org/apache/pekko/event/LoggerMailbox.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/Logging.scala b/actor/src/main/scala/org/apache/pekko/event/Logging.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/Logging.scala
rename to actor/src/main/scala/org/apache/pekko/event/Logging.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala b/actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
rename to actor/src/main/scala/org/apache/pekko/event/LoggingReceive.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala b/actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
rename to actor/src/main/scala/org/apache/pekko/event/japi/EventBusJavaAPI.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala b/actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
rename to actor/src/main/scala/org/apache/pekko/event/jul/JavaLogger.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala b/actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
rename to actor/src/main/scala/org/apache/pekko/io/DirectByteBufferPool.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/Dns.scala b/actor/src/main/scala/org/apache/pekko/io/Dns.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/Dns.scala
rename to actor/src/main/scala/org/apache/pekko/io/Dns.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
rename to actor/src/main/scala/org/apache/pekko/io/DnsProvider.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/IO.scala b/actor/src/main/scala/org/apache/pekko/io/IO.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/IO.scala
rename to actor/src/main/scala/org/apache/pekko/io/IO.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/Inet.scala b/actor/src/main/scala/org/apache/pekko/io/Inet.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/Inet.scala
rename to actor/src/main/scala/org/apache/pekko/io/Inet.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
rename to actor/src/main/scala/org/apache/pekko/io/InetAddressDnsProvider.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala b/actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
rename to actor/src/main/scala/org/apache/pekko/io/InetAddressDnsResolver.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala b/actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
rename to actor/src/main/scala/org/apache/pekko/io/SelectionHandler.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
rename to actor/src/main/scala/org/apache/pekko/io/SimpleDnsCache.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala b/actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
rename to actor/src/main/scala/org/apache/pekko/io/SimpleDnsManager.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/Tcp.scala b/actor/src/main/scala/org/apache/pekko/io/Tcp.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/Tcp.scala
rename to actor/src/main/scala/org/apache/pekko/io/Tcp.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
rename to actor/src/main/scala/org/apache/pekko/io/TcpConnection.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
rename to actor/src/main/scala/org/apache/pekko/io/TcpIncomingConnection.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/TcpListener.scala b/actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
rename to actor/src/main/scala/org/apache/pekko/io/TcpListener.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/TcpManager.scala b/actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
rename to actor/src/main/scala/org/apache/pekko/io/TcpManager.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala b/actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
rename to actor/src/main/scala/org/apache/pekko/io/TcpOutgoingConnection.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/Udp.scala b/actor/src/main/scala/org/apache/pekko/io/Udp.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/Udp.scala
rename to actor/src/main/scala/org/apache/pekko/io/Udp.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpConnected.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpConnectedManager.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala b/actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpConnection.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpListener.scala b/actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpListener.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpManager.scala b/actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpManager.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/UdpSender.scala b/actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
rename to actor/src/main/scala/org/apache/pekko/io/UdpSender.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala b/actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
rename to actor/src/main/scala/org/apache/pekko/io/WithUdpSend.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala b/actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/CachePolicy.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/DnsProtocol.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/DnsResourceRecords.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala b/actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/DnsSettings.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala b/actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/RecordClass.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala b/actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/RecordType.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsManager.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsProvider.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/AsyncDnsResolver.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsClient.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/DnsMessage.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/DomainName.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/Question.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordClassSerializer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/RecordTypeSerializer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/ResolvConfParser.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/TcpDnsClient.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala b/actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
rename to actor/src/main/scala/org/apache/pekko/io/dns/internal/package.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala b/actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
rename to actor/src/main/scala/org/apache/pekko/japi/JavaAPI.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/japi/Throwables.scala b/actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
rename to actor/src/main/scala/org/apache/pekko/japi/Throwables.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/japi/function/Function.scala b/actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
rename to actor/src/main/scala/org/apache/pekko/japi/function/Function.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala b/actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
rename to actor/src/main/scala/org/apache/pekko/japi/pf/CaseStatements.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/AskSupport.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala b/actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/Backoff.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala b/actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/BackoffOptions.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/BackoffSupervisor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/CircuitBreaker.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala b/actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/CircuitBreakersRegistry.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/FutureTimeoutSupport.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/GracefulStopSupport.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala b/actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/HandleBackoff.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala b/actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/Patterns.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/PipeToSupport.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala b/actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/PromiseRef.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala b/actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/RetrySupport.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala b/actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/StatusReply.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala b/actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/extended/package.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnRestartSupervisor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/internal/BackoffOnStopSupervisor.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala b/actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/internal/CircuitBreakerTelemetry.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/pattern/package.scala b/actor/src/main/scala/org/apache/pekko/pattern/package.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/pattern/package.scala
rename to actor/src/main/scala/org/apache/pekko/pattern/package.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Balancing.scala b/actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Balancing.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala b/actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Broadcast.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
rename to actor/src/main/scala/org/apache/pekko/routing/ConsistentHash.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala b/actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
rename to actor/src/main/scala/org/apache/pekko/routing/ConsistentHashing.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Listeners.scala b/actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Listeners.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala b/actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
rename to actor/src/main/scala/org/apache/pekko/routing/MurmurHash.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala b/actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
rename to actor/src/main/scala/org/apache/pekko/routing/OptimalSizeExploringResizer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Random.scala b/actor/src/main/scala/org/apache/pekko/routing/Random.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Random.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Random.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Resizer.scala b/actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Resizer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala b/actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
rename to actor/src/main/scala/org/apache/pekko/routing/RoundRobin.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
rename to actor/src/main/scala/org/apache/pekko/routing/RoutedActorCell.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala b/actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
rename to actor/src/main/scala/org/apache/pekko/routing/RoutedActorRef.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/Router.scala b/actor/src/main/scala/org/apache/pekko/routing/Router.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/Router.scala
rename to actor/src/main/scala/org/apache/pekko/routing/Router.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala b/actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
rename to actor/src/main/scala/org/apache/pekko/routing/RouterConfig.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala b/actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
rename to actor/src/main/scala/org/apache/pekko/routing/ScatterGatherFirstCompleted.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala b/actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
rename to actor/src/main/scala/org/apache/pekko/routing/SmallestMailbox.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala b/actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
rename to actor/src/main/scala/org/apache/pekko/routing/TailChopping.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/AsyncSerializer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala b/actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/PrimitiveSerializers.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/Serialization.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/SerializationExtension.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala b/actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/SerializationSetup.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala b/actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
rename to actor/src/main/scala/org/apache/pekko/serialization/Serializer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala b/actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
rename to actor/src/main/scala/org/apache/pekko/util/BoundedBlockingQueue.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/BoxedType.scala b/actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
rename to actor/src/main/scala/org/apache/pekko/util/BoxedType.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala b/actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
rename to actor/src/main/scala/org/apache/pekko/util/ClassLoaderObjectInputStream.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Collections.scala b/actor/src/main/scala/org/apache/pekko/util/Collections.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Collections.scala
rename to actor/src/main/scala/org/apache/pekko/util/Collections.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala b/actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
rename to actor/src/main/scala/org/apache/pekko/util/ConstantFun.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala b/actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
rename to actor/src/main/scala/org/apache/pekko/util/DoubleLinkedList.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala b/actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
rename to actor/src/main/scala/org/apache/pekko/util/ErrorMessages.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala b/actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
rename to actor/src/main/scala/org/apache/pekko/util/FlightRecorderLoader.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala b/actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
rename to actor/src/main/scala/org/apache/pekko/util/FrequencyList.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala b/actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
rename to actor/src/main/scala/org/apache/pekko/util/FrequencySketch.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/HashCode.scala b/actor/src/main/scala/org/apache/pekko/util/HashCode.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/HashCode.scala
rename to actor/src/main/scala/org/apache/pekko/util/HashCode.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Helpers.scala b/actor/src/main/scala/org/apache/pekko/util/Helpers.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Helpers.scala
rename to actor/src/main/scala/org/apache/pekko/util/Helpers.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala b/actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
rename to actor/src/main/scala/org/apache/pekko/util/ImmutableIntMap.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Index.scala b/actor/src/main/scala/org/apache/pekko/util/Index.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Index.scala
rename to actor/src/main/scala/org/apache/pekko/util/Index.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala b/actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
rename to actor/src/main/scala/org/apache/pekko/util/JavaDurationConverters.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala b/actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
rename to actor/src/main/scala/org/apache/pekko/util/JavaVersion.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala b/actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
rename to actor/src/main/scala/org/apache/pekko/util/LineNumbers.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/LockUtil.scala b/actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
rename to actor/src/main/scala/org/apache/pekko/util/LockUtil.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala b/actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
rename to actor/src/main/scala/org/apache/pekko/util/ManifestInfo.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala b/actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
rename to actor/src/main/scala/org/apache/pekko/util/MessageBuffer.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/OptionVal.scala b/actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
rename to actor/src/main/scala/org/apache/pekko/util/OptionVal.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala b/actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
rename to actor/src/main/scala/org/apache/pekko/util/PrettyByteString.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala b/actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
rename to actor/src/main/scala/org/apache/pekko/util/PrettyDuration.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/RecencyList.scala b/actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
rename to actor/src/main/scala/org/apache/pekko/util/RecencyList.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Reflect.scala b/actor/src/main/scala/org/apache/pekko/util/Reflect.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Reflect.scala
rename to actor/src/main/scala/org/apache/pekko/util/Reflect.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala b/actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
rename to actor/src/main/scala/org/apache/pekko/util/SegmentedRecencyList.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala b/actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
rename to actor/src/main/scala/org/apache/pekko/util/SerializedSuspendableExecutionContext.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala b/actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
rename to actor/src/main/scala/org/apache/pekko/util/StablePriorityQueue.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala b/actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
rename to actor/src/main/scala/org/apache/pekko/util/SubclassifiedIndex.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Timeout.scala b/actor/src/main/scala/org/apache/pekko/util/Timeout.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Timeout.scala
rename to actor/src/main/scala/org/apache/pekko/util/Timeout.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala b/actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
rename to actor/src/main/scala/org/apache/pekko/util/TokenBucket.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala b/actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
rename to actor/src/main/scala/org/apache/pekko/util/TypedMultiMap.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala b/actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
rename to actor/src/main/scala/org/apache/pekko/util/UUIDComparator.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Unused.scala b/actor/src/main/scala/org/apache/pekko/util/Unused.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Unused.scala
rename to actor/src/main/scala/org/apache/pekko/util/Unused.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/Version.scala b/actor/src/main/scala/org/apache/pekko/util/Version.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/Version.scala
rename to actor/src/main/scala/org/apache/pekko/util/Version.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/WallClock.scala b/actor/src/main/scala/org/apache/pekko/util/WallClock.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/WallClock.scala
rename to actor/src/main/scala/org/apache/pekko/util/WallClock.scala
diff --git a/akka-actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala b/actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
similarity index 100%
rename from akka-actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
rename to actor/src/main/scala/org/apache/pekko/util/WildcardIndex.scala
diff --git a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala b/akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala
deleted file mode 100644
index 9ff58ff7ad..0000000000
--- a/akka-actor-tests/src/test/scala/org/apache/pekko/util/ManifestInfoSpec.scala
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2020-2022 Lightbend Inc. <https://www.lightbend.com>
- */
-
-package org.apache.pekko.util
-
-import org.apache.pekko.testkit.PekkoSpec
-
-class ManifestInfoSpec extends PekkoSpec {
-  "ManifestInfo" should {
-    "produce a clear message" in {
-      val versions = Map(
-        "akka-actor" -> new ManifestInfo.Version("2.6.4"),
-        "akka-persistence" -> new ManifestInfo.Version("2.5.3"),
-        "akka-cluster" -> new ManifestInfo.Version("2.5.3"),
-        "unrelated" -> new ManifestInfo.Version("2.5.3"))
-      val allModules = List("akka-actor", "akka-persistence", "akka-cluster")
-      ManifestInfo.checkSameVersion("Akka", allModules, versions) shouldBe Some(
-        "You are using version 2.6.4 of Akka, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
-        "You can solve this by adding an explicit dependency on version 2.6.4 of the [akka-persistence, akka-cluster] artifacts to your project. " +
-        "Here's a complete collection of detected artifacts: (2.5.3, [akka-cluster, akka-persistence]), (2.6.4, [akka-actor]). " +
-        "See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
-    }
-
-    "support dynver" in {
-      val versions = Map(
-        "akka-actor" -> new ManifestInfo.Version("2.6.4"),
-        "akka-persistence" -> new ManifestInfo.Version("2.6.4+10-abababef"))
-      val allModules = List("akka-actor", "akka-persistence")
-      ManifestInfo.checkSameVersion("Akka", allModules, versions) shouldBe Some(
-        "You are using version 2.6.4+10-abababef of Akka, but it appears you (perhaps indirectly) also depend on older versions of related artifacts. " +
-        "You can solve this by adding an explicit dependency on version 2.6.4+10-abababef of the [akka-actor] artifacts to your project. " +
-        "Here's a complete collection of detected artifacts: (2.6.4, [akka-actor]), (2.6.4+10-abababef, [akka-persistence]). " +
-        "See also: https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#mixed-versioning-is-not-allowed")
-    }
-  }
-}
diff --git a/akka-bench-jmh/README.md b/bench-jmh/README.md
similarity index 96%
rename from akka-bench-jmh/README.md
rename to bench-jmh/README.md
index 48774c8eca..2156cc4988 100644
--- a/akka-bench-jmh/README.md
+++ b/bench-jmh/README.md
@@ -6,7 +6,7 @@ own jmh module)
 
 You can run them like:
 
-   project akka-bench-jmh
+   project bench-jmh
    jmh:run -i 3 -wi 3 -f 1 .*ActorCreationBenchmark
 
 Use 'jmh:run -h' to get an overview of the available options.
diff --git a/akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java b/bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
similarity index 100%
rename from akka-bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
rename to bench-jmh/src/main/java/akka/serialization/jackson/JavaMessages.java
diff --git a/akka-bench-jmh/src/main/resources/logback.xml b/bench-jmh/src/main/resources/logback.xml
similarity index 100%
rename from akka-bench-jmh/src/main/resources/logback.xml
rename to bench-jmh/src/main/resources/logback.xml
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala b/bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/BenchRunner.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ActorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ActorCreationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ActorPathValidationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolComparativeBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolIdleCPULevelBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/AffinityPoolRequestResponseBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/BenchmarkActors.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/DirectByteBufferPoolBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ForkJoinActorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/JCToolsMailbox.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ManyToOneArrayMailbox.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/RequestResponseActors.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/RouterPoolCreationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/ScheduleBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/StashCreationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/TellOnlyBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedActorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedBenchmarkActors.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/typed/TypedForkJoinActorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/actor/typed/delivery/ReliableDeliveryBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetMergeBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/ORSetSerializationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/cluster/ddata/VersionVectorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/dispatch/CachingConfigBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/dispatch/NodeQueueBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/event/LogLevelAccessBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala b/bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/persistence/Common.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/persistence/LevelDbBatchingBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistenceActorDeferBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/persistence/PersistentActorWithAtLeastOnceDeliveryBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/BenchTestSource.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/CodecBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LatchSink.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/LiteralEncodingBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/SendQueueBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/CountMinSketchBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/InvertCompressionTableBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/artery/compress/SerializationFormatCacheBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/remote/compress/HeavyHittersBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala b/bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/serialization/jackson/JacksonSerializationBench.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/AskBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/EmptySourceBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapConcatBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/FlatMapMergeBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/FlowMapBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/FramingBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/FusedGraphsBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/GraphBuilderBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/InterpreterBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/InvokeWithFeedbackBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/JsonFramingBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/MapAsyncBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/MaterializationBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template b/bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/NewLayoutBenchmark.template
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/PartitionHubBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/SourceRefBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/impl/OutputStreamSourceStageBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/stream/io/FileSourcesScaleBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_append_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_apply_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_copyToBuffer_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_decode_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropRight_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_dropSliceTake_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_drop_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_grouped_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_indexOf_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_take_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ByteString_toArray_Benchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/FastFrequencySketchBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/FrequencySketchBenchmark.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/ImmutableIntMapBench.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/LruBoundedCacheBench.scala
diff --git a/akka-bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala b/bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
similarity index 100%
rename from akka-bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
rename to bench-jmh/src/main/scala/org/apache/pekko/util/StackBench.scala
diff --git a/build.sbt b/build.sbt
index 2bfab8e426..4270ae5fbb 100644
--- a/build.sbt
+++ b/build.sbt
@@ -31,7 +31,7 @@ import spray.boilerplate.BoilerplatePlugin
 
 initialize := {
   // Load system properties from a file to make configuration from Jenkins easier
-  loadSystemProperties("project/akka-build.properties")
+  loadSystemProperties("project/pekko-build.properties")
   initialize.value
 }
 
@@ -88,6 +88,8 @@ lazy val aggregatedProjects: Seq[ProjectReference] = userProjects ++ List[Projec
 lazy val root = Project(id = "pekko", base = file("."))
   .aggregate(aggregatedProjects: _*)
   .enablePlugins(PublishRsyncPlugin)
+  .settings(
+    name := "pekko-root")
   .settings(rootSettings: _*)
   .settings(
     UnidocRoot.autoImport.unidocRootIgnoreProjects := Seq(
@@ -102,10 +104,10 @@ lazy val root = Project(id = "pekko", base = file("."))
   .settings(PekkoBuild.welcomeSettings)
   .enablePlugins(CopyrightHeaderForBuild)
 
-lazy val actor = akkaModule("akka-actor")
+lazy val actor = pekkoModule("actor")
   .settings(Dependencies.actor)
   .settings(OSGi.actor)
-  .settings(AutomaticModuleName.settings("akka.actor"))
+  .settings(AutomaticModuleName.settings("pekko.actor"))
   .settings(Compile / unmanagedSourceDirectories += {
     val ver = scalaVersion.value.take(4)
     (Compile / scalaSource).value.getParentFile / s"scala-$ver"
@@ -114,18 +116,18 @@ lazy val actor = akkaModule("akka-actor")
   .settings(serialversionRemoverPluginSettings)
   .enablePlugins(BoilerplatePlugin)
 
-lazy val actorTests = akkaModule("akka-actor-tests")
+lazy val actorTests = pekkoModule("actor-tests")
   .dependsOn(testkit % "compile->compile;test->test", actor)
   .settings(Dependencies.actorTests)
   .enablePlugins(NoPublish)
   .disablePlugins(MimaPlugin)
 
-lazy val akkaScalaNightly = akkaModule("akka-scala-nightly")
+lazy val akkaScalaNightly = pekkoModule("scala-nightly")
   .aggregate(aggregatedProjects: _*)
   .disablePlugins(MimaPlugin)
   .disablePlugins(ValidatePullRequest, MimaPlugin, CopyrightHeaderInPr)
 
-lazy val benchJmh = akkaModule("akka-bench-jmh")
+lazy val benchJmh = pekkoModule("bench-jmh")
   .enablePlugins(Jdk9)
   .dependsOn(Seq(actor, actorTyped, stream, streamTestkit, persistence, distributedData, jackson, testkit).map(
     _ % "compile->compile;compile->test"): _*)
@@ -134,7 +136,7 @@ lazy val benchJmh = akkaModule("akka-bench-jmh")
   .enablePlugins(JmhPlugin, ScaladocNoVerificationOfDiagrams, NoPublish, CopyrightHeader)
   .disablePlugins(MimaPlugin, ValidatePullRequest, CopyrightHeaderInPr)
 
-lazy val cluster = akkaModule("akka-cluster")
+lazy val cluster = pekkoModule("cluster")
   .dependsOn(
     remote,
     coordination % "compile->compile;test->test",
@@ -142,28 +144,28 @@ lazy val cluster = akkaModule("akka-cluster")
     testkit % "test->test",
     jackson % "test->test")
   .settings(Dependencies.cluster)
-  .settings(AutomaticModuleName.settings("akka.cluster"))
+  .settings(AutomaticModuleName.settings("pekko.cluster"))
   .settings(OSGi.cluster)
   .settings(Protobuf.settings)
   .settings(Test / parallelExecution := false)
   .configs(MultiJvm)
   .enablePlugins(MultiNodeScalaTest)
 
-lazy val clusterMetrics = akkaModule("akka-cluster-metrics")
+lazy val clusterMetrics = pekkoModule("cluster-metrics")
   .dependsOn(
     cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
     slf4j % "test->compile",
     jackson % "test->test")
   .settings(OSGi.clusterMetrics)
   .settings(Dependencies.clusterMetrics)
-  .settings(AutomaticModuleName.settings("akka.cluster.metrics"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.metrics"))
   .settings(Protobuf.settings)
   .settings(SigarLoader.sigarSettings)
   .settings(Test / parallelExecution := false)
   .configs(MultiJvm)
   .enablePlugins(MultiNodeScalaTest)
 
-lazy val clusterSharding = akkaModule("akka-cluster-sharding")
+lazy val clusterSharding = pekkoModule("cluster-sharding")
 // TODO akka-persistence dependency should be provided in pom.xml artifact.
 //      If I only use "provided" here it works, but then we can't run tests.
 //      Scope "test" is alright in the pom.xml, but would have been nicer with
@@ -175,35 +177,35 @@ lazy val clusterSharding = akkaModule("akka-cluster-sharding")
     clusterTools % "compile->compile;test->test",
     jackson % "test->test")
   .settings(Dependencies.clusterSharding)
-  .settings(AutomaticModuleName.settings("akka.cluster.sharding"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.sharding"))
   .settings(OSGi.clusterSharding)
   .settings(Protobuf.settings)
   .configs(MultiJvm)
   .enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
   .enablePlugins(Jdk9)
 
-lazy val clusterTools = akkaModule("akka-cluster-tools")
+lazy val clusterTools = pekkoModule("cluster-tools")
   .dependsOn(
     cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
     coordination % "compile->compile;test->test",
     jackson % "test->test")
   .settings(Dependencies.clusterTools)
-  .settings(AutomaticModuleName.settings("akka.cluster.tools"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.tools"))
   .settings(OSGi.clusterTools)
   .settings(Protobuf.settings)
   .configs(MultiJvm)
   .enablePlugins(MultiNode, ScaladocNoVerificationOfDiagrams)
 
-lazy val distributedData = akkaModule("akka-distributed-data")
+lazy val distributedData = pekkoModule("distributed-data")
   .dependsOn(cluster % "compile->compile;test->test;multi-jvm->multi-jvm", jackson % "test->test")
   .settings(Dependencies.distributedData)
-  .settings(AutomaticModuleName.settings("akka.cluster.ddata"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.ddata"))
   .settings(OSGi.distributedData)
   .settings(Protobuf.settings)
   .configs(MultiJvm)
   .enablePlugins(MultiNodeScalaTest)
 
-lazy val docs = akkaModule("docs")
+lazy val docs = pekkoModule("docs")
   .configs(Jdk9.TestJdk9)
   .dependsOn(
     actor,
@@ -247,7 +249,7 @@ lazy val docs = akkaModule("docs")
   // TODO https://github.com/akka/akka/issues/30243
   .settings(crossScalaVersions -= Dependencies.scala3Version)
 
-lazy val jackson = akkaModule("akka-serialization-jackson")
+lazy val jackson = pekkoModule("serialization-jackson")
   .dependsOn(
     actor,
     actorTyped % "optional->compile",
@@ -255,34 +257,34 @@ lazy val jackson = akkaModule("akka-serialization-jackson")
     actorTests % "test->test",
     testkit % "test->test")
   .settings(Dependencies.jackson)
-  .settings(AutomaticModuleName.settings("akka.serialization.jackson"))
+  .settings(AutomaticModuleName.settings("pekko.serialization.jackson"))
   .settings(OSGi.jackson)
   .settings(javacOptions += "-parameters")
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
 
-lazy val multiNodeTestkit = akkaModule("akka-multi-node-testkit")
+lazy val multiNodeTestkit = pekkoModule("multi-node-testkit")
   .dependsOn(remote, testkit)
   .settings(Dependencies.multiNodeTestkit)
   .settings(Protobuf.settings)
-  .settings(AutomaticModuleName.settings("akka.remote.testkit"))
+  .settings(AutomaticModuleName.settings("pekko.remote.testkit"))
   .settings(PekkoBuild.mayChangeSettings)
 
-lazy val osgi = akkaModule("akka-osgi")
+lazy val osgi = pekkoModule("osgi")
   .dependsOn(actor)
   .settings(Dependencies.osgi)
-  .settings(AutomaticModuleName.settings("akka.osgi"))
+  .settings(AutomaticModuleName.settings("pekko.osgi"))
   .settings(OSGi.osgi)
   .settings(Test / parallelExecution := false, crossScalaVersions -= Dependencies.scala3Version)
 
-lazy val persistence = akkaModule("akka-persistence")
+lazy val persistence = pekkoModule("persistence")
   .dependsOn(actor, stream, testkit % "test->test")
   .settings(Dependencies.persistence)
-  .settings(AutomaticModuleName.settings("akka.persistence"))
+  .settings(AutomaticModuleName.settings("pekko.persistence"))
   .settings(OSGi.persistence)
   .settings(Protobuf.settings)
   .settings(Test / fork := true)
 
-lazy val persistenceQuery = akkaModule("akka-persistence-query")
+lazy val persistenceQuery = pekkoModule("persistence-query")
   .dependsOn(
     stream,
     persistence % "compile->compile;test->test",
@@ -290,7 +292,7 @@ lazy val persistenceQuery = akkaModule("akka-persistence-query")
     protobufV3,
     streamTestkit % "test")
   .settings(Dependencies.persistenceQuery)
-  .settings(AutomaticModuleName.settings("akka.persistence.query"))
+  .settings(AutomaticModuleName.settings("pekko.persistence.query"))
   .settings(OSGi.persistenceQuery)
   .settings(Protobuf.settings)
   // To be able to import ContainerFormats.proto
@@ -298,33 +300,33 @@ lazy val persistenceQuery = akkaModule("akka-persistence-query")
   .settings(Test / fork := true)
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
 
-lazy val persistenceShared = akkaModule("akka-persistence-shared")
+lazy val persistenceShared = pekkoModule("persistence-shared")
   .dependsOn(persistence % "test->test", testkit % "test->test", remote % "test")
   .settings(Dependencies.persistenceShared)
-  .settings(AutomaticModuleName.settings("akka.persistence.shared"))
+  .settings(AutomaticModuleName.settings("pekko.persistence.shared"))
   .settings(Test / fork := true)
   .enablePlugins(NoPublish)
   .disablePlugins(MimaPlugin)
 
-lazy val persistenceTck = akkaModule("akka-persistence-tck")
+lazy val persistenceTck = pekkoModule("persistence-tck")
   .dependsOn(persistence % "compile->compile;test->test", testkit % "compile->compile;test->test")
   .settings(Dependencies.persistenceTck)
-  .settings(AutomaticModuleName.settings("akka.persistence.tck"))
+  .settings(AutomaticModuleName.settings("pekko.persistence.tck"))
   // .settings(OSGi.persistenceTck) TODO: we do need to export this as OSGi bundle too?
   .settings(Test / fork := true)
   .disablePlugins(MimaPlugin)
 
-lazy val persistenceTestkit = akkaModule("akka-persistence-testkit")
+lazy val persistenceTestkit = pekkoModule("persistence-testkit")
   .dependsOn(
     persistenceTyped % "compile->compile;provided->provided;test->test",
     testkit % "compile->compile;test->test",
     actorTestkitTyped,
     persistenceTck % "test")
   .settings(Dependencies.persistenceTestKit)
-  .settings(AutomaticModuleName.settings("akka.persistence.testkit"))
+  .settings(AutomaticModuleName.settings("pekko.persistence.testkit"))
   .disablePlugins(MimaPlugin)
 
-lazy val persistenceTypedTests = akkaModule("akka-persistence-typed-tests")
+lazy val persistenceTypedTests = pekkoModule("persistence-typed-tests")
   .dependsOn(
     persistenceTyped,
     persistenceTestkit % "test",
@@ -337,16 +339,16 @@ lazy val persistenceTypedTests = akkaModule("akka-persistence-typed-tests")
   .disablePlugins(MimaPlugin)
   .enablePlugins(NoPublish)
 
-lazy val protobuf = akkaModule("akka-protobuf")
+lazy val protobuf = pekkoModule("protobuf")
   .settings(OSGi.protobuf)
-  .settings(AutomaticModuleName.settings("akka.protobuf"))
+  .settings(AutomaticModuleName.settings("pekko.protobuf"))
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
   .disablePlugins(MimaPlugin)
   .settings(autoScalaLibrary := false) // Pure java project
 
-lazy val protobufV3 = akkaModule("akka-protobuf-v3")
+lazy val protobufV3 = pekkoModule("protobuf-v3")
   .settings(OSGi.protobufV3)
-  .settings(AutomaticModuleName.settings("akka.protobuf.v3"))
+  .settings(AutomaticModuleName.settings("pekko.protobuf.v3"))
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
   .disablePlugins(MimaPlugin)
   .settings(
@@ -373,15 +375,15 @@ lazy val protobufV3 = akkaModule("akka-protobuf-v3")
     description := "Akka Protobuf V3 is a shaded version of the protobuf runtime. Original POM: https://github.com/protocolbuffers/protobuf/blob/v3.9.0/java/pom.xml")
 
 lazy val pki =
-  akkaModule("akka-pki")
+  pekkoModule("pki")
     .dependsOn(actor) // this dependency only exists for "@ApiMayChange"
     .settings(Dependencies.pki)
-    .settings(AutomaticModuleName.settings("akka.pki"))
+    .settings(AutomaticModuleName.settings("pekko.pki"))
     // The akka-pki artifact was added in Akka 2.6.2, no MiMa checks yet.
     .disablePlugins(MimaPlugin)
 
 lazy val remote =
-  akkaModule("akka-remote")
+  pekkoModule("remote")
     .dependsOn(
       actor,
       stream,
@@ -392,14 +394,14 @@ lazy val remote =
       streamTestkit % "test",
       jackson % "test->test")
     .settings(Dependencies.remote)
-    .settings(AutomaticModuleName.settings("akka.remote"))
+    .settings(AutomaticModuleName.settings("pekko.remote"))
     .settings(OSGi.remote)
     .settings(Protobuf.settings)
     .settings(Test / parallelExecution := false)
     .settings(serialversionRemoverPluginSettings)
     .enablePlugins(Jdk9)
 
-lazy val remoteTests = akkaModule("akka-remote-tests")
+lazy val remoteTests = pekkoModule("remote-tests")
   .dependsOn(
     actorTests % "test->test",
     remote % "compile->CompileJdk9;test->test",
@@ -413,34 +415,34 @@ lazy val remoteTests = akkaModule("akka-remote-tests")
   .enablePlugins(MultiNodeScalaTest, NoPublish)
   .disablePlugins(MimaPlugin)
 
-lazy val slf4j = akkaModule("akka-slf4j")
+lazy val slf4j = pekkoModule("slf4j")
   .dependsOn(actor, testkit % "test->test")
   .settings(Dependencies.slf4j)
-  .settings(AutomaticModuleName.settings("akka.slf4j"))
+  .settings(AutomaticModuleName.settings("pekko.slf4j"))
   .settings(OSGi.slf4j)
 
-lazy val stream = akkaModule("akka-stream")
+lazy val stream = pekkoModule("stream")
   .dependsOn(actor, protobufV3)
   .settings(Dependencies.stream)
-  .settings(AutomaticModuleName.settings("akka.stream"))
+  .settings(AutomaticModuleName.settings("pekko.stream"))
   .settings(OSGi.stream)
   .settings(Protobuf.settings)
   .enablePlugins(BoilerplatePlugin, Jdk9)
 
-lazy val streamTestkit = akkaModule("akka-stream-testkit")
+lazy val streamTestkit = pekkoModule("stream-testkit")
   .dependsOn(stream, testkit % "compile->compile;test->test")
   .settings(Dependencies.streamTestkit)
-  .settings(AutomaticModuleName.settings("akka.stream.testkit"))
+  .settings(AutomaticModuleName.settings("pekko.stream.testkit"))
   .settings(OSGi.streamTestkit)
 
-lazy val streamTests = akkaModule("akka-stream-tests")
+lazy val streamTests = pekkoModule("stream-tests")
   .configs(Jdk9.TestJdk9)
   .dependsOn(streamTestkit % "test->test", remote % "test->test", stream % "TestJdk9->CompileJdk9")
   .settings(Dependencies.streamTests)
   .enablePlugins(NoPublish, Jdk9)
   .disablePlugins(MimaPlugin)
 
-lazy val streamTestsTck = akkaModule("akka-stream-tests-tck")
+lazy val streamTestsTck = pekkoModule("stream-tests-tck")
   .dependsOn(streamTestkit % "test->test", stream)
   .settings(Dependencies.streamTestsTck)
   .settings(
@@ -452,16 +454,16 @@ lazy val streamTestsTck = akkaModule("akka-stream-tests-tck")
   .enablePlugins(NoPublish)
   .disablePlugins(MimaPlugin)
 
-lazy val testkit = akkaModule("akka-testkit")
+lazy val testkit = pekkoModule("testkit")
   .dependsOn(actor)
   .settings(Dependencies.testkit)
-  .settings(AutomaticModuleName.settings("akka.actor.testkit"))
+  .settings(AutomaticModuleName.settings("pekko.actor.testkit"))
   .settings(OSGi.testkit)
   .settings(initialCommands += "import org.apache.pekko.testkit._")
 
-lazy val actorTyped = akkaModule("akka-actor-typed")
+lazy val actorTyped = pekkoModule("actor-typed")
   .dependsOn(actor, slf4j)
-  .settings(AutomaticModuleName.settings("akka.actor.typed"))
+  .settings(AutomaticModuleName.settings("pekko.actor.typed"))
   .settings(Dependencies.actorTyped)
   .settings(OSGi.actorTyped)
   .settings(initialCommands :=
@@ -480,7 +482,7 @@ lazy val actorTyped = akkaModule("akka-actor-typed")
     """)
   .enablePlugins(Jdk9)
 
-lazy val persistenceTyped = akkaModule("akka-persistence-typed")
+lazy val persistenceTyped = pekkoModule("persistence-typed")
   .dependsOn(
     actorTyped,
     streamTyped,
@@ -493,13 +495,13 @@ lazy val persistenceTyped = akkaModule("akka-persistence-typed")
     jackson % "test->test")
   .settings(javacOptions += "-parameters") // for Jackson
   .settings(Dependencies.persistenceShared)
-  .settings(AutomaticModuleName.settings("akka.persistence.typed"))
+  .settings(AutomaticModuleName.settings("pekko.persistence.typed"))
   .settings(Protobuf.settings)
   // To be able to import ContainerFormats.proto
   .settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
   .settings(OSGi.persistenceTyped)
 
-lazy val clusterTyped = akkaModule("akka-cluster-typed")
+lazy val clusterTyped = pekkoModule("cluster-typed")
   .dependsOn(
     actorTyped,
     cluster % "compile->compile;test->test;multi-jvm->multi-jvm",
@@ -512,14 +514,14 @@ lazy val clusterTyped = akkaModule("akka-cluster-typed")
   .settings(Protobuf.settings)
   // To be able to import ContainerFormats.proto
   .settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
-  .settings(AutomaticModuleName.settings("akka.cluster.typed"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.typed"))
   .settings(Protobuf.settings)
   // To be able to import ContainerFormats.proto
   .settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
   .configs(MultiJvm)
   .enablePlugins(MultiNodeScalaTest)
 
-lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
+lazy val clusterShardingTyped = pekkoModule("cluster-sharding-typed")
   .dependsOn(
     actorTyped % "compile->CompileJdk9",
     clusterTyped % "compile->compile;test->test;multi-jvm->multi-jvm",
@@ -533,54 +535,54 @@ lazy val clusterShardingTyped = akkaModule("akka-cluster-sharding-typed")
     remoteTests % "test->test;multi-jvm->multi-jvm",
     jackson % "test->test")
   .settings(javacOptions += "-parameters") // for Jackson
-  .settings(AutomaticModuleName.settings("akka.cluster.sharding.typed"))
+  .settings(AutomaticModuleName.settings("pekko.cluster.sharding.typed"))
   // To be able to import ContainerFormats.proto
   .settings(Protobuf.settings)
   .settings(Protobuf.importPath := Some(baseDirectory.value / ".." / "akka-remote" / "src" / "main" / "protobuf"))
   .configs(MultiJvm)
   .enablePlugins(MultiNodeScalaTest)
 
-lazy val streamTyped = akkaModule("akka-stream-typed")
+lazy val streamTyped = pekkoModule("stream-typed")
   .dependsOn(
     actorTyped,
     stream,
     streamTestkit % "test->test",
     actorTestkitTyped % "test->test",
     actorTypedTests % "test->test")
-  .settings(AutomaticModuleName.settings("akka.stream.typed"))
+  .settings(AutomaticModuleName.settings("pekko.stream.typed"))
   .enablePlugins(ScaladocNoVerificationOfDiagrams)
 
-lazy val actorTestkitTyped = akkaModule("akka-actor-testkit-typed")
+lazy val actorTestkitTyped = pekkoModule("actor-testkit-typed")
   .dependsOn(actorTyped, slf4j, testkit % "compile->compile;test->test")
-  .settings(AutomaticModuleName.settings("akka.actor.testkit.typed"))
+  .settings(AutomaticModuleName.settings("pekko.actor.testkit.typed"))
   .settings(Dependencies.actorTestkitTyped)
 
-lazy val actorTypedTests = akkaModule("akka-actor-typed-tests")
+lazy val actorTypedTests = pekkoModule("actor-typed-tests")
   .dependsOn(actorTyped % "compile->CompileJdk9", actorTestkitTyped % "compile->compile;test->test", actor)
   .settings(PekkoBuild.mayChangeSettings)
   .disablePlugins(MimaPlugin)
   .enablePlugins(NoPublish)
 
-lazy val discovery = akkaModule("akka-discovery")
+lazy val discovery = pekkoModule("discovery")
   .dependsOn(actor, testkit % "test->test", actorTests % "test->test")
   .settings(Dependencies.discovery)
-  .settings(AutomaticModuleName.settings("akka.discovery"))
+  .settings(AutomaticModuleName.settings("pekko.discovery"))
   .settings(OSGi.discovery)
 
-lazy val coordination = akkaModule("akka-coordination")
+lazy val coordination = pekkoModule("coordination")
   .dependsOn(actor, testkit % "test->test", actorTests % "test->test")
   .settings(Dependencies.coordination)
-  .settings(AutomaticModuleName.settings("akka.coordination"))
+  .settings(AutomaticModuleName.settings("pekko.coordination"))
   .settings(OSGi.coordination)
 
-lazy val billOfMaterials = Project("akka-bill-of-materials", file("akka-bill-of-materials"))
+lazy val billOfMaterials = Project("bill-of-materials", file("bill-of-materials"))
   .enablePlugins(BillOfMaterialsPlugin)
   .disablePlugins(MimaPlugin, PekkoDisciplinePlugin)
   // buildSettings and defaultSettings configure organization name, licenses, etc...
   .settings(PekkoBuild.buildSettings)
   .settings(PekkoBuild.defaultSettings)
   .settings(
-    name := "akka-bom",
+    name := "pekko-bom",
     bomIncludeProjects := userProjects,
     description := s"${description.value} (depending on Scala ${CrossVersion.binaryScalaVersion(scalaVersion.value)})")
 
@@ -598,12 +600,14 @@ lazy val serialversionRemoverPluginSettings = Seq(
     else Nil
   ))
 
-def akkaModule(name: String): Project =
-  Project(id = name, base = file(name))
+def pekkoModule(moduleName: String): Project =
+  Project(id = moduleName, base = file(moduleName))
     .enablePlugins(ReproducibleBuildsPlugin)
     .disablePlugins(WelcomePlugin)
     .settings(PekkoBuild.buildSettings)
     .settings(PekkoBuild.defaultSettings)
+    .settings(
+      name := s"pekko-$moduleName")
     .enablePlugins(BootstrapGenjavadoc)
 
 /* Command aliases one can run locally against a module
diff --git a/akka-cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java b/cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
similarity index 100%
rename from akka-cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
rename to cluster-metrics/src/main/java/org/apache/pekko/cluster/metrics/protobuf/msg/ClusterMetricsMessages.java
diff --git a/akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto b/cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
similarity index 100%
rename from akka-cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
rename to cluster-metrics/src/main/protobuf/ClusterMetricsMessages.proto
diff --git a/akka-cluster-metrics/src/main/resources/reference.conf b/cluster-metrics/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster-metrics/src/main/resources/reference.conf
rename to cluster-metrics/src/main/resources/reference.conf
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsCollector.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtension.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRouting.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettings.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/ClusterMetricsStrategy.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/EWMA.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Metric.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/MetricsCollector.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/Provision.scala
diff --git a/akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala b/cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
similarity index 100%
rename from akka-cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
rename to cluster-metrics/src/main/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializer.scala
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
similarity index 100%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
similarity index 98%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
index 36f209ba4d..ae8330be29 100644
--- a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
+++ b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsSampleSpec.scala
@@ -28,7 +28,7 @@ object StatsSampleSpecConfig extends MultiNodeConfig {
   nodeList.foreach { role =>
     nodeConfig(role) {
       ConfigFactory.parseString(s"""
-      # Enable metrics extension in akka-cluster-metrics.
+      # Enable metrics extension in pekko-cluster-metrics.
       pekko.extensions=["org.apache.pekko.cluster.metrics.ClusterMetricsExtension"]
       # Sigar native library extract location during tests.
       pekko.cluster.metrics.native-library-extract-folder=target/native/${role.name}
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
similarity index 100%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala
diff --git a/akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala b/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
similarity index 100%
rename from akka-cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
rename to cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala
diff --git a/akka-cluster-metrics/src/test/resources/logback-test.xml b/cluster-metrics/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-cluster-metrics/src/test/resources/logback-test.xml
rename to cluster-metrics/src/test/resources/logback-test.xml
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsExtensionSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsRoutingSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/ClusterMetricsSettingsSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/EWMASpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricsCollectorSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/TestUtil.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/WeightedRouteesSpec.scala
diff --git a/akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala b/cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
rename to cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/protobuf/MessageSerializerSpec.scala
diff --git a/akka-cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java b/cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
rename to cluster-sharding-typed/src/main/java/org/apache/pekko/cluster/sharding/typed/internal/protobuf/ShardingMessages.java
diff --git a/akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto b/cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
rename to cluster-sharding-typed/src/main/protobuf/ShardingMessages.proto
diff --git a/akka-cluster-sharding-typed/src/main/resources/reference.conf b/cluster-sharding-typed/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/resources/reference.conf
rename to cluster-sharding-typed/src/main/resources/reference.conf
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingQuery.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingSettings.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/Murmur2MessageExtractor.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedEntityProvider.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingExtension.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSettings.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingDirectReplication.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/ShardingMessageExtractor.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingConsumerController.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/ShardingProducerController.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingConsumerControllerImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/delivery/internal/ShardingProducerControllerImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ClusterShardingImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/JoinConfigCompatCheckerClusterSharding.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ReplicatedShardingExtensionImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardedDaemonProcessImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingSerializer.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/ShardingState.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/internal/testkit/TestEntityRefImpl.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterSharding.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcess.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterSharding.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcess.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/javadsl/EntityRef.scala
diff --git a/akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala b/cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
rename to cluster-sharding-typed/src/main/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/EntityRef.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/resources/logback-test.xml b/cluster-sharding-typed/src/multi-jvm/resources/logback-test.xml
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/resources/logback-test.xml
rename to cluster-sharding-typed/src/multi-jvm/resources/logback-test.xml
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesPerfSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingPreparingForShutdownSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ClusterShardingStatsSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/MultiDcClusterShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/ShardedDaemonProcessSpec.scala
diff --git a/akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala b/cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
rename to cluster-sharding-typed/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/typed/delivery/DeliveryThroughputSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java b/cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
rename to cluster-sharding-typed/src/test/java/jdocs/delivery/PointToPointDocExample.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java b/cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
rename to cluster-sharding-typed/src/test/java/jdocs/delivery/ShardingDocExample.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java b/cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
rename to cluster-sharding-typed/src/test/java/jdocs/delivery/WorkPullingDocExample.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithMutableState.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullDurableState.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithNullState.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/jdocs/org/apache/pekko/cluster/sharding/typed/ShardingReplyCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
rename to cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
rename to cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingPersistenceTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
rename to cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ClusterShardingSettingsCompileOnly.java
diff --git a/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardedDaemonProcessCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java b/cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
rename to cluster-sharding-typed/src/test/java/org/apache/pekko/cluster/sharding/typed/javadsl/ShardingEventSourcedEntityWithEnforcedRepliesCompileOnlyTest.java
diff --git a/akka-cluster-sharding-typed/src/test/resources/logback-test.xml b/cluster-sharding-typed/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/resources/logback-test.xml
rename to cluster-sharding-typed/src/test/resources/logback-test.xml
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala b/cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
rename to cluster-sharding-typed/src/test/scala/docs/delivery/PointToPointDocExample.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala b/cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
rename to cluster-sharding-typed/src/test/scala/docs/delivery/ShardingDocExample.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala b/cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
rename to cluster-sharding-typed/src/test/scala/docs/delivery/WorkPullingDocExample.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleDocSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInDurableState.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithCommandHandlersInState.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithEventHandlersInState.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionDurableState.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/AccountExampleWithOptionState.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/DurableStateStoreQueryUsageCompileOnlySpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ExternalShardAllocationCompileOnlySpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldEventSourcedEntityExampleSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/HelloWorldPersistentEntityExample.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingCompileOnlySpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala b/cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
rename to cluster-sharding-typed/src/test/scala/docs/org/apache/pekko/cluster/sharding/typed/ShardingCompileOnlySpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/FlightRecording.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/JoinConfigCompatCheckerClusterShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingDirectReplicationSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ReplicatedShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/ShardingSerializerSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/DurableShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/delivery/ReliableDeliveryShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/internal/Murmur2Spec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingPersistenceSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStateSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ClusterShardingStatsSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/scaladsl/ShardedDaemonProcessSpec.scala
diff --git a/akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala b/cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
similarity index 100%
rename from akka-cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
rename to cluster-sharding-typed/src/test/scala/org/apache/pekko/cluster/sharding/typed/testkit/scaladsl/TestEntityRefSpec.scala
diff --git a/akka-cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java b/cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
similarity index 100%
rename from akka-cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
rename to cluster-sharding/src/main/java/org/apache/pekko/cluster/sharding/protobuf/msg/ClusterShardingMessages.java
diff --git a/akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto b/cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
similarity index 100%
rename from akka-cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
rename to cluster-sharding/src/main/protobuf/ClusterShardingMessages.proto
diff --git a/akka-cluster-sharding/src/main/resources/reference.conf b/cluster-sharding/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster-sharding/src/main/resources/reference.conf
rename to cluster-sharding/src/main/resources/reference.conf
diff --git a/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala b/cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
rename to cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/Events.scala
diff --git a/akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala b/cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
rename to cluster-sharding/src/main/scala-jdk-9/org/apache/pekko/cluster/sharding/internal/jfr/JFRShardingFlightRecorder.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterSharding.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheck.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSerializable.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettings.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckSharding.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/OldCoordinatorStateMigrationEventAdapter.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingData.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/Shard.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardCoordinator.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardRegion.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingFlightRecorder.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingLogMarker.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/ShardingQueries.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ClientTimeoutException.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocation.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategy.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/ShardLocations.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/internal/ExternalShardAllocationClientImpl.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/javadsl/ExternalShardAllocationClient.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/external/scaladsl/ExternalShardAllocationClient.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/AbstractLeastShardAllocationStrategy.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/CustomStateStoreModeProvider.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesCoordinatorStore.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesProvider.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/DDataRememberEntitiesShardStore.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EntityPassivationStrategy.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesCoordinatorStore.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesProvider.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/EventSourcedRememberEntitiesShardStore.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/LeastShardAllocationStrategy.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStore.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/internal/RememberEntityStarter.scala
diff --git a/akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala b/cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
similarity index 100%
rename from akka-cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
rename to cluster-sharding/src/main/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializer.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GlobalRegistry.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/GremlinController.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/RandomizedBrainResolverIntegrationSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SbrTestLeaseActor.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverIntegrationSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowning2Spec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardCoordinatorDowningSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingCustomShardAllocationSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingFailureSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStateSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGetStatsSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownOldestSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingGracefulShutdownSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingIncorrectSetupSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeavingSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingMinMembersSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingQueriesSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRegistrationCoordinatedShutdownSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesNewExtractorSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRememberEntitiesSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingRolePartitioningSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSingleShardPerEntitySpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ExternalShardAllocationSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiDcClusterShardingSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingConfig.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/MultiNodeClusterShardingSpec.scala
diff --git a/akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala b/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
rename to cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/RollingUpdateShardAllocationSpec.scala
diff --git a/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf b/cluster-sharding/src/test/resources/adaptivity-trace.conf
similarity index 98%
rename from akka-cluster-sharding/src/test/resources/adaptivity-trace.conf
rename to cluster-sharding/src/test/resources/adaptivity-trace.conf
index e6a110924c..00baa07c23 100644
--- a/akka-cluster-sharding/src/test/resources/adaptivity-trace.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator adaptivity-trace
+# > 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/cluster-sharding/src/test/resources/arc-trace-database.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/arc-trace-database.conf
rename to cluster-sharding/src/test/resources/arc-trace-database.conf
index d5f7da253b..ceb1778f26 100644
--- a/akka-cluster-sharding/src/test/resources/arc-trace-database.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator arc-trace-database
+# > 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/cluster-sharding/src/test/resources/arc-trace-search.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/arc-trace-search.conf
rename to cluster-sharding/src/test/resources/arc-trace-search.conf
index 4c9626b286..eee0a30594 100644
--- a/akka-cluster-sharding/src/test/resources/arc-trace-search.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator arc-trace-search
+# > 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/cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
rename to cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
index 969940ad29..8993d434f1 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-glimpse.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-glimpse
+# > 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/cluster-sharding/src/test/resources/lirs-trace-multi.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf
rename to cluster-sharding/src/test/resources/lirs-trace-multi.conf
index 9f4e9c8412..c04b49781e 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-multi.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-multi
+# > 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/cluster-sharding/src/test/resources/lirs-trace-postgres.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf
rename to cluster-sharding/src/test/resources/lirs-trace-postgres.conf
index edaf0a881f..5010c0f579 100644
--- a/akka-cluster-sharding/src/test/resources/lirs-trace-postgres.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs-trace-postgres
+# > 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/cluster-sharding/src/test/resources/lirs2-trace-w106.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf
rename to cluster-sharding/src/test/resources/lirs2-trace-w106.conf
index 7a40c79905..2f43db116f 100644
--- a/akka-cluster-sharding/src/test/resources/lirs2-trace-w106.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator lirs2-trace-w106
+# > 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/reference.conf b/cluster-sharding/src/test/resources/reference.conf
similarity index 100%
rename from akka-cluster-sharding/src/test/resources/reference.conf
rename to cluster-sharding/src/test/resources/reference.conf
diff --git a/akka-cluster-sharding/src/test/resources/synthetic-loop.conf b/cluster-sharding/src/test/resources/synthetic-loop.conf
similarity index 97%
rename from akka-cluster-sharding/src/test/resources/synthetic-loop.conf
rename to cluster-sharding/src/test/resources/synthetic-loop.conf
index f316afcbba..e39868228a 100644
--- a/akka-cluster-sharding/src/test/resources/synthetic-loop.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator synthetic-loop
+# > 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/cluster-sharding/src/test/resources/synthetic-zipfian.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf
rename to cluster-sharding/src/test/resources/synthetic-zipfian.conf
index 0f9bf39f00..abbdfc2567 100644
--- a/akka-cluster-sharding/src/test/resources/synthetic-zipfian.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator synthetic-zipfian
+# > 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/cluster-sharding/src/test/resources/text-moby-dick.conf
similarity index 99%
rename from akka-cluster-sharding/src/test/resources/text-moby-dick.conf
rename to cluster-sharding/src/test/resources/text-moby-dick.conf
index f7de9e300a..49c1f36a69 100644
--- a/akka-cluster-sharding/src/test/resources/text-moby-dick.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator text-moby-dick
+# > 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/cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
similarity index 98%
rename from akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
rename to cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
index a42d929b2a..712f7c5b0f 100644
--- a/akka-cluster-sharding/src/test/resources/wikipedia-trace-2018.conf
+++ b/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 org.apache.pekko.cluster.sharding.passivation.simulator.Simulator wikipedia-trace-2018
+# > 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/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingHealthCheckSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingInternalsSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingLeaseSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ClusterShardingSettingsSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ConcurrentStartupShardingSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/CoordinatedShutdownShardingSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/DeprecatedLeastShardAllocationStrategySpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntitiesSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/EntityTerminationSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/GetShardTypeNamesSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/JoinConfigCompatCheckShardingSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategyRandomizedSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/LeastShardAllocationStrategySpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/PersistentShardingMigrationSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ProxyShardingSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesAndStartEntitySpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesBatchedUpdatesSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesFailureSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RememberEntitiesShardIdExtractorChangeSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/RemoveInternalClusterShardingDataSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardRegionSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardWithLeaseSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/ShardingQueriesSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/StartEntitySpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/SupervisionSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/external/ExternalShardAllocationStrategySpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesShardStoreSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/internal/RememberEntitiesStarterSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/CompositeSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/EntityPassivationSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/HillClimbingAdmissionOptimizerSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/IdleSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastFrequentlyUsedSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/LeastRecentlyUsedSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/MostRecentlyUsedSpec.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/AccessPattern.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/Simulator.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorSettings.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/passivation/simulator/SimulatorStats.scala
diff --git a/akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala b/cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
rename to cluster-sharding/src/test/scala/org/apache/pekko/cluster/sharding/protobuf/ClusterShardingMessageSerializerSpec.scala
diff --git a/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java b/cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
similarity index 100%
rename from akka-cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
rename to cluster-tools/src/main/java/org/apache/pekko/cluster/client/protobuf/msg/ClusterClientMessages.java
diff --git a/akka-cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java b/cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
similarity index 100%
rename from akka-cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
rename to cluster-tools/src/main/java/org/apache/pekko/cluster/pubsub/protobuf/msg/DistributedPubSubMessages.java
diff --git a/akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto b/cluster-tools/src/main/protobuf/ClusterClientMessages.proto
similarity index 100%
rename from akka-cluster-tools/src/main/protobuf/ClusterClientMessages.proto
rename to cluster-tools/src/main/protobuf/ClusterClientMessages.proto
diff --git a/akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto b/cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
similarity index 100%
rename from akka-cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
rename to cluster-tools/src/main/protobuf/DistributedPubSubMessages.proto
diff --git a/akka-cluster-tools/src/main/resources/reference.conf b/cluster-tools/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster-tools/src/main/resources/reference.conf
rename to cluster-tools/src/main/resources/reference.conf
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/client/ClusterClient.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializer.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediator.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/PerGroupingBuffer.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializer.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManager.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxy.scala
diff --git a/akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala b/cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
similarity index 100%
rename from akka-cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
rename to cluster-tools/src/main/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializer.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientHandoverSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientStopSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubRestartSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerChaosSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerDownedSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaseSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeave2Spec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerLeaveSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerPreparingForShutdownSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/ClusterSingletonManagerStartupSpec.scala
diff --git a/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala b/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
rename to cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/singleton/MultiDcSingletonManagerSpec.scala
diff --git a/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
similarity index 100%
rename from akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
rename to cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java
diff --git a/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
similarity index 100%
rename from akka-cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
rename to cluster-tools/src/test/java/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorTest.java
diff --git a/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
similarity index 100%
rename from akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
rename to cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java
diff --git a/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
similarity index 100%
rename from akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
rename to cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/Consumer.java
diff --git a/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java b/cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
similarity index 100%
rename from akka-cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
rename to cluster-tools/src/test/java/org/apache/pekko/cluster/singleton/TestSingletonMessages.java
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/client/protobuf/ClusterClientMessageSerializerSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorDeadLettersSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/DistributedPubSubMediatorRouterSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/pubsub/protobuf/DistributedPubSubMessageSerializerSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeaseSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonLeavingSpeedSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonProxySpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestart2Spec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/ClusterSingletonRestartSpec.scala
diff --git a/akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala b/cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
rename to cluster-tools/src/test/scala/org/apache/pekko/cluster/singleton/protobuf/ClusterSingletonMessageSerializerSpec.scala
diff --git a/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
similarity index 100%
rename from akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
rename to cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ClusterMessages.java
diff --git a/akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java b/cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
similarity index 100%
rename from akka-cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
rename to cluster-typed/src/main/java/org/apache/pekko/cluster/typed/internal/protobuf/ReliableDelivery.java
diff --git a/akka-cluster-typed/src/main/protobuf/ClusterMessages.proto b/cluster-typed/src/main/protobuf/ClusterMessages.proto
similarity index 100%
rename from akka-cluster-typed/src/main/protobuf/ClusterMessages.proto
rename to cluster-typed/src/main/protobuf/ClusterMessages.proto
diff --git a/akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto b/cluster-typed/src/main/protobuf/ReliableDelivery.proto
similarity index 100%
rename from akka-cluster-typed/src/main/protobuf/ReliableDelivery.proto
rename to cluster-typed/src/main/protobuf/ReliableDelivery.proto
diff --git a/akka-cluster-typed/src/main/resources/reference.conf b/cluster-typed/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster-typed/src/main/resources/reference.conf
rename to cluster-typed/src/main/resources/reference.conf
diff --git a/akka-cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to cluster-typed/src/main/scala-2.12/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
diff --git a/akka-cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to cluster-typed/src/main/scala-2.13/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
diff --git a/akka-cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala b/cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
rename to cluster-typed/src/main/scala-3/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistProtocol.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/internal/ReplicatorBehavior.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/DistributedData.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/Replicator.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorMessageAdapter.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorSettings.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/DistributedData.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/Replicator.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorMessageAdapter.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSettings.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/package.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/Cluster.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/ClusterSingleton.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterImpl.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/AdaptedClusterSingletonImpl.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializer.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializer.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionist.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistConfigCompatChecker.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSettings.scala
diff --git a/akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala b/cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
similarity index 100%
rename from akka-cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
rename to cluster-typed/src/main/scala/org/apache/pekko/cluster/typed/internal/receptionist/Registry.scala
diff --git a/akka-cluster-typed/src/multi-jvm/resources/logback-test.xml b/cluster-typed/src/multi-jvm/resources/logback-test.xml
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/resources/logback-test.xml
rename to cluster-typed/src/multi-jvm/resources/logback-test.xml
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/ChunkLargeMessageSpec.scala
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcClusterSingletonSpec.scala
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiDcPinger.scala
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/MultiNodeTypedClusterSpec.scala
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/PubSubSpec.scala
diff --git a/akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala b/cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
similarity index 100%
rename from akka-cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
rename to cluster-typed/src/multi-jvm/scala/org/apache/pekko/cluster/typed/internal/ClusterReceptionistUnreachabilitySpec.scala
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocSample.java
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/ddata/typed/javadsl/ReplicatorDocTest.java
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/BasicClusterExampleTest.java
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/PingSerializerExampleTest.java
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/ReceptionistExample.java
diff --git a/akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java b/cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
rename to cluster-typed/src/test/java/jdocs/org/apache/pekko/cluster/typed/SingletonCompileOnlyTest.java
diff --git a/akka-cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java b/cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
similarity index 100%
rename from akka-cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
rename to cluster-typed/src/test/java/org/apache/pekko/cluster/typed/ClusterApiTest.java
diff --git a/akka-cluster-typed/src/test/resources/logback-test.xml b/cluster-typed/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-cluster-typed/src/test/resources/logback-test.xml
rename to cluster-typed/src/test/resources/logback-test.xml
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorDocSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/BasicClusterExampleSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/DistributedPubSubExample.scala
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/PingSerializer.scala
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/ReceptionistExample.scala
diff --git a/akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala b/cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
rename to cluster-typed/src/test/scala/docs/org/apache/pekko/cluster/typed/SingletonCompileOnlySpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorCompileOnlyTest.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/ddata/typed/scaladsl/ReplicatorSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorRefIgnoreSerializationSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ActorSystemSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterActorLoggingSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterApiSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterDispatcherSelectorSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonApiSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/ClusterSingletonPoisonPillSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/GroupRouterSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteContextAskSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteDeployNotAllowedSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/RemoteMessageSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializerSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializerSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializerSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/PekkoClusterTypedSerializerSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/delivery/ReliableDeliverySerializerSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistSpec.scala
diff --git a/akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala b/cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
similarity index 100%
rename from akka-cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
rename to cluster-typed/src/test/scala/org/apache/pekko/cluster/typed/internal/receptionist/ClusterReceptionistStateSpec.scala
diff --git a/akka-cluster/jmx-client/LICENSES b/cluster/jmx-client/LICENSES
similarity index 100%
rename from akka-cluster/jmx-client/LICENSES
rename to cluster/jmx-client/LICENSES
diff --git a/akka-cluster/jmx-client/akka-cluster b/cluster/jmx-client/akka-cluster
similarity index 100%
rename from akka-cluster/jmx-client/akka-cluster
rename to cluster/jmx-client/akka-cluster
diff --git a/akka-cluster/jmx-client/jmxsh-R5.jar b/cluster/jmx-client/jmxsh-R5.jar
similarity index 100%
rename from akka-cluster/jmx-client/jmxsh-R5.jar
rename to cluster/jmx-client/jmxsh-R5.jar
diff --git a/akka-cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java b/cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
similarity index 100%
rename from akka-cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
rename to cluster/src/main/java/org/apache/pekko/cluster/protobuf/msg/ClusterMessages.java
diff --git a/akka-cluster/src/main/protobuf/ClusterMessages.proto b/cluster/src/main/protobuf/ClusterMessages.proto
similarity index 100%
rename from akka-cluster/src/main/protobuf/ClusterMessages.proto
rename to cluster/src/main/protobuf/ClusterMessages.proto
diff --git a/akka-cluster/src/main/resources/reference.conf b/cluster/src/main/resources/reference.conf
similarity index 100%
rename from akka-cluster/src/main/resources/reference.conf
rename to cluster/src/main/resources/reference.conf
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/Cluster.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterActorRefProvider.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterDaemon.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterEvent.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterHeartbeat.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterJmx.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogClass.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterLogMarker.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterReadView.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterRemoteWatcher.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala b/cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/ClusterSettings.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala b/cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/CoordinatedShutdownLeave.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala b/cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/CrossDcClusterHeartbeat.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala b/cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/DowningProvider.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/Gossip.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatCheckCluster.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala b/cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/JoinConfigCompatChecker.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/Member.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/Member.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala b/cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/MembershipState.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala b/cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/Reachability.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala b/cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/SeedNodeProcess.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala b/cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/VectorClock.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala b/cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializer.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala b/cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/routing/ClusterRouterConfig.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/sbr/DowningStrategy.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolver.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverProvider.scala
diff --git a/akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala b/cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
similarity index 100%
rename from akka-cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
rename to cluster/src/main/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSettings.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/AttemptSysMsgRedeliverySpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClientDowningNodeThatIsUpSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterAccrualFailureDetectorSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterDeathWatchSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterShutdownSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ClusterWatcherNoClusterWatcheeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/ConvergenceSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DeterministicOldestWhenJoiningSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DisallowJoinOfTwoClustersSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/DowningWhenOtherHasQuarantinedThisActorSystemSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialHeartbeatSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/InitialMembersOfNewDcSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinInProgressSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/JoinSeedNodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LargeMessageClusterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningAllOtherNodesSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderDowningNodeThatIsUnreachableSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderElectionSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/LeaderLeavingSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MBeanSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MemberWeaklyUpSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerExitingSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MembershipChangeListenerUpSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MinMembersBeforeUpSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcClusterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcHeartbeatTakingOverSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoin2Spec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcJoinSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcLastNodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSplitBrainSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiDcSunnyWeatherSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/MultiNodeClusterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeChurnSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeDowningAndBeingRemovedSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingAndBeingRemovedSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeLeavingAndExitingSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeMembershipSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/NodeUpSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/QuickRestartSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RemoteFeaturesWithClusterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartFirstSeedNodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode2Spec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNode3Spec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/RestartNodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SharedMediaDriverSupport.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SingletonClusterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainQuarantineSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SplitBrainSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StreamRefSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/StressSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SunnyWeatherSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/SurviveNetworkInstabilitySpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/TransitionSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/UnreachableNodeJoinsAgainSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingGroupSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterConsistentHashingRouterSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/ClusterRoundRobinSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/routing/UseRoleIgnoredSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllIndirectlyConnected5NodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/DownAllUnstable5NodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected3NodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/IndirectlyConnected5NodeSpec.scala
diff --git a/akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala b/cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
similarity index 100%
rename from akka-cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
rename to cluster/src/multi-jvm/scala/org/apache/pekko/cluster/sbr/LeaseMajority5NodeSpec.scala
diff --git a/akka-cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java b/cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
similarity index 100%
rename from akka-cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
rename to cluster/src/test/java/org/apache/pekko/cluster/ClusterJavaCompileTest.java
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterConfigSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeathWatchNotificationSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterDeployerSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventPublisherSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterDomainEventSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatReceiverSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterHeartbeatSenderStateSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterLogSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ClusterTestKit.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/CrossDcHeartbeatSenderSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/DowningProviderSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala b/cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/FailureDetectorPuppet.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/GossipSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/GossipTargetSelectorSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingPerfSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/HeartbeatNodeRingSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckClusterSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerRollingUpdateSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatCheckerSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/JoinConfigCompatPreDefinedChecksSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/MemberOrderingSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/MembershipStateSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ReachabilityPerfSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ReachabilitySpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ResetSystemMessageSeqNrSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/ShutdownAfterJoinSeedNodesSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/StartupWithOneThreadSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala b/cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/TestMember.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/VectorClockPerfSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/VectorClockSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/protobuf/ClusterMessageSerializerSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/routing/ClusterRouterSupervisorSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/sbr/LeaseMajoritySpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/sbr/SplitBrainResolverSpec.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala b/cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/sbr/TestAddresses.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala b/cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDown.scala
diff --git a/akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala b/cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
similarity index 100%
rename from akka-cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
rename to cluster/src/test/scala/org/apache/pekko/cluster/testkit/AutoDownSpec.scala
diff --git a/akka-coordination/src/main/resources/reference.conf b/coordination/src/main/resources/reference.conf
similarity index 100%
rename from akka-coordination/src/main/resources/reference.conf
rename to coordination/src/main/resources/reference.conf
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseException.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseSettings.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/LeaseUsageSettings.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/TimeoutSettings.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/internal/LeaseAdapter.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/Lease.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/javadsl/LeaseProvider.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/Lease.scala
diff --git a/akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala b/coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
similarity index 100%
rename from akka-coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
rename to coordination/src/main/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProvider.scala
diff --git a/akka-coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java b/coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
similarity index 100%
rename from akka-coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
rename to coordination/src/test/java/org/apache/pekko/coordination/lease/javadsl/LeaseProviderTest.java
diff --git a/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
similarity index 100%
rename from akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
rename to coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLease.scala
diff --git a/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
similarity index 100%
rename from akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
rename to coordination/src/test/scala/org/apache/pekko/coordination/lease/TestLeaseActor.scala
diff --git a/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
similarity index 100%
rename from akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
rename to coordination/src/test/scala/org/apache/pekko/coordination/lease/TimeoutSettingsSpec.scala
diff --git a/akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala b/coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
similarity index 100%
rename from akka-coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
rename to coordination/src/test/scala/org/apache/pekko/coordination/lease/scaladsl/LeaseProviderSpec.scala
diff --git a/akka-discovery/src/main/resources/reference.conf b/discovery/src/main/resources/reference.conf
similarity index 100%
rename from akka-discovery/src/main/resources/reference.conf
rename to discovery/src/main/resources/reference.conf
diff --git a/akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
similarity index 98%
rename from akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
rename to discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
index b09930b3a3..b1b94592ea 100644
--- a/akka-discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
+++ b/discovery/src/main/scala/org/apache/pekko/discovery/Discovery.scala
@@ -28,7 +28,7 @@ final class Discovery(implicit system: ExtendedActorSystem) extends Extension {
         throw new IllegalArgumentException(
           "No default service discovery implementation configured in " +
           "`pekko.discovery.method`. Make sure to configure this setting to your preferred implementation such as " +
-          "'pekko-dns' in your application.conf (from the akka-discovery module).")
+          "'pekko-dns' in your application.conf (from the pekko-discovery module).")
       case method => method
     }
 
diff --git a/akka-discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
similarity index 100%
rename from akka-discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
rename to discovery/src/main/scala/org/apache/pekko/discovery/ServiceDiscovery.scala
diff --git a/akka-discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
similarity index 100%
rename from akka-discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
rename to discovery/src/main/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscovery.scala
diff --git a/akka-discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
similarity index 100%
rename from akka-discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
rename to discovery/src/main/scala/org/apache/pekko/discovery/config/ConfigServiceDiscovery.scala
diff --git a/akka-discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala b/discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
similarity index 100%
rename from akka-discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
rename to discovery/src/main/scala/org/apache/pekko/discovery/dns/DnsServiceDiscovery.scala
diff --git a/akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java b/discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
similarity index 100%
rename from akka-discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
rename to discovery/src/test/java/jdoc/org/apache/pekko/discovery/CompileOnlyTest.java
diff --git a/akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala b/discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
rename to discovery/src/test/scala/doc/org/apache/pekko/discovery/CompileOnlySpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/DiscoveryConfigurationSpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/LookupSpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/aggregate/AggregateServiceDiscoverySpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServiceDiscoverySpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/config/ConfigServicesParserSpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsDiscoverySpec.scala
diff --git a/akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala b/discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
similarity index 100%
rename from akka-discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
rename to discovery/src/test/scala/org/apache/pekko/discovery/dns/DnsServiceDiscoverySpec.scala
diff --git a/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
similarity index 100%
rename from akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
rename to distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatedDataMessages.java
diff --git a/akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java b/distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
similarity index 100%
rename from akka-distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
rename to distributed-data/src/main/java/org/apache/pekko/cluster/ddata/protobuf/msg/ReplicatorMessages.java
diff --git a/akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto b/distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
similarity index 100%
rename from akka-distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
rename to distributed-data/src/main/protobuf/ReplicatedDataMessages.proto
diff --git a/akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto b/distributed-data/src/main/protobuf/ReplicatorMessages.proto
similarity index 100%
rename from akka-distributed-data/src/main/protobuf/ReplicatorMessages.proto
rename to distributed-data/src/main/protobuf/ReplicatorMessages.proto
diff --git a/akka-distributed-data/src/main/resources/reference.conf b/distributed-data/src/main/resources/reference.conf
similarity index 100%
rename from akka-distributed-data/src/main/resources/reference.conf
rename to distributed-data/src/main/resources/reference.conf
diff --git a/akka-distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala b/distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
rename to distributed-data/src/main/scala-2/org/apache/pekko/cluster/ddata/GSet.scala
diff --git a/akka-distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala b/distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
rename to distributed-data/src/main/scala-3/org/apache/pekko/cluster/ddata/GSet.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelector.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DistributedData.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/DurableStore.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/EstimatedSize.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/FastMerge.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Flag.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/GCounter.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Key.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWMap.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/LWWRegister.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMap.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORMultiMap.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ORSet.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounter.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PNCounterMap.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PayloadSizeAggregator.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/PruningState.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/ReplicatedData.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/Replicator.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/VersionVector.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializer.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializer.scala
diff --git a/akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala b/distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
similarity index 100%
rename from akka-distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
rename to distributed-data/src/main/scala/org/apache/pekko/cluster/ddata/protobuf/SerializationSupport.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurableDataSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/DurablePruningSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/JepsenInspiredInsertSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/PerformanceSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorChaosSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorDeltaSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorGossipSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorMapDeltaSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorORSetDeltaSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorPruningSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/ReplicatorSpec.scala
diff --git a/akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala b/distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
similarity index 100%
rename from akka-distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
rename to distributed-data/src/multi-jvm/scala/org/apache/pekko/cluster/ddata/STMultiNodeSpec.scala
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData.java
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfDeltaReplicatedData2.java
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/JavaImplOfReplicatedData.java
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMapTest.java
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/ORMultiMapTest.java
diff --git a/akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java b/distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
similarity index 100%
rename from akka-distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
rename to distributed-data/src/test/java/org/apache/pekko/cluster/ddata/PNCounterTest.java
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DeltaPropagationSelectorSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/FlagSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GSetSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWMapSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LWWRegisterSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LocalConcurrencySpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/LotsOfDataBot.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMapSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORMultiMapSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterMapSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PNCounterSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ReplicatorSettingsSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/WriteAggregatorSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatedDataSerializerSpec.scala
diff --git a/akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala b/distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
similarity index 100%
rename from akka-distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
rename to distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/protobuf/ReplicatorMessageSerializerSpec.scala
diff --git a/docs/src/main/paradox/actors.md b/docs/src/main/paradox/actors.md
index 02d6dc97a4..92e50e9b66 100644
--- a/docs/src/main/paradox/actors.md
+++ b/docs/src/main/paradox/actors.md
@@ -7,19 +7,19 @@
 To use Classic Actors, add the following dependency in your project:
 
 @@dependency[sbt,Maven,Gradle] {
-  bomGroup=org.apache.pekko bomArtifact=akka-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
+  bomGroup=org.apache.pekko bomArtifact=pekko-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
   symbol1=PekkoVersion
   value1="$pekko.version$"
   group="org.apache.pekko"
-  artifact="akka-actor_$scala.binary.version$"
+  artifact="pekko-actor_$scala.binary.version$"
   version=PekkoVersion
   group2="org.apache.pekko"
-  artifact2="akka-testkit_$scala.binary.version$"
+  artifact2="pekko-testkit_$scala.binary.version$"
   scope2=test
   version2=PekkoVersion
 }
 
-@@project-info{ projectId="akka-actor" }
+@@project-info{ projectId="actor" }
 
 ## Introduction
 
@@ -351,7 +351,7 @@ 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/org/apache/pekko/actor/Actor.scala) { #lifecycle-hooks }
+:  @@snip [Actor.scala](/actor/src/main/scala/org/apache/pekko/actor/Actor.scala) { #lifecycle-hooks }
 
 Java
 :  @@snip [ActorDocTest.java](/docs/src/test/java/jdocs/actor/ActorDocTest.java) { #lifecycle-callbacks }
@@ -785,7 +785,7 @@ An Actor has to
 @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/org/apache/pekko/actor/Actor.scala) { #receive }
+:  @@snip [Actor.scala](/actor/src/main/scala/org/apache/pekko/actor/Actor.scala) { #receive }
 
 Java
 :  @@snip [ActorDocTest.java](/docs/src/test/java/jdocs/actor/ActorDocTest.java) { #createReceive }
diff --git a/docs/src/main/paradox/additional/osgi.md b/docs/src/main/paradox/additional/osgi.md
index dab4267e4f..b731a9c799 100644
--- a/docs/src/main/paradox/additional/osgi.md
+++ b/docs/src/main/paradox/additional/osgi.md
@@ -109,7 +109,7 @@ dynamic in this way. ActorRefs may safely be exposed to other bundles.
 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 }
+@@snip [Activator.scala](/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](osgi.ActorSystemActivator) creates
 the actor system with a class loader that finds resources (`application.conf` and `reference.conf` files) and classes
diff --git a/docs/src/main/paradox/cluster-client.md b/docs/src/main/paradox/cluster-client.md
index ae7116a6ef..7c775537e2 100644
--- a/docs/src/main/paradox/cluster-client.md
+++ b/docs/src/main/paradox/cluster-client.md
@@ -14,15 +14,15 @@ It is not advised to build new applications with Cluster Client, and existing us
 To use Cluster Client, you must add the following dependency in your project:
 
 @@dependency[sbt,Maven,Gradle] {
-bomGroup=org.apache.pekko bomArtifact=akka-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
+bomGroup=org.apache.pekko bomArtifact=pekko-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
 symbol1=PekkoVersion
 value1="$pekko.version$"
 group=org.apache.pekko
-artifact=akka-cluster-tools_$scala.binary.version$
+artifact=pekko-cluster-tools_$scala.binary.version$
 version=PekkoVersion
 }
 
-@@project-info{ projectId="akka-cluster-tools" }
+@@project-info{ projectId="cluster-tools" }
 
 ## Introduction
 
@@ -123,28 +123,28 @@ pekko.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/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #server }
+:  @@snip [ClusterClientSpec.scala](/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #server }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #server }
+:  @@snip [ClusterClientTest.java](/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/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #client }
+:  @@snip [ClusterClientSpec.scala](/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #client }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #client }
+:  @@snip [ClusterClientTest.java](/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #client }
 
 The `initialContacts` parameter is a @scala[`Set[ActorPath]`]@java[`Set<ActorPath>`], which can be created like this:
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #initialContacts }
+:  @@snip [ClusterClientSpec.scala](/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #initialContacts }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #initialContacts }
+:  @@snip [ClusterClientTest.java](/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).
@@ -178,18 +178,18 @@ receptionists), as they become available. The code illustrates subscribing to th
 initial state.
 
 Scala
-:  @@snip [ClusterClientSpec.scala](/akka-cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #clientEventsListener }
+:  @@snip [ClusterClientSpec.scala](/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #clientEventsListener }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #clientEventsListener }
+:  @@snip [ClusterClientTest.java](/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/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #receptionistEventsListener }
+:  @@snip [ClusterClientSpec.scala](/cluster-tools/src/multi-jvm/scala/org/apache/pekko/cluster/client/ClusterClientSpec.scala) { #receptionistEventsListener }
 
 Java
-:  @@snip [ClusterClientTest.java](/akka-cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #receptionistEventsListener }
+:  @@snip [ClusterClientTest.java](/cluster-tools/src/test/java/org/apache/pekko/cluster/client/ClusterClientTest.java) { #receptionistEventsListener }
 
 <a id="cluster-client-config"></a>
 ## Configuration
@@ -197,7 +197,7 @@ Java
 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 }
+@@snip [reference.conf](/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`](pekko.actor.ActorSystem)]@java[@javadoc[`ActorSystem`](pekko.actor.ActorSystem)] parameter. It is also possible to amend the @apidoc[ClusterClientSettings]
@@ -205,7 +205,7 @@ or create it from another config section with the same layout as below. @apidoc[
 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 }
+@@snip [reference.conf](/cluster-tools/src/main/resources/reference.conf) { #cluster-client-config }
 
 ## Failure handling
 
diff --git a/docs/src/main/paradox/cluster-dc.md b/docs/src/main/paradox/cluster-dc.md
index d6c1b54051..52b3e2a161 100644
--- a/docs/src/main/paradox/cluster-dc.md
+++ b/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/org/apache/pekko/cluster/singleton/ClusterSingletonManagerSpec.scala) { #create-singleton-proxy-dc }
+:  @@snip [ClusterSingletonManagerSpec.scala](/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/org/apache/pekko/cluster/singleton/ClusterSingletonManagerTest.java) { #create-singleton-proxy-dc }
+:  @@snip [ClusterSingletonManagerTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #proxy-dc }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #proxy-dc }
 
 Java
 :  @@snip [ClusterShardingTest.java](/docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #proxy-dc }
diff --git a/docs/src/main/paradox/cluster-metrics.md b/docs/src/main/paradox/cluster-metrics.md
index 6d8a6ff81a..4562e352d6 100644
--- a/docs/src/main/paradox/cluster-metrics.md
+++ b/docs/src/main/paradox/cluster-metrics.md
@@ -5,11 +5,11 @@
 To use Cluster Metrics Extension, you must add the following dependency in your project:
 
 @@dependency[sbt,Maven,Gradle] {
-  bomGroup=org.apache.pekko bomArtifact=akka-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
+  bomGroup=org.apache.pekko bomArtifact=pekko-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
   symbol1=PekkoVersion
   value1="$pekko.version$"
   group=org.apache.pekko
-  artifact=akka-cluster-metrics_$scala.binary.version$
+  artifact=pekko-cluster-metrics_$scala.binary.version$
   version=PekkoVersion
 }
 
@@ -20,7 +20,7 @@ and add the following configuration stanza to your `application.conf`
 pekko.extensions = [ "pekko.cluster.metrics.ClusterMetricsExtension" ]
 ```
 
-@@project-info{ projectId="akka-cluster-metrics" }
+@@project-info{ projectId="cluster-metrics" }
 
 ## Introduction
 
@@ -208,4 +208,4 @@ Custom metrics collector implementation class must be specified in the
 
 The Cluster metrics extension can be configured with the following properties:
 
-@@snip [reference.conf](/akka-cluster-metrics/src/main/resources/reference.conf)
+@@snip [reference.conf](/cluster-metrics/src/main/resources/reference.conf)
diff --git a/docs/src/main/paradox/cluster-routing.md b/docs/src/main/paradox/cluster-routing.md
index 297fe8b55e..8b2a750a57 100644
--- a/docs/src/main/paradox/cluster-routing.md
+++ b/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/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-lookup-in-code }
+:  @@snip [StatsService.scala](/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-lookup-in-code }
 
 Java
 :  @@snip [StatsService.java](/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/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala) { #messages }
+:  @@snip [StatsMessages.scala](/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsMessages.scala) { #messages }
 
 Java
 :  @@snip [StatsMessages.java](/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/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala) { #worker }
+:  @@snip [StatsWorker.scala](/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsWorker.scala) { #worker }
 
 Java
 :  @@snip [StatsWorker.java](/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/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #service }
+@@snip [StatsService.scala](/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/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-deploy-in-code }
+:  @@snip [StatsService.scala](/cluster-metrics/src/multi-jvm/scala/org/apache/pekko/cluster/metrics/sample/StatsService.scala) { #router-deploy-in-code }
 
 Java
 :  @@snip [StatsService.java](/docs/src/test/java/jdocs/cluster/StatsService.java) { #router-deploy-in-code }
diff --git a/docs/src/main/paradox/cluster-sharding.md b/docs/src/main/paradox/cluster-sharding.md
index ac7f64a23c..03f3e9c1ba 100644
--- a/docs/src/main/paradox/cluster-sharding.md
+++ b/docs/src/main/paradox/cluster-sharding.md
@@ -8,15 +8,15 @@ For the full documentation of this feature and for new projects see @ref:[Cluste
 To use Cluster Sharding, you must add the following dependency in your project:
 
 @@dependency[sbt,Maven,Gradle] {
-  bomGroup=org.apache.pekko bomArtifact=akka-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
+  bomGroup=org.apache.pekko bomArtifact=pekko-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
   symbol1=PekkoVersion
   value1="$pekko.version$"
   group=org.apache.pekko
-  artifact=akka-cluster-sharding_$scala.binary.version$
+  artifact=pekko-cluster-sharding_$scala.binary.version$
   version=PekkoVersion
 }
 
-@@project-info{ projectId="akka-cluster-sharding" }
+@@project-info{ projectId="cluster-sharding" }
 
 ## Introduction
 
@@ -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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-actor }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-actor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-start }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-start }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-extractor }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-extractor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-usage }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-usage }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #extractShardId-StartEntity }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #extractShardId-StartEntity }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #supervisor }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #supervisor }
 
 Java
 :  @@snip [ClusterShardingTest.java](/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/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-supervisor-start }
+:  @@snip [ClusterShardingSpec.scala](/cluster-sharding/src/multi-jvm/scala/org/apache/pekko/cluster/sharding/ClusterShardingSpec.scala) { #counter-supervisor-start }
 
 Java
 :  @@snip [ClusterShardingTest.java](/docs/src/test/java/jdocs/sharding/ClusterShardingTest.java) { #counter-supervisor-start }
diff --git a/docs/src/main/paradox/cluster-singleton.md b/docs/src/main/paradox/cluster-singleton.md
index 6ead786384..d0fa1440cc 100644
--- a/docs/src/main/paradox/cluster-singleton.md
+++ b/docs/src/main/paradox/cluster-singleton.md
@@ -8,15 +8,15 @@ For the full documentation of this feature and for new projects see @ref:[Cluste
 To use Cluster Singleton, you must add the following dependency in your project:
 
 @@dependency[sbt,Maven,Gradle] {
-  bomGroup=org.apache.pekko bomArtifact=akka-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
+  bomGroup=org.apache.pekko bomArtifact=pekko-bom_$scala.binary.version$ bomVersionSymbols=PekkoVersion
   symbol1=PekkoVersion
   value1="$pekko.version$"
   group=org.apache.pekko
-  artifact=akka-cluster-tools_$scala.binary.version$
+  artifact=pekko-cluster-tools_$scala.binary.version$
   version=PekkoVersion
 }
 
-@@project-info{ projectId="akka-cluster-tools" }
+@@project-info{ projectId="cluster-tools" }
 
 ## Introduction
 
@@ -55,19 +55,19 @@ Before explaining how to create a cluster singleton actor, let's define message
 which will be used by the singleton.
... 12840 lines suppressed ...


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