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/02/14 11:12:42 UTC

[incubator-pekko-http] branch main updated: Rename akka package to org.apache.pekko

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-http.git


The following commit(s) were added to refs/heads/main by this push:
     new 00ca348fa Rename akka package to org.apache.pekko
00ca348fa is described below

commit 00ca348fac743a458d1218cd4377031a9d7be7b3
Author: Matthew de Detrich <ma...@aiven.io>
AuthorDate: Thu Jan 26 01:45:00 2023 +0100

    Rename akka package to org.apache.pekko
---
 CONTRIBUTING.md                                    |    6 +-
 build.sbt                                          |   76 +-
 .../paradox/client-side/client-https-support.md    |    6 +-
 .../main/paradox/client-side/client-transport.md   |    6 +-
 .../main/paradox/client-side/connection-level.md   |    2 +-
 docs/src/main/paradox/client-side/host-level.md    |    6 +-
 docs/src/main/paradox/client-side/http2.md         |    2 +-
 docs/src/main/paradox/common/encoding.md           |    2 +-
 docs/src/main/paradox/common/http-model.md         |   20 +-
 docs/src/main/paradox/common/json-support.md       |   22 +-
 docs/src/main/paradox/common/marshalling.md        |   18 +-
 docs/src/main/paradox/common/sse-support.md        |    4 +-
 docs/src/main/paradox/common/timeouts.md           |    2 +-
 docs/src/main/paradox/common/unmarshalling.md      |   12 +-
 docs/src/main/paradox/common/uri-model.md          |   52 +-
 docs/src/main/paradox/common/xml-support.md        |    4 +-
 docs/src/main/paradox/compatibility-guidelines.md  |  128 +-
 ...ing-blocking-operations-in-pekko-http-routes.md |    1 -
 .../directives/attribute-directives/attribute.md   |    2 +-
 .../attribute-directives/optionalAttribute.md      |    2 +-
 .../directives/basic-directives/cancelRejection.md |    2 +-
 .../basic-directives/cancelRejections.md           |    2 +-
 .../directives/basic-directives/extract.md         |    2 +-
 .../basic-directives/extractActorSystem.md         |    4 +-
 .../basic-directives/extractDataBytes.md           |    2 +-
 .../basic-directives/extractExecutionContext.md    |    2 +-
 .../directives/basic-directives/extractLog.md      |    2 +-
 .../basic-directives/extractMatchedPath.md         |    2 +-
 .../basic-directives/extractMaterializer.md        |    2 +-
 .../basic-directives/extractParserSettings.md      |    2 +-
 .../directives/basic-directives/extractRequest.md  |    2 +-
 .../basic-directives/extractRequestContext.md      |    2 +-
 .../basic-directives/extractRequestEntity.md       |    2 +-
 .../directives/basic-directives/extractSettings.md |    2 +-
 .../basic-directives/extractStrictEntity.md        |    2 +-
 .../basic-directives/extractUnmatchedPath.md       |    2 +-
 .../directives/basic-directives/extractUri.md      |    2 +-
 .../directives/basic-directives/mapInnerRoute.md   |    2 +-
 .../directives/basic-directives/mapRejections.md   |    2 +-
 .../directives/basic-directives/mapRequest.md      |    2 +-
 .../basic-directives/mapRequestContext.md          |    2 +-
 .../directives/basic-directives/mapResponse.md     |    2 +-
 .../basic-directives/mapResponseEntity.md          |    2 +-
 .../basic-directives/mapResponseHeaders.md         |    2 +-
 .../directives/basic-directives/mapRouteResult.md  |    2 +-
 .../basic-directives/mapRouteResultFuture.md       |    2 +-
 .../basic-directives/mapRouteResultPF.md           |    2 +-
 .../basic-directives/mapRouteResultWith.md         |    2 +-
 .../basic-directives/mapRouteResultWithPF.md       |    2 +-
 .../directives/basic-directives/mapSettings.md     |    2 +-
 .../basic-directives/mapUnmatchedPath.md           |    2 +-
 .../directives/basic-directives/pass.md            |    2 +-
 .../directives/basic-directives/provide.md         |    2 +-
 .../basic-directives/recoverRejections.md          |    2 +-
 .../basic-directives/recoverRejectionsWith.md      |    2 +-
 .../directives/basic-directives/textract.md        |    2 +-
 .../directives/basic-directives/toStrictEntity.md  |    2 +-
 .../directives/basic-directives/tprovide.md        |    2 +-
 .../basic-directives/withExecutionContext.md       |    2 +-
 .../directives/basic-directives/withLog.md         |    2 +-
 .../basic-directives/withMaterializer.md           |    2 +-
 .../directives/basic-directives/withSettings.md    |    2 +-
 .../cache-condition-directives/conditional.md      |    2 +-
 .../directives/caching-directives/alwaysCache.md   |    2 +-
 .../directives/caching-directives/cache.md         |    2 +-
 .../caching-directives/cachingProhibited.md        |    2 +-
 .../directives/coding-directives/decodeRequest.md  |    2 +-
 .../coding-directives/decodeRequestWith.md         |    2 +-
 .../directives/coding-directives/encodeResponse.md |    2 +-
 .../coding-directives/encodeResponseWith.md        |    2 +-
 .../coding-directives/requestEncodedWith.md        |    2 +-
 .../coding-directives/responseEncodingAccepted.md  |    2 +-
 .../withPrecompressedMediaTypeSupport.md           |    2 +-
 .../directives/cookie-directives/cookie.md         |    2 +-
 .../directives/cookie-directives/deleteCookie.md   |    2 +-
 .../directives/cookie-directives/optionalCookie.md |    2 +-
 .../directives/cookie-directives/setCookie.md      |    2 +-
 .../routing-dsl/directives/custom-directives.md    |   10 +-
 .../execution-directives/handleExceptions.md       |    2 +-
 .../execution-directives/handleRejections.md       |    2 +-
 .../getFromBrowseableDirectories.md                |    2 +-
 .../getFromBrowseableDirectory.md                  |    4 +-
 .../getFromDirectory.md                            |    2 +-
 .../file-and-resource-directives/getFromFile.md    |    2 +-
 .../getFromResource.md                             |    2 +-
 .../getFromResourceDirectory.md                    |    2 +-
 .../listDirectoryContents.md                       |    2 +-
 .../file-upload-directives/fileUpload.md           |    2 +-
 .../file-upload-directives/fileUploadAll.md        |    2 +-
 .../file-upload-directives/storeUploadedFile.md    |    2 +-
 .../file-upload-directives/storeUploadedFiles.md   |    2 +-
 .../form-field-directives/formFieldMap.md          |    2 +-
 .../form-field-directives/formFieldMultiMap.md     |    2 +-
 .../form-field-directives/formFieldSeq.md          |    2 +-
 .../future-directives/completeOrRecoverWith.md     |    2 +-
 .../directives/future-directives/onComplete.md     |    2 +-
 .../future-directives/onCompleteWithBreaker.md     |    2 +-
 .../header-directives/checkSameOrigin.md           |    2 +-
 .../directives/header-directives/headerValue.md    |    2 +-
 .../header-directives/headerValueByName.md         |    2 +-
 .../directives/header-directives/headerValuePF.md  |    2 +-
 .../header-directives/optionalHeaderValue.md       |    2 +-
 .../header-directives/optionalHeaderValueByName.md |    2 +-
 .../header-directives/optionalHeaderValuePF.md     |    2 +-
 .../directives/host-directives/extractHost.md      |    2 +-
 .../routing-dsl/directives/host-directives/host.md |    2 +-
 .../main/paradox/routing-dsl/directives/index.md   |    2 +-
 .../marshalling-directives/completeWith.md         |    2 +-
 .../directives/marshalling-directives/entity.md    |    4 +-
 .../marshalling-directives/handleWith.md           |    2 +-
 .../directives/marshalling-directives/index.md     |    2 +-
 .../directives/method-directives/delete.md         |    2 +-
 .../directives/method-directives/extractMethod.md  |    2 +-
 .../directives/method-directives/get.md            |    2 +-
 .../directives/method-directives/head.md           |    2 +-
 .../directives/method-directives/method.md         |    2 +-
 .../directives/method-directives/options.md        |    2 +-
 .../overrideMethodWithParameter.md                 |    2 +-
 .../directives/method-directives/patch.md          |    2 +-
 .../directives/method-directives/post.md           |    2 +-
 .../directives/method-directives/put.md            |    2 +-
 .../directives/misc-directives/extractClientIP.md  |    2 +-
 .../misc-directives/rejectEmptyResponse.md         |    2 +-
 .../misc-directives/requestEntityEmpty.md          |    2 +-
 .../misc-directives/requestEntityPresent.md        |    2 +-
 .../misc-directives/selectPreferredLanguage.md     |    2 +-
 .../directives/misc-directives/validate.md         |    2 +-
 .../directives/misc-directives/withSizeLimit.md    |    2 +-
 .../directives/misc-directives/withoutSizeLimit.md |    2 +-
 .../parameter-directives/parameterMap.md           |    2 +-
 .../parameter-directives/parameterMultiMap.md      |    2 +-
 .../parameter-directives/parameterSeq.md           |    2 +-
 .../path-directives/ignoreTrailingSlash.md         |    2 +-
 .../routing-dsl/directives/path-directives/path.md |    2 +-
 .../directives/path-directives/pathEnd.md          |    2 +-
 .../path-directives/pathEndOrSingleSlash.md        |    2 +-
 .../directives/path-directives/pathPrefix.md       |    2 +-
 .../directives/path-directives/pathPrefixTest.md   |    2 +-
 .../directives/path-directives/pathSingleSlash.md  |    2 +-
 .../directives/path-directives/pathSuffix.md       |    2 +-
 .../directives/path-directives/pathSuffixTest.md   |    2 +-
 .../directives/path-directives/rawPathPrefix.md    |    2 +-
 .../path-directives/rawPathPrefixTest.md           |    2 +-
 .../redirectToNoTrailingSlashIfPresent.md          |    2 +-
 .../redirectToTrailingSlashIfMissing.md            |    2 +-
 .../respondWithDefaultHeader.md                    |    2 +-
 .../respondWithDefaultHeaders.md                   |    2 +-
 .../respond-with-directives/respondWithHeader.md   |    2 +-
 .../respond-with-directives/respondWithHeaders.md  |    2 +-
 .../directives/route-directives/failWith.md        |    2 +-
 .../directives/route-directives/handle.md          |    2 +-
 .../directives/route-directives/handleSync.md      |    2 +-
 .../directives/route-directives/redirect.md        |    4 +-
 .../directives/route-directives/reject.md          |    2 +-
 .../directives/scheme-directives/extractScheme.md  |    2 +-
 .../directives/scheme-directives/scheme.md         |    2 +-
 .../security-directives/authenticateBasic.md       |    4 +-
 .../security-directives/authenticateBasicAsync.md  |    4 +-
 .../security-directives/authenticateBasicPF.md     |    4 +-
 .../authenticateBasicPFAsync.md                    |    4 +-
 .../security-directives/authenticateOAuth2.md      |    4 +-
 .../security-directives/authenticateOAuth2Async.md |    4 +-
 .../security-directives/authenticateOAuth2PF.md    |    4 +-
 .../authenticateOAuth2PFAsync.md                   |    4 +-
 .../authenticateOrRejectWithChallenge.md           |    4 +-
 .../directives/security-directives/authorize.md    |    2 +-
 .../security-directives/authorizeAsync.md          |    2 +-
 .../security-directives/extractCredentials.md      |    2 +-
 .../timeout-directives/extractRequestTimeout.md    |    2 +-
 .../timeout-directives/withRequestTimeout.md       |    2 +-
 .../withRequestTimeoutResponse.md                  |    2 +-
 .../timeout-directives/withoutRequestTimeout.md    |    2 +-
 .../extractOfferedWsProtocols.md                   |    2 +-
 .../extractUpgradeToWebSocket.md                   |    2 +-
 .../extractWebSocketUpgrade.md                     |    2 +-
 .../handleWebSocketMessages.md                     |    2 +-
 .../handleWebSocketMessagesForOptionalProtocol.md  |    2 +-
 .../handleWebSocketMessagesForProtocol.md          |    2 +-
 docs/src/main/paradox/routing-dsl/overview.md      |   10 +-
 docs/src/main/paradox/routing-dsl/path-matchers.md |    2 +-
 docs/src/main/paradox/routing-dsl/routes.md        |    6 +-
 docs/src/main/paradox/routing-dsl/testkit.md       |    8 +-
 .../paradox/server-side/graceful-termination.md    |    2 +-
 docs/src/main/paradox/server-side/low-level-api.md |    4 +-
 .../paradox/server-side/server-https-support.md    |   10 +-
 .../main/paradox/server-side/websocket-support.md  |    8 +-
 .../http/javadsl/ClientSingleRequestExample.java   |   14 +-
 .../http/javadsl/ComposeDirectivesExampleTest.java |   30 +-
 .../docs/http/javadsl/CustomHeaderExampleTest.java |   22 +-
 .../http/javadsl/CustomMediaTypesExampleTest.java  |   36 +-
 .../http/javadsl/CustomStatusCodesExampleTest.java |   36 +-
 .../docs/http/javadsl/ExceptionHandlerExample.java |   18 +-
 .../javadsl/ExceptionHandlerInSealExample.java     |   14 +-
 .../java/docs/http/javadsl/Http2ClientApp.java     |   32 +-
 .../src/test/java/docs/http/javadsl/Http2Test.java |   22 +-
 .../javadsl/HttpClientDecodingExampleTest.java     |   12 +-
 .../http/javadsl/HttpClientExampleDocTest.java     |   40 +-
 .../HttpRequestDetailedStringExampleTest.java      |    4 +-
 .../HttpResponseDetailedStringExampleTest.java     |    4 +-
 .../javadsl/HttpServerActorInteractionExample.java |   40 +-
 .../HttpServerDynamicRoutingExampleTest.java       |   12 +-
 .../http/javadsl/HttpServerLowLevelExample.java    |   20 +-
 .../http/javadsl/HttpServerMinimalExampleTest.java |   12 +-
 .../javadsl/HttpServerStreamRandomNumbersTest.java |   24 +-
 .../http/javadsl/HttpServerWithActorsSample.java   |   18 +-
 .../docs/http/javadsl/HttpsExamplesDocTest.java    |   10 +-
 .../java/docs/http/javadsl/JacksonExampleTest.java |   30 +-
 .../docs/http/javadsl/JacksonXmlExampleTest.java   |   10 +-
 .../java/docs/http/javadsl/JacksonXmlSupport.java  |    6 +-
 .../test/java/docs/http/javadsl/JobRepository.java |    6 +-
 .../src/test/java/docs/http/javadsl/JobRoutes.java |   16 +-
 .../test/java/docs/http/javadsl/ModelDocTest.java  |    6 +-
 .../RespondWithHeaderHandlerExampleTest.java       |   26 +-
 .../java/docs/http/javadsl/RouteSealExample.java   |   12 +-
 .../test/java/docs/http/javadsl/UnmarshalTest.java |   14 +-
 .../http/javadsl/WebSocketClientExampleTest.java   |   40 +-
 .../server/AkkaHttp1020MigrationExample.java       |   20 +-
 .../javadsl/server/BlockingInHttpExamples.java     |   18 +-
 .../http/javadsl/server/DirectiveExamplesTest.java |   82 +-
 .../javadsl/server/FileUploadExamplesTest.java     |   46 +-
 .../server/FormFieldRequestValsExampleTest.java    |   24 +-
 .../server/HeaderRequestValsExampleTest.java       |   18 +-
 .../server/HighLevelServerBindFailureExample.java  |    8 +-
 .../javadsl/server/HighLevelServerExample.java     |   14 +-
 .../server/HttpBasicAuthenticatorExample.java      |   16 +-
 .../javadsl/server/HttpServerExampleDocTest.java   |   44 +-
 .../javadsl/server/HttpsServerExampleTest.java     |    6 +-
 .../javadsl/server/JsonStreamingExamplesTest.java  |   56 +-
 .../javadsl/server/OAuth2AuthenticatorExample.java |   16 +-
 .../javadsl/server/PathDirectiveExampleTest.java   |   16 +-
 .../server/RejectionHandlerExamplesTest.java       |   48 +-
 .../javadsl/server/ServerShutdownExampleTest.java  |   12 +-
 .../http/javadsl/server/WebSocketCoreExample.java  |   54 +-
 .../javadsl/server/WebSocketRoutingExample.java    |   16 +-
 .../AttributeDirectivesExamplesTest.java           |   10 +-
 .../directives/BasicDirectivesExamplesTest.java    |  184 +-
 .../directives/CachingDirectivesExamplesTest.java  |   40 +-
 .../directives/CodingDirectivesExamplesTest.java   |   54 +-
 .../directives/CookieDirectivesExamplesTest.java   |   34 +-
 .../directives/CustomDirectivesExamplesTest.java   |   20 +-
 .../directives/CustomHttpMethodExamplesTest.java   |   34 +-
 .../DebuggingDirectivesExamplesTest.java           |   24 +-
 .../ExecutionDirectivesExamplesTest.java           |   46 +-
 .../FileAndResourceDirectivesExamplesTest.java     |   44 +-
 .../FileUploadDirectivesExamplesTest.java          |   48 +-
 .../FormFieldDirectivesExamplesTest.java           |   32 +-
 .../directives/FutureDirectivesExamplesTest.java   |   38 +-
 .../directives/HeaderDirectivesExamplesTest.java   |   68 +-
 .../directives/HostDirectivesExamplesTest.java     |   26 +-
 .../directives/JsonStreamingFullExample.java       |   18 +-
 .../MarshallingDirectivesExamplesTest.java         |   22 +-
 .../directives/MethodDirectivesExamplesTest.java   |   52 +-
 .../directives/MiscDirectivesExamplesTest.java     |   60 +-
 .../ParameterDirectivesExamplesTest.java           |   44 +-
 .../directives/PathDirectivesExamplesTest.java     |  104 +-
 .../directives/RangeDirectivesExamplesTest.java    |   40 +-
 .../RespondWithDirectivesExamplesTest.java         |   48 +-
 .../directives/RouteDirectivesExamplesTest.java    |   42 +-
 .../directives/SchemeDirectivesExamplesTest.java   |   22 +-
 .../directives/SecurityDirectivesExamplesTest.java |   78 +-
 .../server/directives/StyleGuideExamplesTest.java  |    8 +-
 .../directives/TimeoutDirectivesExamplesTest.java  |   28 +-
 .../WebSocketDirectivesExamplesTest.java           |   48 +-
 .../http/javadsl/server/testkit/MyAppFragment.java |    4 +-
 .../http/javadsl/server/testkit/MyAppService.java  |   12 +-
 .../javadsl/server/testkit/MyAppWithActor.java     |   14 +-
 .../server/testkit/PlayRoutesComparisonTest.java   |   16 +-
 .../server/testkit/TestKitFragmentTest.java        |   12 +-
 .../server/testkit/TestKitWithActorTest.java       |   14 +-
 .../javadsl/server/testkit/TestkitExampleTest.java |    8 +-
 .../javadsl/server/testkit/WithTimeoutTest.java    |    2 +-
 docs/src/test/resources/application.conf           |    2 +-
 .../scala/docs/ApiMayChangeDocCheckerSpec.scala    |    4 +-
 .../scala/docs/http/scaladsl/Http2ClientApp.scala  |   25 +-
 .../test/scala/docs/http/scaladsl/Http2Spec.scala  |   45 +-
 .../scaladsl/HttpClientCollectingHeaders.scala     |    9 +-
 .../scaladsl/HttpClientDecodingExampleSpec.scala   |   11 +-
 .../docs/http/scaladsl/HttpClientExampleSpec.scala |  113 +-
 .../scaladsl/HttpClientOutgoingConnection.scala    |    9 +-
 .../http/scaladsl/HttpClientSingleRequest.scala    |    9 +-
 .../HttpRequestDetailedStringExampleSpec.scala     |    7 +-
 .../HttpResponseDetailedStringExampleSpec.scala    |    7 +-
 .../http/scaladsl/HttpServerBindingFailure.scala   |    9 +-
 .../docs/http/scaladsl/HttpServerExampleSpec.scala |  118 +-
 .../docs/http/scaladsl/HttpServerHighLevel.scala   |    9 +-
 .../docs/http/scaladsl/HttpServerLowLevel.scala    |   11 +-
 .../http/scaladsl/HttpServerRoutingMinimal.scala   |   11 +-
 .../HttpServerStreamingRandomNumbers.scala         |   15 +-
 .../scaladsl/HttpServerWithActorInteraction.scala  |   17 +-
 .../http/scaladsl/HttpServerWithActorsSample.scala |   29 +-
 .../docs/http/scaladsl/HttpsExamplesSpec.scala     |    5 +-
 .../scala/docs/http/scaladsl/MarshalSpec.scala     |    8 +-
 .../test/scala/docs/http/scaladsl/ModelSpec.scala  |   13 +-
 .../docs/http/scaladsl/RouteSealExampleSpec.scala  |    5 +-
 .../scaladsl/ServerSentEventsExampleSpec.scala     |   18 +-
 .../http/scaladsl/SingleWebSocketRequest.scala     |   13 +-
 .../docs/http/scaladsl/SprayJsonExample.scala      |   17 +-
 .../docs/http/scaladsl/SprayJsonExampleSpec.scala  |    5 +-
 .../http/scaladsl/SprayJsonPrettyMarshalSpec.scala |    7 +-
 .../scala/docs/http/scaladsl/UnmarshalSpec.scala   |    7 +-
 .../http/scaladsl/WebSocketClientExampleSpec.scala |   66 +-
 .../docs/http/scaladsl/WebSocketClientFlow.scala   |   13 +-
 .../server/AkkaHttp1020MigrationSpec.scala         |   16 +-
 .../server/BlockingInHttpExamplesSpec.scala        |    5 +-
 .../server/CaseClassExtractionExamplesSpec.scala   |    2 +-
 .../scaladsl/server/DirectiveExamplesSpec.scala    |    2 +-
 .../server/ExceptionHandlerExamplesSpec.scala      |   48 +-
 .../scaladsl/server/FileUploadExamplesSpec.scala   |   17 +-
 .../http/scaladsl/server/FragmentExample.scala     |    5 +-
 .../server/FullSpecs2TestKitExampleSpec.scala      |    7 +-
 .../scaladsl/server/FullTestKitExampleSpec.scala   |    7 +-
 .../scaladsl/server/HttpsServerExampleSpec.scala   |    7 +-
 .../scaladsl/server/PlayRoutesComparisonSpec.scala |    7 +-
 .../server/RejectionHandlerExamplesSpec.scala      |   36 +-
 .../server/ServerShutdownExampleSpec.scala         |   11 +-
 .../http/scaladsl/server/TestKitFragmentSpec.scala |   11 +-
 .../scaladsl/server/TestKitWithActorSpec.scala     |   15 +-
 .../scaladsl/server/WebSocketExampleSpec.scala     |   39 +-
 .../AttributeDirectivesExamplesSpec.scala          |    9 +-
 .../directives/BasicDirectivesExamplesSpec.scala   |   23 +-
 .../directives/CachingDirectivesExamplesSpec.scala |   44 +-
 .../directives/CodingDirectivesExamplesSpec.scala  |   15 +-
 .../directives/CookieDirectivesExamplesSpec.scala  |    7 +-
 .../directives/CustomDirectivesExamplesSpec.scala  |    9 +-
 .../server/directives/CustomHttpMethodSpec.scala   |   15 +-
 .../DebuggingDirectivesExamplesSpec.scala          |   15 +-
 .../ExecutionDirectivesExamplesSpec.scala          |    5 +-
 .../FileAndResourceDirectivesExamplesSpec.scala    |   15 +-
 .../FileUploadDirectivesExamplesSpec.scala         |   17 +-
 .../FormFieldDirectivesExamplesSpec.scala          |    7 +-
 .../directives/FutureDirectivesExamplesSpec.scala  |   11 +-
 .../directives/HeaderDirectivesExamplesSpec.scala  |   11 +-
 .../directives/HostDirectivesExamplesSpec.scala    |    5 +-
 .../directives/JsonStreamingExamplesSpec.scala     |   23 +-
 .../directives/JsonStreamingFullExamples.scala     |   19 +-
 .../MarshallingDirectivesExamplesSpec.scala        |    9 +-
 .../directives/MethodDirectivesExamplesSpec.scala  |    7 +-
 .../directives/MiscDirectivesExamplesSpec.scala    |    5 +-
 .../ParameterDirectivesExamplesSpec.scala          |    9 +-
 .../directives/PathDirectivesExamplesSpec.scala    |    9 +-
 .../directives/RangeDirectivesExamplesSpec.scala   |    5 +-
 .../RespondWithDirectivesExamplesSpec.scala        |    5 +-
 .../directives/RouteDirectivesExamplesSpec.scala   |   16 +-
 .../directives/SchemeDirectivesExamplesSpec.scala  |    8 +-
 .../SecurityDirectivesExamplesSpec.scala           |   11 +-
 .../server/directives/StyleGuideExamplesSpec.scala |    4 +-
 .../directives/TimeoutDirectivesExamplesSpec.scala |   17 +-
 .../WebSocketDirectivesExamplesSpec.scala          |   15 +-
 .../src/main/scala/akka/BenchRunner.scala          |   40 -
 .../src/main/scala/akka/http/CommonBenchmark.scala |   35 -
 .../http/impl/engine/ConnectionPoolBenchmark.scala |  110 -
 .../http/impl/engine/HeaderParserBenchmark.scala   |   65 -
 .../http/impl/engine/HttpEntityBenchmark.scala     |   62 -
 .../impl/engine/ServerProcessingBenchmark.scala    |   66 -
 .../engine/StreamServerProcessingBenchmark.scala   |  114 -
 .../engine/http2/H2ClientServerBenchmark.scala     |   91 -
 .../engine/http2/H2RequestResponseBenchmark.scala  |  105 -
 .../engine/http2/H2ServerProcessingBenchmark.scala |   87 -
 .../akka/http/impl/engine/ws/MaskingBench.scala    |   19 -
 .../impl/model/parser/UriParserBenchmark.scala     |   29 -
 .../unmarshalling/sse/LineParserBenchmark.scala    |   80 -
 .../main/scala/org/apache/pekko/BenchRunner.scala  |   40 +
 .../org/apache/pekko/http/CommonBenchmark.scala    |   35 +
 .../http/impl/engine/ConnectionPoolBenchmark.scala |  111 +
 .../http/impl/engine/HeaderParserBenchmark.scala   |   66 +
 .../http/impl/engine/HttpEntityBenchmark.scala     |   63 +
 .../impl/engine/ServerProcessingBenchmark.scala    |   67 +
 .../engine/StreamServerProcessingBenchmark.scala   |  115 ++
 .../engine/http2/H2ClientServerBenchmark.scala     |   92 +
 .../engine/http2/H2RequestResponseBenchmark.scala  |  106 +
 .../engine/http2/H2ServerProcessingBenchmark.scala |   88 +
 .../pekko/http/impl/engine/ws/MaskingBench.scala   |   20 +
 .../impl/model/parser/UriParserBenchmark.scala     |   30 +
 .../unmarshalling/sse/LineParserBenchmark.scala    |   81 +
 .../main/java/akka/http/caching/javadsl/Cache.java |   68 -
 .../apache/pekko/http/caching/javadsl/Cache.java   |   68 +
 .../scala/akka/http/caching/CacheJavaMapping.scala |   29 -
 .../main/scala/akka/http/caching/LfuCache.scala    |  138 --
 .../impl/settings/CachingSettingsImpl.scala        |   26 -
 .../impl/settings/LfuCachingSettingsImpl.scala     |   38 -
 .../http/caching/javadsl/CachingSettings.scala     |   33 -
 .../http/caching/javadsl/LfuCacheSettings.scala    |   35 -
 .../scala/akka/http/caching/scaladsl/Cache.scala   |  112 -
 .../http/caching/scaladsl/CachingSettings.scala    |   28 -
 .../http/caching/scaladsl/LfuCacheSettings.scala   |   40 -
 .../server/directives/CachingDirectives.scala      |   70 -
 .../server/directives/CachingDirectives.scala      |   73 -
 .../pekko/http/caching/CacheJavaMapping.scala      |   30 +
 .../org/apache/pekko/http/caching/LfuCache.scala   |  139 ++
 .../impl/settings/CachingSettingsImpl.scala        |   27 +
 .../impl/settings/LfuCachingSettingsImpl.scala     |   39 +
 .../http/caching/javadsl/CachingSettings.scala     |   34 +
 .../http/caching/javadsl/LfuCacheSettings.scala    |   36 +
 .../apache/pekko/http/caching/scaladsl/Cache.scala |  113 +
 .../http/caching/scaladsl/CachingSettings.scala    |   29 +
 .../http/caching/scaladsl/LfuCacheSettings.scala   |   41 +
 .../server/directives/CachingDirectives.scala      |   71 +
 .../server/directives/CachingDirectives.scala      |   74 +
 .../akka/http/caching/ExpiringLfuCacheSpec.scala   |  181 --
 .../server/directives/CachingDirectivesSpec.scala  |  119 --
 .../pekko/http/caching/ExpiringLfuCacheSpec.scala  |  182 ++
 .../server/directives/CachingDirectivesSpec.scala  |  120 ++
 .../server/directives/CompatFormField.scala        |   24 -
 .../scala/example/HostConnectionPoolCompat.scala   |    2 +-
 .../server/directives/CompatFormField.scala        |   24 +
 .../scaladsl/HostConnectionPoolCompatSpec.scala    |   38 -
 .../server/directives/CompatFormFieldSpec.scala    |   41 -
 .../scaladsl/HostConnectionPoolCompatSpec.scala    |   39 +
 .../server/directives/CompatFormFieldSpec.scala    |   42 +
 http-core/RunWebSocketAutobahnTestSuite.md         |    6 +-
 .../src/main/java/akka/http/impl/util/Util.java    |   73 -
 .../main/java/akka/http/javadsl/TimeoutAccess.java |   58 -
 .../java/akka/http/javadsl/model/AttributeKey.java |   14 -
 .../akka/http/javadsl/model/AttributeKeys.java     |   18 -
 .../java/akka/http/javadsl/model/Authority.java    |   43 -
 .../akka/http/javadsl/model/BodyPartEntity.java    |    8 -
 .../java/akka/http/javadsl/model/ContentRange.java |   41 -
 .../akka/http/javadsl/model/ContentTypeRange.java  |   20 -
 .../java/akka/http/javadsl/model/ContentTypes.java |   55 -
 .../java/akka/http/javadsl/model/DateTime.java     |  135 --
 .../java/akka/http/javadsl/model/FormData.java     |   66 -
 .../main/java/akka/http/javadsl/model/Host.java    |   60 -
 .../java/akka/http/javadsl/model/HttpCharset.java  |   49 -
 .../akka/http/javadsl/model/HttpCharsetRange.java  |   29 -
 .../akka/http/javadsl/model/HttpCharsetRanges.java |   17 -
 .../java/akka/http/javadsl/model/HttpCharsets.java |   38 -
 .../java/akka/http/javadsl/model/HttpEntities.java |   86 -
 .../java/akka/http/javadsl/model/HttpEntity.java   |  324 ---
 .../java/akka/http/javadsl/model/HttpHeader.java   |   69 -
 .../java/akka/http/javadsl/model/HttpMessage.java  |  266 ---
 .../java/akka/http/javadsl/model/HttpMethod.java   |   47 -
 .../java/akka/http/javadsl/model/HttpMethods.java  |   44 -
 .../java/akka/http/javadsl/model/HttpProtocol.java |   18 -
 .../akka/http/javadsl/model/HttpProtocols.java     |   15 -
 .../java/akka/http/javadsl/model/HttpRequest.java  |  115 --
 .../java/akka/http/javadsl/model/HttpResponse.java |   51 -
 .../java/akka/http/javadsl/model/MediaRange.java   |   39 -
 .../java/akka/http/javadsl/model/MediaRanges.java  |   46 -
 .../java/akka/http/javadsl/model/MediaTypes.java   |  411 ----
 .../java/akka/http/javadsl/model/Multipart.java    |  160 --
 .../java/akka/http/javadsl/model/Multiparts.java   |  150 --
 .../main/java/akka/http/javadsl/model/Query.java   |  120 --
 .../akka/http/javadsl/model/RemoteAddress.java     |   33 -
 .../akka/http/javadsl/model/RemoteAddresses.java   |   11 -
 .../akka/http/javadsl/model/RequestEntity.java     |    8 -
 .../javadsl/model/RequestEntityAcceptance.java     |   14 -
 .../javadsl/model/RequestEntityAcceptances.java    |   13 -
 .../akka/http/javadsl/model/ResponseEntity.java    |    8 -
 .../java/akka/http/javadsl/model/StatusCode.java   |   50 -
 .../java/akka/http/javadsl/model/StatusCodes.java  |  147 --
 .../akka/http/javadsl/model/TransferEncoding.java  |   26 -
 .../akka/http/javadsl/model/TransferEncodings.java |   15 -
 .../akka/http/javadsl/model/UniversalEntity.java   |    8 -
 .../src/main/java/akka/http/javadsl/model/Uri.java |  241 ---
 .../akka/http/javadsl/model/headers/Accept.java    |   22 -
 .../http/javadsl/model/headers/AcceptCharset.java  |   20 -
 .../http/javadsl/model/headers/AcceptEncoding.java |   22 -
 .../http/javadsl/model/headers/AcceptLanguage.java |   17 -
 .../http/javadsl/model/headers/AcceptRanges.java   |   17 -
 .../headers/AccessControlAllowCredentials.java     |   17 -
 .../model/headers/AccessControlAllowHeaders.java   |   17 -
 .../model/headers/AccessControlAllowMethods.java   |   19 -
 .../model/headers/AccessControlAllowOrigin.java    |   17 -
 .../model/headers/AccessControlExposeHeaders.java  |   17 -
 .../javadsl/model/headers/AccessControlMaxAge.java |   17 -
 .../model/headers/AccessControlRequestHeaders.java |   17 -
 .../model/headers/AccessControlRequestMethod.java  |   19 -
 .../java/akka/http/javadsl/model/headers/Age.java  |   17 -
 .../akka/http/javadsl/model/headers/Allow.java     |   19 -
 .../http/javadsl/model/headers/Authorization.java  |   23 -
 .../model/headers/BasicHttpCredentials.java        |   10 -
 .../akka/http/javadsl/model/headers/ByteRange.java |   30 -
 .../http/javadsl/model/headers/CacheControl.java   |   17 -
 .../http/javadsl/model/headers/CacheDirective.java |   10 -
 .../javadsl/model/headers/CacheDirectives.java     |   46 -
 .../http/javadsl/model/headers/Connection.java     |   17 -
 .../javadsl/model/headers/ContentDisposition.java  |   18 -
 .../model/headers/ContentDispositionType.java      |   12 -
 .../model/headers/ContentDispositionTypes.java     |   17 -
 .../javadsl/model/headers/ContentEncoding.java     |   17 -
 .../http/javadsl/model/headers/ContentLength.java  |   13 -
 .../javadsl/model/headers/ContentLocation.java     |   22 -
 .../http/javadsl/model/headers/ContentRange.java   |   18 -
 .../http/javadsl/model/headers/ContentType.java    |   17 -
 .../akka/http/javadsl/model/headers/Cookie.java    |   20 -
 .../http/javadsl/model/headers/CustomHeader.java   |   17 -
 .../java/akka/http/javadsl/model/headers/Date.java |   19 -
 .../java/akka/http/javadsl/model/headers/ETag.java |   17 -
 .../akka/http/javadsl/model/headers/EntityTag.java |   20 -
 .../http/javadsl/model/headers/EntityTagRange.java |   16 -
 .../javadsl/model/headers/EntityTagRanges.java     |   11 -
 .../akka/http/javadsl/model/headers/Expires.java   |   19 -
 .../java/akka/http/javadsl/model/headers/Host.java |   31 -
 .../http/javadsl/model/headers/HttpChallenge.java  |   45 -
 .../http/javadsl/model/headers/HttpCookie.java     |  141 --
 .../http/javadsl/model/headers/HttpCookiePair.java |   28 -
 .../javadsl/model/headers/HttpCredentials.java     |   29 -
 .../http/javadsl/model/headers/HttpEncoding.java   |   13 -
 .../javadsl/model/headers/HttpEncodingRange.java   |   21 -
 .../javadsl/model/headers/HttpEncodingRanges.java  |   11 -
 .../http/javadsl/model/headers/HttpEncodings.java  |   17 -
 .../http/javadsl/model/headers/HttpOrigin.java     |   19 -
 .../javadsl/model/headers/HttpOriginRange.java     |   19 -
 .../javadsl/model/headers/HttpOriginRanges.java    |   11 -
 .../akka/http/javadsl/model/headers/IfMatch.java   |   17 -
 .../javadsl/model/headers/IfModifiedSince.java     |   19 -
 .../http/javadsl/model/headers/IfNoneMatch.java    |   17 -
 .../javadsl/model/headers/IfUnmodifiedSince.java   |   19 -
 .../akka/http/javadsl/model/headers/Language.java  |   18 -
 .../http/javadsl/model/headers/LanguageRange.java  |   13 -
 .../http/javadsl/model/headers/LanguageRanges.java |   11 -
 .../http/javadsl/model/headers/LastEventId.java    |   38 -
 .../http/javadsl/model/headers/LastModified.java   |   19 -
 .../java/akka/http/javadsl/model/headers/Link.java |   17 -
 .../akka/http/javadsl/model/headers/LinkParam.java |   10 -
 .../http/javadsl/model/headers/LinkParams.java     |   43 -
 .../akka/http/javadsl/model/headers/LinkValue.java |   19 -
 .../akka/http/javadsl/model/headers/Location.java  |   22 -
 .../javadsl/model/headers/ModeledCustomHeader.java |   46 -
 .../model/headers/ModeledCustomHeaderFactory.java  |   48 -
 .../javadsl/model/headers/OAuth2BearerToken.java   |    9 -
 .../akka/http/javadsl/model/headers/Origin.java    |   17 -
 .../http/javadsl/model/headers/ProductVersion.java |   18 -
 .../javadsl/model/headers/ProxyAuthenticate.java   |   17 -
 .../javadsl/model/headers/ProxyAuthorization.java  |   17 -
 .../akka/http/javadsl/model/headers/Range.java     |   18 -
 .../akka/http/javadsl/model/headers/RangeUnit.java |   13 -
 .../http/javadsl/model/headers/RangeUnits.java     |   11 -
 .../akka/http/javadsl/model/headers/RawHeader.java |   22 -
 .../http/javadsl/model/headers/RawRequestURI.java  |   18 -
 .../akka/http/javadsl/model/headers/Referer.java   |   19 -
 .../http/javadsl/model/headers/RemoteAddress.java  |   20 -
 .../http/javadsl/model/headers/RetryAfter.java     |   40 -
 .../akka/http/javadsl/model/headers/SameSite.java  |   25 -
 .../model/headers/SecWebSocketProtocol.java        |   20 -
 .../akka/http/javadsl/model/headers/Server.java    |   17 -
 .../akka/http/javadsl/model/headers/SetCookie.java |   17 -
 .../model/headers/StrictTransportSecurity.java     |   21 -
 .../java/akka/http/javadsl/model/headers/TE.java   |   17 -
 .../http/javadsl/model/headers/TimeoutAccess.java  |   16 -
 .../http/javadsl/model/headers/TlsSessionInfo.java |   25 -
 .../javadsl/model/headers/TransferEncoding.java    |   17 -
 .../akka/http/javadsl/model/headers/UserAgent.java |   21 -
 .../javadsl/model/headers/WWWAuthenticate.java     |   17 -
 .../http/javadsl/model/headers/XForwardedFor.java  |   17 -
 .../http/javadsl/model/headers/XForwardedHost.java |   17 -
 .../javadsl/model/headers/XForwardedProto.java     |   17 -
 .../akka/http/javadsl/model/headers/XRealIp.java   |   16 -
 .../http/javadsl/model/sse/ServerSentEvent.java    |  118 --
 .../http/shaded/com/twitter/hpack/Decoder.java     |  569 -----
 .../shaded/com/twitter/hpack/DynamicTable.java     |  194 --
 .../http/shaded/com/twitter/hpack/Encoder.java     |  461 -----
 .../http/shaded/com/twitter/hpack/HeaderField.java |   86 -
 .../shaded/com/twitter/hpack/HeaderListener.java   |   32 -
 .../http/shaded/com/twitter/hpack/HpackUtil.java   |  348 ----
 .../http/shaded/com/twitter/hpack/Huffman.java     |   43 -
 .../shaded/com/twitter/hpack/HuffmanDecoder.java   |  165 --
 .../shaded/com/twitter/hpack/HuffmanEncoder.java   |  101 -
 .../http/shaded/com/twitter/hpack/StaticTable.java |  165 --
 .../shaded/com/twitter/hpack/package-info.java     |   26 -
 .../java/org/apache/pekko/http/impl/util/Util.java |   73 +
 .../apache/pekko/http/javadsl/TimeoutAccess.java   |   58 +
 .../pekko/http/javadsl/model/AttributeKey.java     |   14 +
 .../pekko/http/javadsl/model/AttributeKeys.java    |   18 +
 .../apache/pekko/http/javadsl/model/Authority.java |   43 +
 .../pekko/http/javadsl/model/BodyPartEntity.java   |    8 +
 .../pekko/http/javadsl/model/ContentRange.java     |   41 +
 .../pekko/http/javadsl/model/ContentTypeRange.java |   20 +
 .../pekko/http/javadsl/model/ContentTypes.java     |   55 +
 .../apache/pekko/http/javadsl/model/DateTime.java  |  135 ++
 .../apache/pekko/http/javadsl/model/FormData.java  |   66 +
 .../org/apache/pekko/http/javadsl/model/Host.java  |   60 +
 .../pekko/http/javadsl/model/HttpCharset.java      |   49 +
 .../pekko/http/javadsl/model/HttpCharsetRange.java |   29 +
 .../http/javadsl/model/HttpCharsetRanges.java      |   17 +
 .../pekko/http/javadsl/model/HttpCharsets.java     |   38 +
 .../pekko/http/javadsl/model/HttpEntities.java     |   86 +
 .../pekko/http/javadsl/model/HttpEntity.java       |  324 +++
 .../pekko/http/javadsl/model/HttpHeader.java       |   69 +
 .../pekko/http/javadsl/model/HttpMessage.java      |  266 +++
 .../pekko/http/javadsl/model/HttpMethod.java       |   47 +
 .../pekko/http/javadsl/model/HttpMethods.java      |   44 +
 .../pekko/http/javadsl/model/HttpProtocol.java     |   18 +
 .../pekko/http/javadsl/model/HttpProtocols.java    |   15 +
 .../pekko/http/javadsl/model/HttpRequest.java      |  115 ++
 .../pekko/http/javadsl/model/HttpResponse.java     |   51 +
 .../pekko/http/javadsl/model/MediaRange.java       |   39 +
 .../pekko/http/javadsl/model/MediaRanges.java      |   46 +
 .../pekko/http/javadsl/model/MediaTypes.java       |  411 ++++
 .../apache/pekko/http/javadsl/model/Multipart.java |  160 ++
 .../pekko/http/javadsl/model/Multiparts.java       |  150 ++
 .../org/apache/pekko/http/javadsl/model/Query.java |  120 ++
 .../pekko/http/javadsl/model/RemoteAddress.java    |   33 +
 .../pekko/http/javadsl/model/RemoteAddresses.java  |   11 +
 .../pekko/http/javadsl/model/RequestEntity.java    |    8 +
 .../javadsl/model/RequestEntityAcceptance.java     |   14 +
 .../javadsl/model/RequestEntityAcceptances.java    |   13 +
 .../pekko/http/javadsl/model/ResponseEntity.java   |    8 +
 .../pekko/http/javadsl/model/StatusCode.java       |   50 +
 .../pekko/http/javadsl/model/StatusCodes.java      |  147 ++
 .../pekko/http/javadsl/model/TransferEncoding.java |   26 +
 .../http/javadsl/model/TransferEncodings.java      |   15 +
 .../pekko/http/javadsl/model/UniversalEntity.java  |    8 +
 .../org/apache/pekko/http/javadsl/model/Uri.java   |  241 +++
 .../pekko/http/javadsl/model/headers/Accept.java   |   22 +
 .../http/javadsl/model/headers/AcceptCharset.java  |   20 +
 .../http/javadsl/model/headers/AcceptEncoding.java |   22 +
 .../http/javadsl/model/headers/AcceptLanguage.java |   17 +
 .../http/javadsl/model/headers/AcceptRanges.java   |   17 +
 .../headers/AccessControlAllowCredentials.java     |   17 +
 .../model/headers/AccessControlAllowHeaders.java   |   17 +
 .../model/headers/AccessControlAllowMethods.java   |   19 +
 .../model/headers/AccessControlAllowOrigin.java    |   17 +
 .../model/headers/AccessControlExposeHeaders.java  |   17 +
 .../javadsl/model/headers/AccessControlMaxAge.java |   17 +
 .../model/headers/AccessControlRequestHeaders.java |   17 +
 .../model/headers/AccessControlRequestMethod.java  |   19 +
 .../pekko/http/javadsl/model/headers/Age.java      |   17 +
 .../pekko/http/javadsl/model/headers/Allow.java    |   19 +
 .../http/javadsl/model/headers/Authorization.java  |   23 +
 .../model/headers/BasicHttpCredentials.java        |   10 +
 .../http/javadsl/model/headers/ByteRange.java      |   30 +
 .../http/javadsl/model/headers/CacheControl.java   |   17 +
 .../http/javadsl/model/headers/CacheDirective.java |   10 +
 .../javadsl/model/headers/CacheDirectives.java     |   46 +
 .../http/javadsl/model/headers/Connection.java     |   17 +
 .../javadsl/model/headers/ContentDisposition.java  |   18 +
 .../model/headers/ContentDispositionType.java      |   12 +
 .../model/headers/ContentDispositionTypes.java     |   17 +
 .../javadsl/model/headers/ContentEncoding.java     |   17 +
 .../http/javadsl/model/headers/ContentLength.java  |   13 +
 .../javadsl/model/headers/ContentLocation.java     |   22 +
 .../http/javadsl/model/headers/ContentRange.java   |   18 +
 .../http/javadsl/model/headers/ContentType.java    |   17 +
 .../pekko/http/javadsl/model/headers/Cookie.java   |   20 +
 .../http/javadsl/model/headers/CustomHeader.java   |   17 +
 .../pekko/http/javadsl/model/headers/Date.java     |   19 +
 .../pekko/http/javadsl/model/headers/ETag.java     |   17 +
 .../http/javadsl/model/headers/EntityTag.java      |   20 +
 .../http/javadsl/model/headers/EntityTagRange.java |   16 +
 .../javadsl/model/headers/EntityTagRanges.java     |   11 +
 .../pekko/http/javadsl/model/headers/Expires.java  |   19 +
 .../pekko/http/javadsl/model/headers/Host.java     |   31 +
 .../http/javadsl/model/headers/HttpChallenge.java  |   45 +
 .../http/javadsl/model/headers/HttpCookie.java     |  141 ++
 .../http/javadsl/model/headers/HttpCookiePair.java |   28 +
 .../javadsl/model/headers/HttpCredentials.java     |   29 +
 .../http/javadsl/model/headers/HttpEncoding.java   |   13 +
 .../javadsl/model/headers/HttpEncodingRange.java   |   21 +
 .../javadsl/model/headers/HttpEncodingRanges.java  |   11 +
 .../http/javadsl/model/headers/HttpEncodings.java  |   17 +
 .../http/javadsl/model/headers/HttpOrigin.java     |   19 +
 .../javadsl/model/headers/HttpOriginRange.java     |   19 +
 .../javadsl/model/headers/HttpOriginRanges.java    |   11 +
 .../pekko/http/javadsl/model/headers/IfMatch.java  |   17 +
 .../javadsl/model/headers/IfModifiedSince.java     |   19 +
 .../http/javadsl/model/headers/IfNoneMatch.java    |   17 +
 .../javadsl/model/headers/IfUnmodifiedSince.java   |   19 +
 .../pekko/http/javadsl/model/headers/Language.java |   18 +
 .../http/javadsl/model/headers/LanguageRange.java  |   13 +
 .../http/javadsl/model/headers/LanguageRanges.java |   11 +
 .../http/javadsl/model/headers/LastEventId.java    |   38 +
 .../http/javadsl/model/headers/LastModified.java   |   19 +
 .../pekko/http/javadsl/model/headers/Link.java     |   17 +
 .../http/javadsl/model/headers/LinkParam.java      |   10 +
 .../http/javadsl/model/headers/LinkParams.java     |   43 +
 .../http/javadsl/model/headers/LinkValue.java      |   19 +
 .../pekko/http/javadsl/model/headers/Location.java |   22 +
 .../javadsl/model/headers/ModeledCustomHeader.java |   46 +
 .../model/headers/ModeledCustomHeaderFactory.java  |   48 +
 .../javadsl/model/headers/OAuth2BearerToken.java   |    9 +
 .../pekko/http/javadsl/model/headers/Origin.java   |   17 +
 .../http/javadsl/model/headers/ProductVersion.java |   18 +
 .../javadsl/model/headers/ProxyAuthenticate.java   |   17 +
 .../javadsl/model/headers/ProxyAuthorization.java  |   17 +
 .../pekko/http/javadsl/model/headers/Range.java    |   18 +
 .../http/javadsl/model/headers/RangeUnit.java      |   13 +
 .../http/javadsl/model/headers/RangeUnits.java     |   11 +
 .../http/javadsl/model/headers/RawHeader.java      |   22 +
 .../http/javadsl/model/headers/RawRequestURI.java  |   18 +
 .../pekko/http/javadsl/model/headers/Referer.java  |   19 +
 .../http/javadsl/model/headers/RemoteAddress.java  |   20 +
 .../http/javadsl/model/headers/RetryAfter.java     |   40 +
 .../pekko/http/javadsl/model/headers/SameSite.java |   25 +
 .../model/headers/SecWebSocketProtocol.java        |   20 +
 .../pekko/http/javadsl/model/headers/Server.java   |   17 +
 .../http/javadsl/model/headers/SetCookie.java      |   17 +
 .../model/headers/StrictTransportSecurity.java     |   21 +
 .../pekko/http/javadsl/model/headers/TE.java       |   17 +
 .../http/javadsl/model/headers/TimeoutAccess.java  |   16 +
 .../http/javadsl/model/headers/TlsSessionInfo.java |   25 +
 .../javadsl/model/headers/TransferEncoding.java    |   17 +
 .../http/javadsl/model/headers/UserAgent.java      |   21 +
 .../javadsl/model/headers/WWWAuthenticate.java     |   17 +
 .../http/javadsl/model/headers/XForwardedFor.java  |   17 +
 .../http/javadsl/model/headers/XForwardedHost.java |   17 +
 .../javadsl/model/headers/XForwardedProto.java     |   17 +
 .../pekko/http/javadsl/model/headers/XRealIp.java  |   16 +
 .../http/javadsl/model/sse/ServerSentEvent.java    |  118 ++
 .../http/shaded/com/twitter/hpack/Decoder.java     |  569 +++++
 .../shaded/com/twitter/hpack/DynamicTable.java     |  194 ++
 .../http/shaded/com/twitter/hpack/Encoder.java     |  461 +++++
 .../http/shaded/com/twitter/hpack/HeaderField.java |   86 +
 .../shaded/com/twitter/hpack/HeaderListener.java   |   32 +
 .../http/shaded/com/twitter/hpack/HpackUtil.java   |  348 ++++
 .../http/shaded/com/twitter/hpack/Huffman.java     |   43 +
 .../shaded/com/twitter/hpack/HuffmanDecoder.java   |  165 ++
 .../shaded/com/twitter/hpack/HuffmanEncoder.java   |  101 +
 .../http/shaded/com/twitter/hpack/StaticTable.java |  165 ++
 .../shaded/com/twitter/hpack/package-info.java     |   26 +
 http-core/src/main/resources/reference.conf        |   10 +-
 .../scala-2.13+/akka/http/ccompat/MapHelpers.scala |   12 -
 .../akka/http/ccompat/imm/package.scala            |   12 -
 .../scala-2.13+/akka/http/ccompat/package.scala    |   31 -
 .../akka/http/scaladsl/util/FastFuture.scala       |  129 --
 .../org/apache/pekko/http/ccompat/MapHelpers.scala |   12 +
 .../apache/pekko/http/ccompat/imm/package.scala    |   12 +
 .../org/apache/pekko/http/ccompat/package.scala    |   32 +
 .../pekko/http/scaladsl/util/FastFuture.scala      |  129 ++
 .../scala-2.13-/akka/http/ccompat/CompatImpl.scala |   22 -
 .../scala-2.13-/akka/http/ccompat/MapHelpers.scala |   15 -
 .../akka/http/ccompat/imm/package.scala            |   21 -
 .../scala-2.13-/akka/http/ccompat/package.scala    |   52 -
 .../akka/http/scaladsl/util/FastFuture.scala       |  130 --
 .../org/apache/pekko/http/ccompat/CompatImpl.scala |   22 +
 .../org/apache/pekko/http/ccompat/MapHelpers.scala |   15 +
 .../apache/pekko/http/ccompat/imm/package.scala    |   21 +
 .../org/apache/pekko/http/ccompat/package.scala    |   53 +
 .../pekko/http/scaladsl/util/FastFuture.scala      |  130 ++
 .../main/scala/akka/http/ParsingErrorHandler.scala |   27 -
 .../engine/HttpConnectionIdleTimeoutBidi.scala     |   53 -
 .../impl/engine/client/HttpsProxyGraphStage.scala  |  200 --
 .../client/OutgoingConnectionBlueprint.scala       |  370 ----
 .../akka/http/impl/engine/client/PoolFlow.scala    |   23 -
 .../akka/http/impl/engine/client/PoolId.scala      |   44 -
 .../http/impl/engine/client/PoolInterface.scala    |  255 ---
 .../http/impl/engine/client/PoolMasterActor.scala  |  263 ---
 .../engine/client/pool/NewHostConnectionPool.scala |  639 ------
 .../http/impl/engine/client/pool/SlotState.scala   |  363 ----
 .../impl/engine/http2/BufferedOutletSupport.scala  |  118 --
 .../akka/http/impl/engine/http2/ByteFlag.scala     |   30 -
 .../akka/http/impl/engine/http2/FrameEvent.scala   |  112 -
 .../akka/http/impl/engine/http2/FrameLogger.scala  |  118 --
 .../scala/akka/http/impl/engine/http2/Http2.scala  |  297 ---
 .../http/impl/engine/http2/Http2AlpnSupport.scala  |   90 -
 .../http/impl/engine/http2/Http2Blueprint.scala    |  283 ---
 .../http/impl/engine/http2/Http2Compliance.scala   |   73 -
 .../akka/http/impl/engine/http2/Http2Demux.scala   |  540 -----
 .../http/impl/engine/http2/Http2Multiplexer.scala  |  336 ---
 .../http/impl/engine/http2/Http2Protocol.scala     |  390 ----
 .../impl/engine/http2/Http2SettingsHeader.scala    |   35 -
 .../impl/engine/http2/Http2StreamHandling.scala    |  855 --------
 .../impl/engine/http2/HttpMessageRendering.scala   |  202 --
 .../impl/engine/http2/IncomingFlowController.scala |   51 -
 .../http2/OutgoingConnectionBuilderImpl.scala      |  158 --
 .../akka/http/impl/engine/http2/PriorityTree.scala |  157 --
 .../http/impl/engine/http2/ProtocolSwitch.scala    |  166 --
 .../http/impl/engine/http2/RequestParsing.scala    |  225 --
 .../http/impl/engine/http2/StreamPrioritizer.scala |   77 -
 .../akka/http/impl/engine/http2/TelemetrySpi.scala |   89 -
 .../engine/http2/client/PersistentConnection.scala |  254 ---
 .../impl/engine/http2/client/ResponseParsing.scala |  111 -
 .../impl/engine/http2/framing/FrameRenderer.scala  |  209 --
 .../engine/http2/framing/Http2FrameParsing.scala   |  201 --
 .../engine/http2/hpack/ByteStringInputStream.scala |   26 -
 .../engine/http2/hpack/HandleOrPassOnStage.scala   |   29 -
 .../engine/http2/hpack/HeaderCompression.scala     |   92 -
 .../engine/http2/hpack/HeaderDecompression.scala   |  132 --
 .../engine/http2/hpack/Http2HeaderParsing.scala    |   78 -
 .../impl/engine/http2/util/AsciiTreeLayout.scala   |   56 -
 .../http/impl/engine/parsing/BodyPartParser.scala  |  359 ----
 .../akka/http/impl/engine/parsing/BoyerMoore.scala |   68 -
 .../impl/engine/parsing/HttpHeaderParser.scala     |  676 ------
 .../impl/engine/parsing/HttpMessageParser.scala    |  430 ----
 .../impl/engine/parsing/HttpRequestParser.scala    |  250 ---
 .../impl/engine/parsing/HttpResponseParser.scala   |  245 ---
 .../http/impl/engine/parsing/ParserOutput.scala    |   92 -
 .../parsing/SpecializedHeaderValueParsers.scala    |   39 -
 .../akka/http/impl/engine/parsing/package.scala    |   78 -
 .../impl/engine/rendering/BodyPartRenderer.scala   |  156 --
 .../engine/rendering/DateHeaderRendering.scala     |   99 -
 .../rendering/HttpRequestRendererFactory.scala     |  199 --
 .../rendering/HttpResponseRendererFactory.scala    |  365 ----
 .../http/impl/engine/rendering/RenderSupport.scala |  161 --
 .../http/impl/engine/server/HttpAttributes.scala   |   45 -
 .../impl/engine/server/HttpServerBluePrint.scala   |  817 --------
 .../http/impl/engine/server/ServerTerminator.scala |  369 ----
 .../UpgradeToOtherProtocolResponseHeader.scala     |   27 -
 .../akka/http/impl/engine/ws/FrameEvent.scala      |   80 -
 .../http/impl/engine/ws/FrameEventParser.scala     |  170 --
 .../http/impl/engine/ws/FrameEventRenderer.scala   |  124 --
 .../akka/http/impl/engine/ws/FrameHandler.scala    |  224 --
 .../akka/http/impl/engine/ws/FrameLogger.scala     |   62 -
 .../akka/http/impl/engine/ws/FrameOutHandler.scala |  197 --
 .../scala/akka/http/impl/engine/ws/Handshake.scala |  310 ---
 .../scala/akka/http/impl/engine/ws/Masking.scala   |  115 --
 .../impl/engine/ws/MessageToFrameRenderer.scala    |   51 -
 .../scala/akka/http/impl/engine/ws/Protocol.scala  |   89 -
 .../scala/akka/http/impl/engine/ws/Randoms.scala   |   20 -
 .../engine/ws/UpgradeToWebSocketLowLevel.scala     |   36 -
 .../akka/http/impl/engine/ws/Utf8Decoder.scala     |  120 --
 .../akka/http/impl/engine/ws/Utf8Encoder.scala     |   94 -
 .../scala/akka/http/impl/engine/ws/WebSocket.scala |  297 ---
 .../impl/engine/ws/WebSocketClientBlueprint.scala  |  176 --
 .../scala/akka/http/impl/model/JavaQuery.scala     |   41 -
 .../main/scala/akka/http/impl/model/JavaUri.scala  |   89 -
 .../akka/http/impl/model/UriJavaAccessor.scala     |   38 -
 .../impl/model/parser/AcceptCharsetHeader.scala    |   30 -
 .../impl/model/parser/AcceptEncodingHeader.scala   |   30 -
 .../akka/http/impl/model/parser/AcceptHeader.scala |   43 -
 .../impl/model/parser/AcceptLanguageHeader.scala   |   27 -
 .../http/impl/model/parser/Base64Parsing.scala     |   91 -
 .../impl/model/parser/CacheControlHeader.scala     |   41 -
 .../http/impl/model/parser/CharacterClasses.scala  |   94 -
 .../http/impl/model/parser/CommonActions.scala     |   79 -
 .../akka/http/impl/model/parser/CommonRules.scala  |  485 -----
 .../model/parser/ContentDispositionHeader.scala    |   75 -
 .../http/impl/model/parser/ContentTypeHeader.scala |   44 -
 .../akka/http/impl/model/parser/HeaderParser.scala |  234 ---
 .../http/impl/model/parser/IpAddressParsing.scala  |   63 -
 .../akka/http/impl/model/parser/LinkHeader.scala   |   91 -
 .../http/impl/model/parser/SimpleHeaders.scala     |  276 ---
 .../http/impl/model/parser/StringBuilding.scala    |   68 -
 .../akka/http/impl/model/parser/UriParser.scala    |  376 ----
 .../http/impl/model/parser/WebSocketHeaders.scala  |   61 -
 .../settings/ClientConnectionSettingsImpl.scala    |   71 -
 .../impl/settings/ConnectionPoolSettingsImpl.scala |  137 --
 .../http/impl/settings/ConnectionPoolSetup.scala   |   17 -
 .../impl/settings/HostConnectionPoolSetup.scala    |    7 -
 .../impl/settings/HttpsProxySettingsImpl.scala     |   28 -
 .../http/impl/settings/ParserSettingsImpl.scala    |  122 --
 .../impl/settings/PreviewServerSettingsImpl.scala  |   21 -
 .../http/impl/settings/ServerSettingsImpl.scala    |  134 --
 .../http/impl/settings/WebSocketSettingsImpl.scala |   66 -
 .../http/impl/util/ByteStringParserInput.scala     |   33 -
 .../akka/http/impl/util/EnhancedByteArray.scala    |   34 -
 .../util/EnhancedByteStringTraversableOnce.scala   |   17 -
 .../scala/akka/http/impl/util/EnhancedConfig.scala |   52 -
 .../scala/akka/http/impl/util/EnhancedRegex.scala  |   17 -
 .../scala/akka/http/impl/util/EnhancedString.scala |  125 --
 .../scala/akka/http/impl/util/JavaAccessors.scala  |   39 -
 .../scala/akka/http/impl/util/JavaMapping.scala    |  330 ---
 .../scala/akka/http/impl/util/JavaVersion.scala    |   26 -
 .../akka/http/impl/util/LogByteStringTools.scala   |  102 -
 .../scala/akka/http/impl/util/ObjectRegistry.scala |   28 -
 .../akka/http/impl/util/One2OneBidiFlow.scala      |  114 -
 .../main/scala/akka/http/impl/util/Rendering.scala |  492 -----
 .../http/impl/util/SettingsCompanionImpl.scala     |   63 -
 .../akka/http/impl/util/SingletonException.scala   |   19 -
 .../akka/http/impl/util/SocketOptionSettings.scala |   30 -
 .../http/impl/util/StageLoggingWithOverride.scala  |   74 -
 .../scala/akka/http/impl/util/StreamUtils.scala    |  397 ----
 .../scala/akka/http/impl/util/StringTools.scala    |   27 -
 .../main/scala/akka/http/impl/util/Timestamp.scala |   45 -
 .../main/scala/akka/http/impl/util/package.scala   |  177 --
 .../scala/akka/http/javadsl/ClientTransport.scala  |  120 --
 .../main/scala/akka/http/javadsl/ConnectHttp.scala |  158 --
 .../akka/http/javadsl/ConnectionContext.scala      |  135 --
 .../akka/http/javadsl/HostConnectionPool.scala     |   23 -
 .../src/main/scala/akka/http/javadsl/Http.scala    |  890 --------
 .../akka/http/javadsl/IncomingConnection.scala     |   68 -
 .../akka/http/javadsl/OutgoingConnection.scala     |   22 -
 .../http/javadsl/OutgoingConnectionBuilder.scala   |  106 -
 .../scala/akka/http/javadsl/ServerBinding.scala    |  132 --
 .../scala/akka/http/javadsl/ServerBuilder.scala    |  190 --
 .../akka/http/javadsl/model/ContentType.scala      |   55 -
 .../scala/akka/http/javadsl/model/MediaType.scala  |  104 -
 .../javadsl/model/RequestResponseAssociation.scala |   25 -
 .../akka/http/javadsl/model/SslSessionInfo.scala   |   20 -
 .../scala/akka/http/javadsl/model/Trailer.scala    |   31 -
 .../scala/akka/http/javadsl/model/ws/Message.scala |  184 --
 .../model/ws/PeerClosedConnectionException.scala   |   14 -
 .../http/javadsl/model/ws/UpgradeToWebSocket.scala |   63 -
 .../akka/http/javadsl/model/ws/WebSocket.scala     |   23 -
 .../http/javadsl/model/ws/WebSocketRequest.scala   |   62 -
 .../http/javadsl/model/ws/WebSocketUpgrade.scala   |   56 -
 .../model/ws/WebSocketUpgradeResponse.scala        |   60 -
 .../settings/ClientConnectionSettings.scala        |   85 -
 .../javadsl/settings/ConnectionPoolSettings.scala  |   80 -
 .../javadsl/settings/Http2ClientSettings.scala     |   54 -
 .../javadsl/settings/Http2ServerSettings.scala     |   46 -
 .../http/javadsl/settings/HttpsProxySettings.scala |   25 -
 .../http/javadsl/settings/ParserSettings.scala     |  138 --
 .../javadsl/settings/PreviewServerSettings.scala   |   41 -
 .../http/javadsl/settings/ServerSettings.scala     |  122 --
 .../http/javadsl/settings/SettingsCompanion.scala  |   35 -
 .../http/javadsl/settings/WebSocketSettings.scala  |   53 -
 .../scala/akka/http/scaladsl/ClientTransport.scala |  151 --
 .../akka/http/scaladsl/ConnectionContext.scala     |  171 --
 .../src/main/scala/akka/http/scaladsl/Http.scala   | 1233 -----------
 .../http/scaladsl/OutgoingConnectionBuilder.scala  |  113 -
 .../scala/akka/http/scaladsl/ServerBuilder.scala   |  155 --
 .../scala/akka/http/scaladsl/TimeoutAccess.scala   |   60 -
 .../akka/http/scaladsl/model/AttributeKey.scala    |   16 -
 .../akka/http/scaladsl/model/AttributeKeys.scala   |   14 -
 .../akka/http/scaladsl/model/ContentRange.scala    |   82 -
 .../akka/http/scaladsl/model/ContentType.scala     |  140 --
 .../scala/akka/http/scaladsl/model/DateTime.scala  |  277 ---
 .../scala/akka/http/scaladsl/model/ErrorInfo.scala |  140 --
 .../scala/akka/http/scaladsl/model/FormData.scala  |   39 -
 .../akka/http/scaladsl/model/HttpCharset.scala     |  132 --
 .../akka/http/scaladsl/model/HttpEntity.scala      |  748 -------
 .../akka/http/scaladsl/model/HttpHeader.scala      |  129 --
 .../akka/http/scaladsl/model/HttpMessage.scala     |  652 ------
 .../akka/http/scaladsl/model/HttpMethod.scala      |   76 -
 .../akka/http/scaladsl/model/HttpProtocol.scala    |   20 -
 .../akka/http/scaladsl/model/MediaRange.scala      |  158 --
 .../scala/akka/http/scaladsl/model/MediaType.scala |  564 -----
 .../scala/akka/http/scaladsl/model/Multipart.scala |  687 -------
 .../akka/http/scaladsl/model/RemoteAddress.scala   |   64 -
 .../model/RequestResponseAssociation.scala         |   32 -
 .../akka/http/scaladsl/model/SslSessionInfo.scala  |   28 -
 .../akka/http/scaladsl/model/StatusCode.scala      |  189 --
 .../scala/akka/http/scaladsl/model/Trailer.scala   |   38 -
 .../http/scaladsl/model/TransferEncoding.scala     |   36 -
 .../main/scala/akka/http/scaladsl/model/Uri.scala  | 1059 ----------
 .../akka/http/scaladsl/model/WithQValue.scala      |   13 -
 .../http/scaladsl/model/headers/ByteRange.scala    |   82 -
 .../scaladsl/model/headers/CacheDirective.scala    |  176 --
 .../model/headers/ContentDispositionType.scala     |   23 -
 .../http/scaladsl/model/headers/EntityTag.scala    |   41 -
 .../scaladsl/model/headers/HttpChallenge.scala     |   55 -
 .../http/scaladsl/model/headers/HttpCookie.scala   |  317 ---
 .../scaladsl/model/headers/HttpCredentials.scala   |   75 -
 .../http/scaladsl/model/headers/HttpEncoding.scala |   66 -
 .../http/scaladsl/model/headers/HttpOrigin.scala   |   50 -
 .../scaladsl/model/headers/LanguageRange.scala     |   82 -
 .../http/scaladsl/model/headers/LinkValue.scala    |  147 --
 .../scaladsl/model/headers/ProductVersion.scala    |   42 -
 .../http/scaladsl/model/headers/RangeUnit.scala    |   24 -
 .../model/headers/RetryAfterParameter.scala        |   18 -
 .../headers/StrictTransportSecurityDirective.scala |   14 -
 .../scaladsl/model/headers/UpgradeProtocol.scala   |   15 -
 .../model/headers/WebSocketExtension.scala         |   24 -
 .../akka/http/scaladsl/model/headers/headers.scala | 1205 -----------
 .../http/scaladsl/model/http2/Http2Exception.scala |   27 -
 .../scala/akka/http/scaladsl/model/package.scala   |   11 -
 .../http/scaladsl/model/sse/ServerSentEvent.scala  |  131 --
 .../akka/http/scaladsl/model/ws/Message.scala      |  140 --
 .../model/ws/PeerClosedConnectionException.scala   |   15 -
 .../scaladsl/model/ws/UpgradeToWebSocket.scala     |   99 -
 .../http/scaladsl/model/ws/WebSocketRequest.scala  |   35 -
 .../http/scaladsl/model/ws/WebSocketUpgrade.scala  |  101 -
 .../model/ws/WebSocketUpgradeResponse.scala        |   17 -
 .../settings/ClientConnectionSettings.scala        |  101 -
 .../scaladsl/settings/ConnectionPoolSettings.scala |  116 --
 .../scaladsl/settings/Http2ServerSettings.scala    |  257 ---
 .../scaladsl/settings/HttpsProxySettings.scala     |   24 -
 .../http/scaladsl/settings/ParserSettings.scala    |  239 ---
 .../scaladsl/settings/PreviewServerSettings.scala  |   36 -
 .../http/scaladsl/settings/ServerSettings.scala    |  182 --
 .../http/scaladsl/settings/SettingsCompanion.scala |   35 -
 .../http/scaladsl/settings/WebSocketSettings.scala |   45 -
 .../apache/pekko/http/ParsingErrorHandler.scala    |   28 +
 .../engine/HttpConnectionIdleTimeoutBidi.scala     |   54 +
 .../impl/engine/client/HttpsProxyGraphStage.scala  |  201 ++
 .../client/OutgoingConnectionBlueprint.scala       |  371 ++++
 .../pekko/http/impl/engine/client/PoolFlow.scala   |   24 +
 .../pekko/http/impl/engine/client/PoolId.scala     |   45 +
 .../http/impl/engine/client/PoolInterface.scala    |  256 +++
 .../http/impl/engine/client/PoolMasterActor.scala  |  264 +++
 .../engine/client/pool/NewHostConnectionPool.scala |  640 ++++++
 .../http/impl/engine/client/pool/SlotState.scala   |  364 ++++
 .../impl/engine/http2/BufferedOutletSupport.scala  |  119 ++
 .../pekko/http/impl/engine/http2/ByteFlag.scala    |   30 +
 .../pekko/http/impl/engine/http2/FrameEvent.scala  |  113 +
 .../pekko/http/impl/engine/http2/FrameLogger.scala |  119 ++
 .../pekko/http/impl/engine/http2/Http2.scala       |  298 +++
 .../http/impl/engine/http2/Http2AlpnSupport.scala  |   91 +
 .../http/impl/engine/http2/Http2Blueprint.scala    |  285 +++
 .../http/impl/engine/http2/Http2Compliance.scala   |   74 +
 .../pekko/http/impl/engine/http2/Http2Demux.scala  |  542 +++++
 .../http/impl/engine/http2/Http2Multiplexer.scala  |  337 +++
 .../http/impl/engine/http2/Http2Protocol.scala     |  391 ++++
 .../impl/engine/http2/Http2SettingsHeader.scala    |   36 +
 .../impl/engine/http2/Http2StreamHandling.scala    |  857 ++++++++
 .../impl/engine/http2/HttpMessageRendering.scala   |  203 ++
 .../impl/engine/http2/IncomingFlowController.scala |   52 +
 .../http2/OutgoingConnectionBuilderImpl.scala      |  159 ++
 .../http/impl/engine/http2/PriorityTree.scala      |  158 ++
 .../http/impl/engine/http2/ProtocolSwitch.scala    |  167 ++
 .../http/impl/engine/http2/RequestParsing.scala    |  226 ++
 .../http/impl/engine/http2/StreamPrioritizer.scala |   77 +
 .../http/impl/engine/http2/TelemetrySpi.scala      |   90 +
 .../engine/http2/client/PersistentConnection.scala |  255 +++
 .../impl/engine/http2/client/ResponseParsing.scala |  112 +
 .../impl/engine/http2/framing/FrameRenderer.scala  |  210 ++
 .../engine/http2/framing/Http2FrameParsing.scala   |  202 ++
 .../engine/http2/hpack/ByteStringInputStream.scala |   27 +
 .../engine/http2/hpack/HandleOrPassOnStage.scala   |   30 +
 .../engine/http2/hpack/HeaderCompression.scala     |   93 +
 .../engine/http2/hpack/HeaderDecompression.scala   |  133 ++
 .../engine/http2/hpack/Http2HeaderParsing.scala    |   79 +
 .../impl/engine/http2/util/AsciiTreeLayout.scala   |   56 +
 .../http/impl/engine/parsing/BodyPartParser.scala  |  360 ++++
 .../http/impl/engine/parsing/BoyerMoore.scala      |   68 +
 .../impl/engine/parsing/HttpHeaderParser.scala     |  677 ++++++
 .../impl/engine/parsing/HttpMessageParser.scala    |  431 ++++
 .../impl/engine/parsing/HttpRequestParser.scala    |  252 +++
 .../impl/engine/parsing/HttpResponseParser.scala   |  246 +++
 .../http/impl/engine/parsing/ParserOutput.scala    |   93 +
 .../parsing/SpecializedHeaderValueParsers.scala    |   40 +
 .../pekko/http/impl/engine/parsing/package.scala   |   79 +
 .../impl/engine/rendering/BodyPartRenderer.scala   |  157 ++
 .../engine/rendering/DateHeaderRendering.scala     |  100 +
 .../rendering/HttpRequestRendererFactory.scala     |  200 ++
 .../rendering/HttpResponseRendererFactory.scala    |  367 ++++
 .../http/impl/engine/rendering/RenderSupport.scala |  162 ++
 .../http/impl/engine/server/HttpAttributes.scala   |   46 +
 .../impl/engine/server/HttpServerBluePrint.scala   |  818 ++++++++
 .../http/impl/engine/server/ServerTerminator.scala |  370 ++++
 .../UpgradeToOtherProtocolResponseHeader.scala     |   28 +
 .../pekko/http/impl/engine/ws/FrameEvent.scala     |   81 +
 .../http/impl/engine/ws/FrameEventParser.scala     |  171 ++
 .../http/impl/engine/ws/FrameEventRenderer.scala   |  125 ++
 .../pekko/http/impl/engine/ws/FrameHandler.scala   |  225 ++
 .../pekko/http/impl/engine/ws/FrameLogger.scala    |   63 +
 .../http/impl/engine/ws/FrameOutHandler.scala      |  198 ++
 .../pekko/http/impl/engine/ws/Handshake.scala      |  311 +++
 .../apache/pekko/http/impl/engine/ws/Masking.scala |  116 ++
 .../impl/engine/ws/MessageToFrameRenderer.scala    |   52 +
 .../pekko/http/impl/engine/ws/Protocol.scala       |   89 +
 .../apache/pekko/http/impl/engine/ws/Randoms.scala |   20 +
 .../engine/ws/UpgradeToWebSocketLowLevel.scala     |   37 +
 .../pekko/http/impl/engine/ws/Utf8Decoder.scala    |  121 ++
 .../pekko/http/impl/engine/ws/Utf8Encoder.scala    |   95 +
 .../pekko/http/impl/engine/ws/WebSocket.scala      |  298 +++
 .../impl/engine/ws/WebSocketClientBlueprint.scala  |  177 ++
 .../apache/pekko/http/impl/model/JavaQuery.scala   |   42 +
 .../org/apache/pekko/http/impl/model/JavaUri.scala |   90 +
 .../pekko/http/impl/model/UriJavaAccessor.scala    |   39 +
 .../impl/model/parser/AcceptCharsetHeader.scala    |   31 +
 .../impl/model/parser/AcceptEncodingHeader.scala   |   31 +
 .../http/impl/model/parser/AcceptHeader.scala      |   44 +
 .../impl/model/parser/AcceptLanguageHeader.scala   |   28 +
 .../http/impl/model/parser/Base64Parsing.scala     |   92 +
 .../impl/model/parser/CacheControlHeader.scala     |   42 +
 .../http/impl/model/parser/CharacterClasses.scala  |   95 +
 .../http/impl/model/parser/CommonActions.scala     |   80 +
 .../pekko/http/impl/model/parser/CommonRules.scala |  486 +++++
 .../model/parser/ContentDispositionHeader.scala    |   76 +
 .../http/impl/model/parser/ContentTypeHeader.scala |   45 +
 .../http/impl/model/parser/HeaderParser.scala      |  235 +++
 .../http/impl/model/parser/IpAddressParsing.scala  |   63 +
 .../pekko/http/impl/model/parser/LinkHeader.scala  |   92 +
 .../http/impl/model/parser/SimpleHeaders.scala     |  277 +++
 .../http/impl/model/parser/StringBuilding.scala    |   68 +
 .../pekko/http/impl/model/parser/UriParser.scala   |  377 ++++
 .../http/impl/model/parser/WebSocketHeaders.scala  |   62 +
 .../settings/ClientConnectionSettingsImpl.scala    |   72 +
 .../impl/settings/ConnectionPoolSettingsImpl.scala |  138 ++
 .../http/impl/settings/ConnectionPoolSetup.scala   |   18 +
 .../impl/settings/HostConnectionPoolSetup.scala    |    7 +
 .../impl/settings/HttpsProxySettingsImpl.scala     |   29 +
 .../http/impl/settings/ParserSettingsImpl.scala    |  123 ++
 .../impl/settings/PreviewServerSettingsImpl.scala  |   22 +
 .../http/impl/settings/ServerSettingsImpl.scala    |  135 ++
 .../http/impl/settings/WebSocketSettingsImpl.scala |   67 +
 .../http/impl/util/ByteStringParserInput.scala     |   34 +
 .../pekko/http/impl/util/EnhancedByteArray.scala   |   34 +
 .../util/EnhancedByteStringTraversableOnce.scala   |   18 +
 .../pekko/http/impl/util/EnhancedConfig.scala      |   53 +
 .../pekko/http/impl/util/EnhancedRegex.scala       |   17 +
 .../pekko/http/impl/util/EnhancedString.scala      |  125 ++
 .../pekko/http/impl/util/JavaAccessors.scala       |   40 +
 .../apache/pekko/http/impl/util/JavaMapping.scala  |  331 +++
 .../apache/pekko/http/impl/util/JavaVersion.scala  |   26 +
 .../pekko/http/impl/util/LogByteStringTools.scala  |  103 +
 .../pekko/http/impl/util/ObjectRegistry.scala      |   28 +
 .../pekko/http/impl/util/One2OneBidiFlow.scala     |  115 ++
 .../apache/pekko/http/impl/util/Rendering.scala    |  493 +++++
 .../http/impl/util/SettingsCompanionImpl.scala     |   64 +
 .../pekko/http/impl/util/SingletonException.scala  |   19 +
 .../http/impl/util/SocketOptionSettings.scala      |   31 +
 .../http/impl/util/StageLoggingWithOverride.scala  |   75 +
 .../apache/pekko/http/impl/util/StreamUtils.scala  |  398 ++++
 .../apache/pekko/http/impl/util/StringTools.scala  |   28 +
 .../apache/pekko/http/impl/util/Timestamp.scala    |   45 +
 .../org/apache/pekko/http/impl/util/package.scala  |  178 ++
 .../pekko/http/javadsl/ClientTransport.scala       |  121 ++
 .../apache/pekko/http/javadsl/ConnectHttp.scala    |  159 ++
 .../pekko/http/javadsl/ConnectionContext.scala     |  136 ++
 .../pekko/http/javadsl/HostConnectionPool.scala    |   24 +
 .../scala/org/apache/pekko/http/javadsl/Http.scala |  892 ++++++++
 .../pekko/http/javadsl/IncomingConnection.scala    |   69 +
 .../pekko/http/javadsl/OutgoingConnection.scala    |   22 +
 .../http/javadsl/OutgoingConnectionBuilder.scala   |  107 +
 .../apache/pekko/http/javadsl/ServerBinding.scala  |  133 ++
 .../apache/pekko/http/javadsl/ServerBuilder.scala  |  191 ++
 .../pekko/http/javadsl/model/ContentType.scala     |   55 +
 .../pekko/http/javadsl/model/MediaType.scala       |  104 +
 .../javadsl/model/RequestResponseAssociation.scala |   26 +
 .../pekko/http/javadsl/model/SslSessionInfo.scala  |   20 +
 .../apache/pekko/http/javadsl/model/Trailer.scala  |   31 +
 .../pekko/http/javadsl/model/ws/Message.scala      |  185 ++
 .../model/ws/PeerClosedConnectionException.scala   |   14 +
 .../http/javadsl/model/ws/UpgradeToWebSocket.scala |   64 +
 .../pekko/http/javadsl/model/ws/WebSocket.scala    |   24 +
 .../http/javadsl/model/ws/WebSocketRequest.scala   |   63 +
 .../http/javadsl/model/ws/WebSocketUpgrade.scala   |   57 +
 .../model/ws/WebSocketUpgradeResponse.scala        |   61 +
 .../settings/ClientConnectionSettings.scala        |   86 +
 .../javadsl/settings/ConnectionPoolSettings.scala  |   81 +
 .../javadsl/settings/Http2ClientSettings.scala     |   54 +
 .../javadsl/settings/Http2ServerSettings.scala     |   47 +
 .../http/javadsl/settings/HttpsProxySettings.scala |   26 +
 .../http/javadsl/settings/ParserSettings.scala     |  139 ++
 .../javadsl/settings/PreviewServerSettings.scala   |   42 +
 .../http/javadsl/settings/ServerSettings.scala     |  123 ++
 .../http/javadsl/settings/SettingsCompanion.scala  |   35 +
 .../http/javadsl/settings/WebSocketSettings.scala  |   54 +
 .../pekko/http/scaladsl/ClientTransport.scala      |  152 ++
 .../pekko/http/scaladsl/ConnectionContext.scala    |  172 ++
 .../org/apache/pekko/http/scaladsl/Http.scala      | 1234 +++++++++++
 .../http/scaladsl/OutgoingConnectionBuilder.scala  |  114 +
 .../apache/pekko/http/scaladsl/ServerBuilder.scala |  156 ++
 .../apache/pekko/http/scaladsl/TimeoutAccess.scala |   61 +
 .../pekko/http/scaladsl/model/AttributeKey.scala   |   16 +
 .../pekko/http/scaladsl/model/AttributeKeys.scala  |   14 +
 .../pekko/http/scaladsl/model/ContentRange.scala   |   83 +
 .../pekko/http/scaladsl/model/ContentType.scala    |  141 ++
 .../pekko/http/scaladsl/model/DateTime.scala       |  278 +++
 .../pekko/http/scaladsl/model/ErrorInfo.scala      |  140 ++
 .../pekko/http/scaladsl/model/FormData.scala       |   40 +
 .../pekko/http/scaladsl/model/HttpCharset.scala    |  133 ++
 .../pekko/http/scaladsl/model/HttpEntity.scala     |  749 +++++++
 .../pekko/http/scaladsl/model/HttpHeader.scala     |  130 ++
 .../pekko/http/scaladsl/model/HttpMessage.scala    |  653 ++++++
 .../pekko/http/scaladsl/model/HttpMethod.scala     |   77 +
 .../pekko/http/scaladsl/model/HttpProtocol.scala   |   21 +
 .../pekko/http/scaladsl/model/MediaRange.scala     |  159 ++
 .../pekko/http/scaladsl/model/MediaType.scala      |  565 +++++
 .../pekko/http/scaladsl/model/Multipart.scala      |  688 +++++++
 .../pekko/http/scaladsl/model/RemoteAddress.scala  |   65 +
 .../model/RequestResponseAssociation.scala         |   33 +
 .../pekko/http/scaladsl/model/SslSessionInfo.scala |   29 +
 .../pekko/http/scaladsl/model/StatusCode.scala     |  190 ++
 .../apache/pekko/http/scaladsl/model/Trailer.scala |   39 +
 .../http/scaladsl/model/TransferEncoding.scala     |   37 +
 .../org/apache/pekko/http/scaladsl/model/Uri.scala | 1060 ++++++++++
 .../pekko/http/scaladsl/model/WithQValue.scala     |   13 +
 .../http/scaladsl/model/headers/ByteRange.scala    |   83 +
 .../scaladsl/model/headers/CacheDirective.scala    |  177 ++
 .../model/headers/ContentDispositionType.scala     |   24 +
 .../http/scaladsl/model/headers/EntityTag.scala    |   42 +
 .../scaladsl/model/headers/HttpChallenge.scala     |   56 +
 .../http/scaladsl/model/headers/HttpCookie.scala   |  318 +++
 .../scaladsl/model/headers/HttpCredentials.scala   |   76 +
 .../http/scaladsl/model/headers/HttpEncoding.scala |   67 +
 .../http/scaladsl/model/headers/HttpOrigin.scala   |   51 +
 .../scaladsl/model/headers/LanguageRange.scala     |   83 +
 .../http/scaladsl/model/headers/LinkValue.scala    |  148 ++
 .../scaladsl/model/headers/ProductVersion.scala    |   43 +
 .../http/scaladsl/model/headers/RangeUnit.scala    |   25 +
 .../model/headers/RetryAfterParameter.scala        |   18 +
 .../headers/StrictTransportSecurityDirective.scala |   14 +
 .../scaladsl/model/headers/UpgradeProtocol.scala   |   15 +
 .../model/headers/WebSocketExtension.scala         |   24 +
 .../http/scaladsl/model/headers/headers.scala      | 1206 +++++++++++
 .../http/scaladsl/model/http2/Http2Exception.scala |   28 +
 .../apache/pekko/http/scaladsl/model/package.scala |   11 +
 .../http/scaladsl/model/sse/ServerSentEvent.scala  |  132 ++
 .../pekko/http/scaladsl/model/ws/Message.scala     |  141 ++
 .../model/ws/PeerClosedConnectionException.scala   |   15 +
 .../scaladsl/model/ws/UpgradeToWebSocket.scala     |  100 +
 .../http/scaladsl/model/ws/WebSocketRequest.scala  |   35 +
 .../http/scaladsl/model/ws/WebSocketUpgrade.scala  |  102 +
 .../model/ws/WebSocketUpgradeResponse.scala        |   17 +
 .../settings/ClientConnectionSettings.scala        |  103 +
 .../scaladsl/settings/ConnectionPoolSettings.scala |  117 ++
 .../scaladsl/settings/Http2ServerSettings.scala    |  258 +++
 .../scaladsl/settings/HttpsProxySettings.scala     |   25 +
 .../http/scaladsl/settings/ParserSettings.scala    |  240 +++
 .../scaladsl/settings/PreviewServerSettings.scala  |   38 +
 .../http/scaladsl/settings/ServerSettings.scala    |  184 ++
 .../http/scaladsl/settings/SettingsCompanion.scala |   36 +
 .../http/scaladsl/settings/WebSocketSettings.scala |   46 +
 .../src/test/java/akka/http/JavaTestServer.java    |   79 -
 .../javadsl/GracefulTerminationCompileTest.java    |   34 -
 .../akka/http/javadsl/WSEchoTestClientApp.java     |   85 -
 .../http/javadsl/model/EntityDiscardingTest.java   |   71 -
 .../akka/http/javadsl/model/HttpMessageTest.java   |   68 -
 .../akka/http/javadsl/model/JavaApiTestCases.java  |  106 -
 .../test/java/akka/http/javadsl/model/UriTest.java |  299 ---
 .../javadsl/model/sse/ServerSentEventTest.java     |   77 -
 .../settings/ClientConnectionSettingsTest.java     |   18 -
 .../settings/ConnectionPoolSettingsTest.java       |   18 -
 .../http/javadsl/settings/ParserSettingsTest.java  |   18 -
 .../http/javadsl/settings/ServerSettingsTest.java  |   18 -
 .../java/org/apache/pekko/http/JavaTestServer.java |   79 +
 .../javadsl/GracefulTerminationCompileTest.java    |   34 +
 .../pekko/http/javadsl/WSEchoTestClientApp.java    |   85 +
 .../http/javadsl/model/EntityDiscardingTest.java   |   71 +
 .../pekko/http/javadsl/model/HttpMessageTest.java  |   68 +
 .../pekko/http/javadsl/model/JavaApiTestCases.java |  106 +
 .../apache/pekko/http/javadsl/model/UriTest.java   |  299 +++
 .../javadsl/model/sse/ServerSentEventTest.java     |   77 +
 .../settings/ClientConnectionSettingsTest.java     |   18 +
 .../settings/ConnectionPoolSettingsTest.java       |   18 +
 .../http/javadsl/settings/ParserSettingsTest.java  |   18 +
 .../http/javadsl/settings/ServerSettingsTest.java  |   18 +
 http-core/src/test/resources/reference.conf        |    4 +-
 .../src/test/scala/akka/http/ConfigSpec.scala      |   32 -
 .../test/scala/akka/http/HashCodeCollider.scala    |   31 -
 .../engine/client/ClientCancellationSpec.scala     |   86 -
 .../client/HighLevelOutgoingConnectionSpec.scala   |   73 -
 .../engine/client/HostConnectionPoolSpec.scala     |  911 --------
 .../impl/engine/client/HttpConfigurationSpec.scala |  216 --
 .../engine/client/HttpsProxyGraphStageSpec.scala   |  210 --
 .../client/LowLevelOutgoingConnectionSpec.scala    | 1068 ----------
 .../impl/engine/client/NewConnectionPoolSpec.scala |  855 --------
 .../impl/engine/client/PrepareResponseSpec.scala   |  246 ---
 .../engine/client/ResponseParsingMergeSpec.scala   |  102 -
 .../client/TlsEndpointVerificationSpec.scala       |  158 --
 .../impl/engine/client/pool/SlotStateSpec.scala    |  192 --
 .../http/impl/engine/parsing/BoyerMooreSpec.scala  |   81 -
 .../parsing/ContentLengthHeaderParserSpec.scala    |   42 -
 .../impl/engine/parsing/HttpHeaderParserSpec.scala |  429 ----
 .../engine/parsing/HttpHeaderParserTestBed.scala   |   39 -
 .../impl/engine/parsing/RequestParserSpec.scala    |  828 --------
 .../impl/engine/parsing/ResponseParserSpec.scala   |  483 -----
 .../engine/rendering/RequestRendererSpec.scala     |  351 ----
 .../engine/rendering/ResponseRendererSpec.scala    |  719 -------
 .../engine/server/HttpServerBug21008Spec.scala     |   91 -
 .../http/impl/engine/server/HttpServerSpec.scala   | 1635 ---------------
 .../engine/server/HttpServerTestSetupBase.scala    |   95 -
 .../HttpServerWithExplicitSchedulerSpec.scala      |  182 --
 .../impl/engine/server/PrepareRequestsSpec.scala   |  253 ---
 .../akka/http/impl/engine/ws/BitBuilder.scala      |  103 -
 .../http/impl/engine/ws/ByteStringSinkProbe.scala  |  118 --
 .../http/impl/engine/ws/EchoTestClientApp.scala    |   70 -
 .../akka/http/impl/engine/ws/FramingSpec.scala     |  319 ---
 .../akka/http/impl/engine/ws/MessageSpec.scala     | 1129 ----------
 .../akka/http/impl/engine/ws/Utf8CodingSpecs.scala |   59 -
 .../http/impl/engine/ws/WSClientAutobahnTest.scala |  204 --
 .../http/impl/engine/ws/WSServerAutobahnTest.scala |   53 -
 .../akka/http/impl/engine/ws/WSTestSetupBase.scala |  112 -
 .../akka/http/impl/engine/ws/WSTestUtils.scala     |   82 -
 .../http/impl/engine/ws/WebSocketClientSpec.scala  |  425 ----
 .../impl/engine/ws/WebSocketIntegrationSpec.scala  |  254 ---
 .../http/impl/engine/ws/WebSocketServerSpec.scala  |  185 --
 .../http/impl/model/parser/HttpHeaderSpec.scala    |  936 ---------
 .../http/impl/util/AkkaSpecWithMaterializer.scala  |   47 -
 .../scala/akka/http/impl/util/BenchUtils.scala     |   38 -
 .../http/impl/util/ByteStringParserInputSpec.scala |   39 -
 .../akka/http/impl/util/CollectionStage.scala      |  128 --
 .../akka/http/impl/util/ExampleHttpContexts.scala  |   78 -
 .../akka/http/impl/util/One2OneBidiFlowSpec.scala  |  171 --
 .../scala/akka/http/impl/util/RenderingSpec.scala  |   94 -
 .../akka/http/impl/util/StreamUtilsSpec.scala      |   87 -
 .../akka/http/impl/util/WithLogCapturing.scala     |  119 --
 .../scala/akka/http/javadsl/ConnectHttpSpec.scala  |  105 -
 .../akka/http/javadsl/ConnectionContextSpec.scala  |   34 -
 .../akka/http/javadsl/HttpExtensionApiSpec.scala   |  400 ----
 .../akka/http/javadsl/JavaInitializationSpec.scala |   61 -
 .../akka/http/javadsl/model/JavaApiSpec.scala      |   70 -
 .../http/javadsl/model/JavaApiTestCaseSpecs.scala  |   63 -
 .../akka/http/javadsl/model/MultipartsSpec.scala   |   78 -
 .../javadsl/model/headers/HttpCookieSpec.scala     |   52 -
 .../akka/http/scaladsl/ClientServerSpec.scala      | 1107 ----------
 .../test/scala/akka/http/scaladsl/ClientSpec.scala |   54 -
 .../ClientTransportWithCustomResolverSpec.scala    |   87 -
 .../http/scaladsl/GracefulTerminationSpec.scala    |  385 ----
 .../test/scala/akka/http/scaladsl/TestClient.scala |  114 -
 .../test/scala/akka/http/scaladsl/TestServer.scala |   91 -
 .../http/scaladsl/TightRequestTimeoutSpec.scala    |   55 -
 .../akka/http/scaladsl/model/DateTimeSpec.scala    |   99 -
 .../http/scaladsl/model/EntityDiscardingSpec.scala |   76 -
 .../akka/http/scaladsl/model/HttpEntitySpec.scala  |  311 ---
 .../akka/http/scaladsl/model/HttpMessageSpec.scala |  137 --
 .../akka/http/scaladsl/model/HttpMethodsSpec.scala |   27 -
 .../akka/http/scaladsl/model/MultipartSpec.scala   |   71 -
 .../http/scaladsl/model/SerializabilitySpec.scala  |   92 -
 .../akka/http/scaladsl/model/TurkishISpec.scala    |   35 -
 .../scala/akka/http/scaladsl/model/UriSpec.scala   |  888 --------
 .../http/scaladsl/model/headers/HeaderSpec.scala   |  238 ---
 .../scaladsl/model/sse/ServerSentEventSpec.scala   |   80 -
 .../settings/ClientConnectionSettingsSpec.scala    |   27 -
 .../settings/ConnectionPoolSettingsSpec.scala      |  163 --
 .../settings/Http2CommonSettingsSpec.scala         |   33 -
 .../settings/PreviewServerSettingsSpec.scala       |   24 -
 .../scaladsl/settings/ServerSettingsSpec.scala     |   27 -
 .../scaladsl/settings/SettingsEqualitySpec.scala   |   50 -
 .../akka/http/scaladsl/util/FastFutureSpec.scala   |  189 --
 .../src/test/scala/akka/stream/testkit/Utils.scala |   32 -
 .../src/test/scala/akka/testkit/AkkaSpec.scala     |  120 --
 .../src/test/scala/akka/testkit/Coroner.scala      |  273 ---
 .../http/HttpModelIntegrationSpec.scala            |  220 --
 .../http/HttpModelIntegrationSpec.scala            |  221 ++
 .../scala/org/apache/pekko/http/ConfigSpec.scala   |   33 +
 .../org/apache/pekko/http/HashCodeCollider.scala   |   31 +
 .../engine/client/ClientCancellationSpec.scala     |   87 +
 .../client/HighLevelOutgoingConnectionSpec.scala   |   74 +
 .../engine/client/HostConnectionPoolSpec.scala     |  912 ++++++++
 .../impl/engine/client/HttpConfigurationSpec.scala |  217 ++
 .../engine/client/HttpsProxyGraphStageSpec.scala   |  211 ++
 .../client/LowLevelOutgoingConnectionSpec.scala    | 1069 ++++++++++
 .../impl/engine/client/NewConnectionPoolSpec.scala |  856 ++++++++
 .../impl/engine/client/PrepareResponseSpec.scala   |  247 +++
 .../engine/client/ResponseParsingMergeSpec.scala   |  103 +
 .../client/TlsEndpointVerificationSpec.scala       |  159 ++
 .../impl/engine/client/pool/SlotStateSpec.scala    |  193 ++
 .../http/impl/engine/parsing/BoyerMooreSpec.scala  |   81 +
 .../parsing/ContentLengthHeaderParserSpec.scala    |   43 +
 .../impl/engine/parsing/HttpHeaderParserSpec.scala |  430 ++++
 .../engine/parsing/HttpHeaderParserTestBed.scala   |   40 +
 .../impl/engine/parsing/RequestParserSpec.scala    |  829 ++++++++
 .../impl/engine/parsing/ResponseParserSpec.scala   |  484 +++++
 .../engine/rendering/RequestRendererSpec.scala     |  352 ++++
 .../engine/rendering/ResponseRendererSpec.scala    |  720 +++++++
 .../engine/server/HttpServerBug21008Spec.scala     |   92 +
 .../http/impl/engine/server/HttpServerSpec.scala   | 1636 +++++++++++++++
 .../engine/server/HttpServerTestSetupBase.scala    |   96 +
 .../HttpServerWithExplicitSchedulerSpec.scala      |  183 ++
 .../impl/engine/server/PrepareRequestsSpec.scala   |  254 +++
 .../pekko/http/impl/engine/ws/BitBuilder.scala     |  104 +
 .../http/impl/engine/ws/ByteStringSinkProbe.scala  |  119 ++
 .../http/impl/engine/ws/EchoTestClientApp.scala    |   71 +
 .../pekko/http/impl/engine/ws/FramingSpec.scala    |  320 +++
 .../pekko/http/impl/engine/ws/MessageSpec.scala    | 1130 ++++++++++
 .../http/impl/engine/ws/Utf8CodingSpecs.scala      |   60 +
 .../http/impl/engine/ws/WSClientAutobahnTest.scala |  205 ++
 .../http/impl/engine/ws/WSServerAutobahnTest.scala |   54 +
 .../http/impl/engine/ws/WSTestSetupBase.scala      |  113 +
 .../pekko/http/impl/engine/ws/WSTestUtils.scala    |   83 +
 .../http/impl/engine/ws/WebSocketClientSpec.scala  |  426 ++++
 .../impl/engine/ws/WebSocketIntegrationSpec.scala  |  255 +++
 .../http/impl/engine/ws/WebSocketServerSpec.scala  |  186 ++
 .../http/impl/model/parser/HttpHeaderSpec.scala    |  937 +++++++++
 .../http/impl/util/AkkaSpecWithMaterializer.scala  |   48 +
 .../apache/pekko/http/impl/util/BenchUtils.scala   |   38 +
 .../http/impl/util/ByteStringParserInputSpec.scala |   39 +
 .../pekko/http/impl/util/CollectionStage.scala     |  129 ++
 .../pekko/http/impl/util/ExampleHttpContexts.scala |   79 +
 .../pekko/http/impl/util/One2OneBidiFlowSpec.scala |  172 ++
 .../pekko/http/impl/util/RenderingSpec.scala       |   95 +
 .../pekko/http/impl/util/StreamUtilsSpec.scala     |   88 +
 .../pekko/http/impl/util/WithLogCapturing.scala    |  120 ++
 .../pekko/http/javadsl/ConnectHttpSpec.scala       |  105 +
 .../pekko/http/javadsl/ConnectionContextSpec.scala |   34 +
 .../pekko/http/javadsl/HttpExtensionApiSpec.scala  |  401 ++++
 .../http/javadsl/JavaInitializationSpec.scala      |   62 +
 .../pekko/http/javadsl/model/JavaApiSpec.scala     |   70 +
 .../http/javadsl/model/JavaApiTestCaseSpecs.scala  |   64 +
 .../pekko/http/javadsl/model/MultipartsSpec.scala  |   82 +
 .../javadsl/model/headers/HttpCookieSpec.scala     |   52 +
 .../pekko/http/scaladsl/ClientServerSpec.scala     | 1108 ++++++++++
 .../apache/pekko/http/scaladsl/ClientSpec.scala    |   55 +
 .../ClientTransportWithCustomResolverSpec.scala    |   88 +
 .../http/scaladsl/GracefulTerminationSpec.scala    |  386 ++++
 .../apache/pekko/http/scaladsl/TestClient.scala    |  115 ++
 .../apache/pekko/http/scaladsl/TestServer.scala    |   92 +
 .../http/scaladsl/TightRequestTimeoutSpec.scala    |   56 +
 .../pekko/http/scaladsl/model/DateTimeSpec.scala   |   99 +
 .../http/scaladsl/model/EntityDiscardingSpec.scala |   77 +
 .../pekko/http/scaladsl/model/HttpEntitySpec.scala |  312 +++
 .../http/scaladsl/model/HttpMessageSpec.scala      |  138 ++
 .../http/scaladsl/model/HttpMethodsSpec.scala      |   27 +
 .../pekko/http/scaladsl/model/MultipartSpec.scala  |   72 +
 .../http/scaladsl/model/SerializabilitySpec.scala  |   92 +
 .../pekko/http/scaladsl/model/TurkishISpec.scala   |   35 +
 .../apache/pekko/http/scaladsl/model/UriSpec.scala |  889 ++++++++
 .../http/scaladsl/model/headers/HeaderSpec.scala   |  239 +++
 .../scaladsl/model/sse/ServerSentEventSpec.scala   |   80 +
 .../settings/ClientConnectionSettingsSpec.scala    |   27 +
 .../settings/ConnectionPoolSettingsSpec.scala      |  164 ++
 .../settings/Http2CommonSettingsSpec.scala         |   33 +
 .../settings/PreviewServerSettingsSpec.scala       |   24 +
 .../scaladsl/settings/ServerSettingsSpec.scala     |   27 +
 .../scaladsl/settings/SettingsEqualitySpec.scala   |   50 +
 .../pekko/http/scaladsl/util/FastFutureSpec.scala  |  189 ++
 .../org/apache/pekko/stream/testkit/Utils.scala    |   34 +
 .../scala/org/apache/pekko/testkit/AkkaSpec.scala  |  121 ++
 .../scala/org/apache/pekko/testkit/Coroner.scala   |  273 +++
 .../autobahn-jenkins/step-5-server-tests-all.sh    |    2 +-
 .../http/javadsl/marshallers/jackson/Jackson.java  |   80 -
 .../http/javadsl/marshallers/jackson/Jackson.java  |   80 +
 .../javadsl/marshallers/jackson/JacksonTest.java   |   77 -
 .../javadsl/marshallers/jackson/JacksonTest.java   |   77 +
 .../sprayjson/SprayJsonByteStringParserInput.scala |   28 -
 .../marshallers/sprayjson/SprayJsonSupport.scala   |  147 --
 .../sprayjson/SprayJsonByteStringParserInput.scala |   29 +
 .../marshallers/sprayjson/SprayJsonSupport.scala   |  148 ++
 .../sprayjson/SprayJsonSupportSpec.scala           |   62 -
 .../sprayjson/SprayJsonSupportSpec.scala           |   63 +
 .../scaladsl/marshallers/xml/ScalaXmlSupport.scala |   70 -
 .../scaladsl/marshallers/xml/ScalaXmlSupport.scala |   71 +
 .../resources/META-INF/services/scalafix.v1.Rule   |    2 +-
 .../akka/http/fix/MigrateToServerBuilder.scala     |  110 -
 .../pekko/http/fix/MigrateToServerBuilder.scala    |  110 +
 .../akka/http/fix/MigrateToServerBuilderTest.scala |   75 -
 .../http/fix/MigrateToServerBuilderTest.scala      |   76 +
 .../akka/http/fix/MigrateToServerBuilderTest.scala |   59 -
 .../http/fix/MigrateToServerBuilderTest.scala      |   60 +
 .../http/javadsl/testkit/DefaultHostInfo.scala     |   15 -
 .../akka/http/javadsl/testkit/JUnitRouteTest.scala |   79 -
 .../akka/http/javadsl/testkit/RouteTest.scala      |   94 -
 .../akka/http/javadsl/testkit/TestRoute.scala      |   55 -
 .../http/javadsl/testkit/TestRouteResult.scala     |  248 ---
 .../scala/akka/http/javadsl/testkit/WSProbe.scala  |  109 -
 .../javadsl/testkit/WSTestRequestBuilding.scala    |   34 -
 .../scaladsl/testkit/MarshallingTestUtils.scala    |   46 -
 .../akka/http/scaladsl/testkit/RouteTest.scala     |  231 ---
 .../testkit/RouteTestResultComponent.scala         |  113 -
 .../http/scaladsl/testkit/RouteTestTimeout.scala   |   15 -
 .../http/scaladsl/testkit/ScalatestUtils.scala     |   35 -
 .../akka/http/scaladsl/testkit/Specs2Utils.scala   |   36 -
 .../scaladsl/testkit/TestFrameworkInterface.scala  |   55 -
 .../scala/akka/http/scaladsl/testkit/WSProbe.scala |  150 --
 .../scaladsl/testkit/WSTestRequestBuilding.scala   |   39 -
 .../http/javadsl/testkit/DefaultHostInfo.scala     |   15 +
 .../http/javadsl/testkit/JUnitRouteTest.scala      |   80 +
 .../pekko/http/javadsl/testkit/RouteTest.scala     |   95 +
 .../pekko/http/javadsl/testkit/TestRoute.scala     |   56 +
 .../http/javadsl/testkit/TestRouteResult.scala     |  249 +++
 .../pekko/http/javadsl/testkit/WSProbe.scala       |  110 +
 .../javadsl/testkit/WSTestRequestBuilding.scala    |   35 +
 .../scaladsl/testkit/MarshallingTestUtils.scala    |   47 +
 .../pekko/http/scaladsl/testkit/RouteTest.scala    |  232 +++
 .../testkit/RouteTestResultComponent.scala         |  114 +
 .../http/scaladsl/testkit/RouteTestTimeout.scala   |   16 +
 .../http/scaladsl/testkit/ScalatestUtils.scala     |   36 +
 .../pekko/http/scaladsl/testkit/Specs2Utils.scala  |   37 +
 .../scaladsl/testkit/TestFrameworkInterface.scala  |   55 +
 .../pekko/http/scaladsl/testkit/WSProbe.scala      |  151 ++
 .../scaladsl/testkit/WSTestRequestBuilding.scala   |   40 +
 .../http/javadsl/testkit/JUnitRouteTestTest.java   |  110 -
 .../http/javadsl/testkit/JUnitRouteTestTest.java   |  110 +
 .../scaladsl/testkit/ScalatestRouteTestSpec.scala  |  165 --
 .../scaladsl/testkit/Specs2RouteTestSpec.scala     |  110 -
 .../scaladsl/testkit/ScalatestRouteTestSpec.scala  |  166 ++
 .../scaladsl/testkit/Specs2RouteTestSpec.scala     |  111 +
 .../http/javadsl/server/examples/petstore/Pet.java |   28 -
 .../examples/petstore/PetStoreController.java      |   25 -
 .../server/examples/petstore/PetStoreExample.java  |  106 -
 .../server/examples/simple/SimpleServerApp.java    |  155 --
 .../examples/simple/SimpleServerHttpHttpsApp.java  |   46 -
 .../http/javadsl/server/examples/petstore/Pet.java |   28 +
 .../examples/petstore/PetStoreController.java      |   25 +
 .../server/examples/petstore/PetStoreExample.java  |  106 +
 .../server/examples/simple/SimpleServerApp.java    |  155 ++
 .../examples/simple/SimpleServerHttpHttpsApp.java  |   46 +
 .../http/AkkaHttpServerLatencyMultiNodeSpec.scala  |  386 ----
 .../scala/akka/http/STMultiNodeSpec.scala          |   27 -
 .../akka/remote/testkit/MultiNodeConfig.scala      |  502 -----
 .../akka/remote/testkit/PerfFlamesSupport.scala    |   57 -
 .../multi-jvm/scala/akka/testkit/TestTags.scala    |   11 -
 .../http/AkkaHttpServerLatencyMultiNodeSpec.scala  |  388 ++++
 .../org/apache/pekko/http/STMultiNodeSpec.scala    |   28 +
 .../pekko/remote/testkit/MultiNodeConfig.scala     |  503 +++++
 .../pekko/remote/testkit/PerfFlamesSupport.scala   |   58 +
 .../scala/org/apache/pekko/testkit/TestTags.scala  |   11 +
 http-tests/src/test/java/AllJavaTests.java         |    2 +-
 .../test/java/akka/http/javadsl/HttpAPIsTest.java  |  135 --
 .../sse/EventStreamMarshallingTest.java            |   53 -
 .../akka/http/javadsl/server/CompleteTest.java     |  134 --
 .../http/javadsl/server/HandlerBindingTest.java    |   53 -
 .../akka/http/javadsl/server/JavaRouteTest.java    |  352 ----
 .../akka/http/javadsl/server/JavaTestServer.java   |  181 --
 .../akka/http/javadsl/server/MarshallerTest.java   |  228 --
 .../akka/http/javadsl/server/MinimalHttpApp.java   |   48 -
 .../akka/http/javadsl/server/SneakHttpApp.java     |   38 -
 .../akka/http/javadsl/server/UnmarshallerTest.java |   81 -
 .../server/directives/AttributeDirectivesTest.java |   48 -
 .../server/directives/CodingDirectivesTest.java    |  128 --
 .../server/directives/ComposingDirectivesTest.java |  111 -
 .../server/directives/CookieDirectivesTest.java    |   73 -
 .../server/directives/ExecutionDirectivesTest.java |  138 --
 .../server/directives/HeaderDirectivesTest.java    |  240 ---
 .../server/directives/HostDirectivesTest.java      |   98 -
 .../directives/MarshallingDirectivesTest.java      |   34 -
 .../server/directives/MiscDirectivesTest.java      |  101 -
 .../server/directives/ParameterDirectivesTest.java |  396 ----
 .../server/directives/PathDirectivesTest.java      |  418 ----
 .../server/directives/RouteDirectivesTest.java     |  141 --
 .../server/directives/SchemeDirectivesTest.java    |   49 -
 .../server/directives/SecurityDirectivesTest.java  |  194 --
 .../server/examples/petstore/PetStoreAPITest.java  |   87 -
 .../server/examples/simple/SimpleServerTest.java   |   41 -
 .../http/javadsl/server/values/FormFieldsTest.java |  102 -
 .../http/javadsl/server/values/HeadersTest.java    |   81 -
 .../http/javadsl/settings/RoutingSettingsTest.java |   21 -
 .../sse/EventStreamUnmarshallingTest.java          |   58 -
 .../http/javadsl/server/HandlerExampleDocTest.java |   42 +-
 .../server/RouteJavaScalaDslConversionTest.java    |   18 +-
 .../apache/pekko/http/javadsl/HttpAPIsTest.java    |  135 ++
 .../sse/EventStreamMarshallingTest.java            |   53 +
 .../pekko/http/javadsl/server/CompleteTest.java    |  134 ++
 .../http/javadsl/server/HandlerBindingTest.java    |   53 +
 .../pekko/http/javadsl/server/JavaRouteTest.java   |  352 ++++
 .../pekko/http/javadsl/server/JavaTestServer.java  |  181 ++
 .../pekko/http/javadsl/server/MarshallerTest.java  |  228 ++
 .../pekko/http/javadsl/server/MinimalHttpApp.java  |   48 +
 .../pekko/http/javadsl/server/SneakHttpApp.java    |   38 +
 .../http/javadsl/server/UnmarshallerTest.java      |   81 +
 .../server/directives/AttributeDirectivesTest.java |   48 +
 .../server/directives/CodingDirectivesTest.java    |  128 ++
 .../server/directives/ComposingDirectivesTest.java |  111 +
 .../server/directives/CookieDirectivesTest.java    |   73 +
 .../server/directives/ExecutionDirectivesTest.java |  138 ++
 .../server/directives/HeaderDirectivesTest.java    |  240 +++
 .../server/directives/HostDirectivesTest.java      |   98 +
 .../directives/MarshallingDirectivesTest.java      |   34 +
 .../server/directives/MiscDirectivesTest.java      |  101 +
 .../server/directives/ParameterDirectivesTest.java |  396 ++++
 .../server/directives/PathDirectivesTest.java      |  418 ++++
 .../server/directives/RouteDirectivesTest.java     |  141 ++
 .../server/directives/SchemeDirectivesTest.java    |   49 +
 .../server/directives/SecurityDirectivesTest.java  |  194 ++
 .../server/examples/petstore/PetStoreAPITest.java  |   87 +
 .../server/examples/simple/SimpleServerTest.java   |   41 +
 .../http/javadsl/server/values/FormFieldsTest.java |  102 +
 .../http/javadsl/server/values/HeadersTest.java    |   81 +
 .../http/javadsl/settings/RoutingSettingsTest.java |   21 +
 .../sse/EventStreamUnmarshallingTest.java          |   58 +
 http-tests/src/test/resources/application.conf     |    4 +-
 .../scaladsl/server/util/VarArgsFunction1.scala    |    2 +-
 .../akka/http/scaladsl/server/util/package.scala   |    9 -
 .../pekko/http/scaladsl/server/util/package.scala  |    9 +
 .../test/scala/akka/http/HashCodeCollider.scala    |   31 -
 .../http/javadsl/DirectivesConsistencySpec.scala   |  199 --
 .../akka/http/javadsl/server/HttpAppSpec.scala     |  233 ---
 .../server/directives/SampleCustomHeader.scala     |   22 -
 .../akka/http/scaladsl/CustomMediaTypesSpec.scala  |   71 -
 .../akka/http/scaladsl/CustomStatusCodesSpec.scala |   50 -
 .../scala/akka/http/scaladsl/FormDataSpec.scala    |   47 -
 .../scaladsl/RouteJavaScalaDslConversionSpec.scala |   41 -
 .../akka/http/scaladsl/TestSingleRequest.scala     |   39 -
 .../http/scaladsl/coding/CodecSpecSupport.scala    |   79 -
 .../akka/http/scaladsl/coding/CoderSpec.scala      |  214 --
 .../akka/http/scaladsl/coding/DecoderSpec.scala    |   61 -
 .../akka/http/scaladsl/coding/DeflateSpec.scala    |   66 -
 .../akka/http/scaladsl/coding/EncoderSpec.scala    |   53 -
 .../scala/akka/http/scaladsl/coding/GzipSpec.scala |   47 -
 .../akka/http/scaladsl/coding/NoCodingSpec.scala   |   16 -
 .../scaladsl/marshallers/JsonSupportSpec.scala     |   71 -
 .../sprayjson/SprayJsonSupportSpec.scala           |   29 -
 .../marshallers/xml/ScalaXmlSupportSpec.scala      |  113 -
 .../marshalling/ContentNegotiationSpec.scala       |  238 ---
 .../FromStatusCodeAndXYZMarshallerSpec.scala       |  116 --
 .../scaladsl/marshalling/MarshallingSpec.scala     |  224 --
 .../sse/EventStreamMarshallingSpec.scala           |   35 -
 .../http/scaladsl/server/BasicRouteSpecs.scala     |  242 ---
 .../http/scaladsl/server/ConnectionTestApp.scala   |   99 -
 .../DiscardEntityDefaultExceptionHandlerSpec.scala |   66 -
 .../DiscardEntityDefaultRejectionHandlerSpec.scala |   43 -
 .../DontLeakActorsOnFailingConnectionSpecs.scala   |   87 -
 .../http/scaladsl/server/EntityStreamingSpec.scala |  408 ----
 .../akka/http/scaladsl/server/HttpAppSpec.scala    |  251 ---
 .../scaladsl/server/ModeledCustomHeaderSpec.scala  |  142 --
 .../akka/http/scaladsl/server/RejectionSpec.scala  |  109 -
 .../http/scaladsl/server/RouteResultSpec.scala     |   50 -
 .../akka/http/scaladsl/server/RoutingSpec.scala    |   34 -
 .../akka/http/scaladsl/server/SizeLimitSpec.scala  |  254 ---
 .../scaladsl/server/StreamingResponseSpecs.scala   |   28 -
 .../akka/http/scaladsl/server/TcpLeakApp.scala     |   51 -
 .../akka/http/scaladsl/server/TestServer.scala     |  117 --
 .../directives/AllowMaterializationOnlyOnce.scala  |   23 -
 .../directives/AttributeDirectivesSpec.scala       |   60 -
 .../server/directives/BasicDirectivesSpec.scala    |  241 ---
 .../directives/CacheConditionDirectivesSpec.scala  |  201 --
 .../server/directives/CodingDirectivesSpec.scala   |  569 -----
 .../server/directives/CookieDirectivesSpec.scala   |   95 -
 .../directives/DebuggingDirectivesSpec.scala       |  106 -
 .../directives/ExecutionDirectivesSpec.scala       |  180 --
 .../directives/FileAndResourceDirectivesSpec.scala |  538 -----
 .../directives/FileUploadDirectivesSpec.scala      |  573 ------
 .../directives/FormFieldDirectivesSpec.scala       |  333 ---
 .../server/directives/FutureDirectivesSpec.scala   |  181 --
 .../server/directives/HeaderDirectivesSpec.scala   |  246 ---
 .../server/directives/HostDirectivesSpec.scala     |   55 -
 .../directives/IllegalHeadersIntegrationSpec.scala |   31 -
 .../directives/MarshallingDirectivesSpec.scala     |  268 ---
 .../server/directives/MethodDirectivesSpec.scala   |  112 -
 .../server/directives/MiscDirectivesSpec.scala     |  219 --
 .../directives/ParameterDirectivesSpec.scala       |  316 ---
 .../server/directives/PathDirectivesSpec.scala     |  612 ------
 .../server/directives/RangeDirectivesSpec.scala    |  150 --
 .../directives/RespondWithDirectivesSpec.scala     |   63 -
 .../server/directives/RouteDirectivesSpec.scala    |  278 ---
 .../server/directives/SchemeDirectivesSpec.scala   |   47 -
 .../server/directives/SecurityDirectivesSpec.scala |  204 --
 .../server/directives/TimeoutDirectivesSpec.scala  |   69 -
 .../directives/WebSocketDirectivesSpec.scala       |  108 -
 .../http/scaladsl/server/util/TupleOpsSpec.scala   |   30 -
 .../settings/RoutingSettingsEqualitySpec.scala     |   27 -
 .../unmarshalling/MultipartUnmarshallersSpec.scala |  440 ----
 .../scaladsl/unmarshalling/UnmarshallingSpec.scala |  127 --
 .../unmarshalling/sse/BaseUnmarshallingSpec.scala  |   28 -
 .../sse/EventStreamUnmarshallingSpec.scala         |   68 -
 .../unmarshalling/sse/LineParserSpec.scala         |   56 -
 .../sse/ServerSentEventParserSpec.scala            |  125 --
 .../org/apache/pekko/http/HashCodeCollider.scala   |   31 +
 .../http/javadsl/DirectivesConsistencySpec.scala   |  200 ++
 .../pekko/http/javadsl/server/HttpAppSpec.scala    |  234 +++
 .../server/directives/SampleCustomHeader.scala     |   22 +
 .../pekko/http/scaladsl/CustomMediaTypesSpec.scala |   74 +
 .../http/scaladsl/CustomStatusCodesSpec.scala      |   51 +
 .../apache/pekko/http/scaladsl/FormDataSpec.scala  |   48 +
 .../scaladsl/RouteJavaScalaDslConversionSpec.scala |   46 +
 .../pekko/http/scaladsl/TestSingleRequest.scala    |   40 +
 .../http/scaladsl/coding/CodecSpecSupport.scala    |   80 +
 .../pekko/http/scaladsl/coding/CoderSpec.scala     |  215 ++
 .../pekko/http/scaladsl/coding/DecoderSpec.scala   |   62 +
 .../pekko/http/scaladsl/coding/DeflateSpec.scala   |   67 +
 .../pekko/http/scaladsl/coding/EncoderSpec.scala   |   54 +
 .../pekko/http/scaladsl/coding/GzipSpec.scala      |   48 +
 .../pekko/http/scaladsl/coding/NoCodingSpec.scala  |   16 +
 .../scaladsl/marshallers/JsonSupportSpec.scala     |   72 +
 .../sprayjson/SprayJsonSupportSpec.scala           |   30 +
 .../marshallers/xml/ScalaXmlSupportSpec.scala      |  114 +
 .../marshalling/ContentNegotiationSpec.scala       |  239 +++
 .../FromStatusCodeAndXYZMarshallerSpec.scala       |  117 ++
 .../scaladsl/marshalling/MarshallingSpec.scala     |  225 ++
 .../sse/EventStreamMarshallingSpec.scala           |   36 +
 .../http/scaladsl/server/BasicRouteSpecs.scala     |  243 +++
 .../http/scaladsl/server/ConnectionTestApp.scala   |  100 +
 .../DiscardEntityDefaultExceptionHandlerSpec.scala |   67 +
 .../DiscardEntityDefaultRejectionHandlerSpec.scala |   44 +
 .../DontLeakActorsOnFailingConnectionSpecs.scala   |   87 +
 .../http/scaladsl/server/EntityStreamingSpec.scala |  411 ++++
 .../pekko/http/scaladsl/server/HttpAppSpec.scala   |  252 +++
 .../scaladsl/server/ModeledCustomHeaderSpec.scala  |  143 ++
 .../pekko/http/scaladsl/server/RejectionSpec.scala |  110 +
 .../http/scaladsl/server/RouteResultSpec.scala     |   51 +
 .../pekko/http/scaladsl/server/RoutingSpec.scala   |   35 +
 .../pekko/http/scaladsl/server/SizeLimitSpec.scala |  255 +++
 .../scaladsl/server/StreamingResponseSpecs.scala   |   29 +
 .../pekko/http/scaladsl/server/TcpLeakApp.scala    |   52 +
 .../pekko/http/scaladsl/server/TestServer.scala    |  118 ++
 .../directives/AllowMaterializationOnlyOnce.scala  |   24 +
 .../directives/AttributeDirectivesSpec.scala       |   61 +
 .../server/directives/BasicDirectivesSpec.scala    |  242 +++
 .../directives/CacheConditionDirectivesSpec.scala  |  201 ++
 .../server/directives/CodingDirectivesSpec.scala   |  570 +++++
 .../server/directives/CookieDirectivesSpec.scala   |   95 +
 .../directives/DebuggingDirectivesSpec.scala       |  107 +
 .../directives/ExecutionDirectivesSpec.scala       |  181 ++
 .../directives/FileAndResourceDirectivesSpec.scala |  539 +++++
 .../directives/FileUploadDirectivesSpec.scala      |  574 ++++++
 .../directives/FormFieldDirectivesSpec.scala       |  334 +++
 .../server/directives/FutureDirectivesSpec.scala   |  182 ++
 .../server/directives/HeaderDirectivesSpec.scala   |  247 +++
 .../server/directives/HostDirectivesSpec.scala     |   55 +
 .../directives/IllegalHeadersIntegrationSpec.scala |   32 +
 .../directives/MarshallingDirectivesSpec.scala     |  269 +++
 .../server/directives/MethodDirectivesSpec.scala   |  113 +
 .../server/directives/MiscDirectivesSpec.scala     |  220 ++
 .../directives/ParameterDirectivesSpec.scala       |  317 +++
 .../server/directives/PathDirectivesSpec.scala     |  613 ++++++
 .../server/directives/RangeDirectivesSpec.scala    |  151 ++
 .../directives/RespondWithDirectivesSpec.scala     |   64 +
 .../server/directives/RouteDirectivesSpec.scala    |  279 +++
 .../server/directives/SchemeDirectivesSpec.scala   |   47 +
 .../server/directives/SecurityDirectivesSpec.scala |  205 ++
 .../server/directives/TimeoutDirectivesSpec.scala  |   70 +
 .../directives/WebSocketDirectivesSpec.scala       |  109 +
 .../http/scaladsl/server/util/TupleOpsSpec.scala   |   30 +
 .../settings/RoutingSettingsEqualitySpec.scala     |   27 +
 .../unmarshalling/MultipartUnmarshallersSpec.scala |  441 ++++
 .../scaladsl/unmarshalling/UnmarshallingSpec.scala |  128 ++
 .../unmarshalling/sse/BaseUnmarshallingSpec.scala  |   29 +
 .../sse/EventStreamUnmarshallingSpec.scala         |   69 +
 .../unmarshalling/sse/LineParserSpec.scala         |   57 +
 .../sse/ServerSentEventParserSpec.scala            |  126 ++
 .../javadsl/server/JavaPathMatchers.scala.template |    9 +-
 .../FormFieldDirectivesInstances.scala.template    |    2 +-
 .../ParameterDirectivesInstances.scala.template    |    2 +-
 .../util/ApplyConverterInstances.scala.template    |    4 +-
 .../ConstructFromTupleInstances.scala.template     |    2 +-
 .../util/TupleAppendOneInstances.scala.template    |    2 +-
 .../server/util/TupleFoldInstances.scala.template  |    2 +-
 .../main/java/akka/http/javadsl/coding/Coder.java  |   64 -
 .../akka/http/javadsl/common/RegexConverters.java  |   22 -
 .../javadsl/server/ExceptionHandlerBuilder.java    |   75 -
 .../java/akka/http/javadsl/server/HttpApp.java     |  188 --
 .../server/directives/ContentTypeResolver.java     |   33 -
 .../javadsl/server/directives/CorrespondsTo.java   |   27 -
 .../javadsl/unmarshalling/StringUnmarshallers.java |   82 -
 .../http/javadsl/unmarshalling/Unmarshallers.java  |   30 -
 .../apache/pekko/http/javadsl/coding/Coder.java    |   64 +
 .../pekko/http/javadsl/common/RegexConverters.java |   22 +
 .../javadsl/server/ExceptionHandlerBuilder.java    |   75 +
 .../apache/pekko/http/javadsl/server/HttpApp.java  |  188 ++
 .../server/directives/ContentTypeResolver.java     |   33 +
 .../javadsl/server/directives/CorrespondsTo.java   |   27 +
 .../javadsl/unmarshalling/StringUnmarshallers.java |   82 +
 .../http/javadsl/unmarshalling/Unmarshallers.java  |   30 +
 .../http/impl/settings/RoutingSettingsImpl.scala   |   39 -
 .../settings/ServerSentEventSettingsImpl.scala     |   28 -
 .../javadsl/common/EntityStreamingSupport.scala    |  173 --
 .../http/javadsl/common/PartialApplication.scala   |   38 -
 .../akka/http/javadsl/marshalling/Marshaller.scala |  209 --
 .../marshalling/sse/EventStreamMarshalling.scala   |   28 -
 .../akka/http/javadsl/server/Directives.scala      |  132 --
 .../http/javadsl/server/ExceptionHandler.scala     |   45 -
 .../akka/http/javadsl/server/PathMatchers.scala    |  164 --
 .../http/javadsl/server/RejectionHandler.scala     |   86 -
 .../akka/http/javadsl/server/Rejections.scala      |  457 ----
 .../akka/http/javadsl/server/RequestContext.scala  |   96 -
 .../scala/akka/http/javadsl/server/Route.scala     |   87 -
 .../akka/http/javadsl/server/RouteResult.scala     |   34 -
 .../http/javadsl/server/RoutingJavaMapping.scala   |   95 -
 .../server/directives/AttributeDirectives.scala    |   37 -
 .../server/directives/BasicDirectives.scala        |  385 ----
 .../directives/CacheConditionDirectives.scala      |   81 -
 .../server/directives/CodingDirectives.scala       |  117 --
 .../server/directives/CookieDirectives.scala       |  108 -
 .../server/directives/DebuggingDirectives.scala    |  131 --
 .../server/directives/ExecutionDirectives.scala    |   32 -
 .../directives/FileAndResourceDirectives.scala     |  263 ---
 .../server/directives/FileUploadDirectives.scala   |   99 -
 .../server/directives/FormFieldDirectives.scala    |   94 -
 .../FramedEntityStreamingDirectives.scala          |   62 -
 .../server/directives/FutureDirectives.scala       |  117 --
 .../server/directives/HeaderDirectives.scala       |  158 --
 .../javadsl/server/directives/HostDirectives.scala |   59 -
 .../server/directives/MarshallingDirectives.scala  |   69 -
 .../server/directives/MethodDirectives.scala       |   63 -
 .../javadsl/server/directives/MiscDirectives.scala |  107 -
 .../server/directives/ParameterDirectives.scala    |  102 -
 .../javadsl/server/directives/PathDirectives.scala |  300 ---
 .../server/directives/RangeDirectives.scala        |   30 -
 .../server/directives/RespondWithDirectives.scala  |   47 -
 .../javadsl/server/directives/RouteAdapter.scala   |   62 -
 .../server/directives/RouteDirectives.scala        |  324 ---
 .../server/directives/SchemeDirectives.scala       |   28 -
 .../server/directives/SecurityDirectives.scala     |  316 ---
 .../server/directives/TimeoutDirectives.scala      |   62 -
 .../server/directives/WebSocketDirectives.scala    |   94 -
 .../http/javadsl/settings/RoutingSettings.scala    |   52 -
 .../javadsl/settings/ServerSentEventSettings.scala |   40 -
 .../javadsl/unmarshalling/StringUnmarshaller.scala |   30 -
 .../http/javadsl/unmarshalling/Unmarshaller.scala  |  174 --
 .../sse/EventStreamUnmarshalling.scala             |   54 -
 .../http/scaladsl/client/RequestBuilding.scala     |  104 -
 .../client/TransformerPipelineSupport.scala        |   49 -
 .../scala/akka/http/scaladsl/coding/Coder.scala    |    8 -
 .../scala/akka/http/scaladsl/coding/Coders.scala   |   29 -
 .../akka/http/scaladsl/coding/DataMapper.scala     |   36 -
 .../scala/akka/http/scaladsl/coding/Decoder.scala  |   64 -
 .../scala/akka/http/scaladsl/coding/Deflate.scala  |   28 -
 .../http/scaladsl/coding/DeflateCompressor.scala   |  160 --
 .../scala/akka/http/scaladsl/coding/Encoder.scala  |  107 -
 .../scala/akka/http/scaladsl/coding/Gzip.scala     |   34 -
 .../akka/http/scaladsl/coding/GzipCompressor.scala |  131 --
 .../scala/akka/http/scaladsl/coding/NoCoding.scala |   44 -
 .../common/CsvEntityStreamingSupport.scala         |   48 -
 .../scaladsl/common/EntityStreamingSupport.scala   |  145 --
 .../common/JsonEntityStreamingSupport.scala        |   49 -
 .../akka/http/scaladsl/common/NameReceptacle.scala |  151 --
 .../akka/http/scaladsl/common/StrictForm.scala     |  162 --
 .../marshalling/ContentTypeOverrider.scala         |   38 -
 .../http/scaladsl/marshalling/EmptyValue.scala     |   21 -
 .../scaladsl/marshalling/GenericMarshallers.scala  |   45 -
 .../akka/http/scaladsl/marshalling/Marshal.scala   |   77 -
 .../http/scaladsl/marshalling/Marshaller.scala     |  222 --
 .../marshalling/MultipartMarshallers.scala         |   42 -
 .../PredefinedToEntityMarshallers.scala            |   59 -
 .../PredefinedToRequestMarshallers.scala           |   29 -
 .../PredefinedToResponseMarshallers.scala          |  160 --
 .../marshalling/ToResponseMarshallable.scala       |   30 -
 .../akka/http/scaladsl/marshalling/package.scala   |   19 -
 .../marshalling/sse/EventStreamMarshalling.scala   |   34 -
 .../http/scaladsl/server/ContentNegotation.scala   |  264 ---
 .../akka/http/scaladsl/server/Directive.scala      |  261 ---
 .../akka/http/scaladsl/server/Directives.scala     |   47 -
 .../http/scaladsl/server/ExceptionHandler.scala    |   79 -
 .../scala/akka/http/scaladsl/server/HttpApp.scala  |  172 --
 .../akka/http/scaladsl/server/PathMatcher.scala    |  570 -----
 .../akka/http/scaladsl/server/Rejection.scala      |  347 ----
 .../http/scaladsl/server/RejectionHandler.scala    |  316 ---
 .../akka/http/scaladsl/server/RequestContext.scala |  137 --
 .../http/scaladsl/server/RequestContextImpl.scala  |  120 --
 .../scala/akka/http/scaladsl/server/Route.scala    |  124 --
 .../http/scaladsl/server/RouteConcatenation.scala  |   55 -
 .../akka/http/scaladsl/server/RouteResult.scala    |   93 -
 .../akka/http/scaladsl/server/RoutingLog.scala     |   27 -
 .../akka/http/scaladsl/server/StandardRoute.scala  |   28 -
 .../server/directives/AttributeDirectives.scala    |   38 -
 .../server/directives/BasicDirectives.scala        |  443 ----
 .../directives/CacheConditionDirectives.scala      |  144 --
 .../server/directives/CodingDirectives.scala       |  169 --
 .../server/directives/CookieDirectives.scala       |   72 -
 .../server/directives/DebuggingDirectives.scala    |  111 -
 .../server/directives/ExecutionDirectives.scala    |   67 -
 .../directives/FileAndResourceDirectives.scala     |  429 ----
 .../server/directives/FileUploadDirectives.scala   |  201 --
 .../server/directives/FormFieldDirectives.scala    |  357 ----
 .../FramedEntityStreamingDirectives.scala          |   82 -
 .../server/directives/FutureDirectives.scala       |  117 --
 .../server/directives/HeaderDirectives.scala       |  242 ---
 .../server/directives/HostDirectives.scala         |   75 -
 .../server/directives/MarshallingDirectives.scala  |   90 -
 .../server/directives/MethodDirectives.scala       |  125 --
 .../server/directives/MiscDirectives.scala         |  131 --
 .../server/directives/ParameterDirectives.scala    |  250 ---
 .../server/directives/PathDirectives.scala         |  258 ---
 .../server/directives/RangeDirectives.scala        |  164 --
 .../server/directives/RespondWithDirectives.scala  |   87 -
 .../server/directives/RouteDirectives.scala        |  162 --
 .../server/directives/SchemeDirectives.scala       |   35 -
 .../server/directives/SecurityDirectives.scala     |  374 ----
 .../server/directives/TimeoutDirectives.scala      |  108 -
 .../server/directives/WebSocketDirectives.scala    |   96 -
 .../scala/akka/http/scaladsl/server/package.scala  |   20 -
 .../http/scaladsl/server/util/ApplyConverter.scala |   18 -
 .../http/scaladsl/server/util/BinaryPolyFunc.scala |   28 -
 .../http/scaladsl/server/util/ClassMagnet.scala    |   32 -
 .../scaladsl/server/util/ConstructFromTuple.scala  |   12 -
 .../akka/http/scaladsl/server/util/Tuple.scala     |   52 -
 .../akka/http/scaladsl/server/util/TupleOps.scala  |   67 -
 .../akka/http/scaladsl/server/util/Tupler.scala    |   33 -
 .../http/scaladsl/settings/RoutingSettings.scala   |   65 -
 .../settings/ServerSentEventSettings.scala         |   35 -
 .../unmarshalling/GenericUnmarshallers.scala       |   82 -
 .../unmarshalling/MultipartUnmarshallers.scala     |  131 --
 .../PredefinedFromEntityUnmarshallers.scala        |   55 -
 .../PredefinedFromStringUnmarshallers.scala        |   93 -
 .../http/scaladsl/unmarshalling/Unmarshal.scala    |   28 -
 .../http/scaladsl/unmarshalling/Unmarshaller.scala |  207 --
 .../akka/http/scaladsl/unmarshalling/package.scala |   21 -
 .../unmarshalling/sse/EventStreamParser.scala      |   46 -
 .../sse/EventStreamUnmarshalling.scala             |   91 -
 .../scaladsl/unmarshalling/sse/LineParser.scala    |   83 -
 .../unmarshalling/sse/ServerSentEventParser.scala  |  132 --
 .../http/impl/settings/RoutingSettingsImpl.scala   |   40 +
 .../settings/ServerSentEventSettingsImpl.scala     |   29 +
 .../javadsl/common/EntityStreamingSupport.scala    |  174 ++
 .../http/javadsl/common/PartialApplication.scala   |   38 +
 .../http/javadsl/marshalling/Marshaller.scala      |  210 ++
 .../marshalling/sse/EventStreamMarshalling.scala   |   29 +
 .../pekko/http/javadsl/server/Directives.scala     |  133 ++
 .../http/javadsl/server/ExceptionHandler.scala     |   46 +
 .../pekko/http/javadsl/server/PathMatchers.scala   |  165 ++
 .../http/javadsl/server/RejectionHandler.scala     |   87 +
 .../pekko/http/javadsl/server/Rejections.scala     |  458 +++++
 .../pekko/http/javadsl/server/RequestContext.scala |   97 +
 .../apache/pekko/http/javadsl/server/Route.scala   |   88 +
 .../pekko/http/javadsl/server/RouteResult.scala    |   35 +
 .../http/javadsl/server/RoutingJavaMapping.scala   |   96 +
 .../server/directives/AttributeDirectives.scala    |   38 +
 .../server/directives/BasicDirectives.scala        |  386 ++++
 .../directives/CacheConditionDirectives.scala      |   82 +
 .../server/directives/CodingDirectives.scala       |  118 ++
 .../server/directives/CookieDirectives.scala       |  109 +
 .../server/directives/DebuggingDirectives.scala    |  132 ++
 .../server/directives/ExecutionDirectives.scala    |   33 +
 .../directives/FileAndResourceDirectives.scala     |  264 +++
 .../server/directives/FileUploadDirectives.scala   |  100 +
 .../server/directives/FormFieldDirectives.scala    |   95 +
 .../FramedEntityStreamingDirectives.scala          |   63 +
 .../server/directives/FutureDirectives.scala       |  118 ++
 .../server/directives/HeaderDirectives.scala       |  159 ++
 .../javadsl/server/directives/HostDirectives.scala |   60 +
 .../server/directives/MarshallingDirectives.scala  |   70 +
 .../server/directives/MethodDirectives.scala       |   64 +
 .../javadsl/server/directives/MiscDirectives.scala |  108 +
 .../server/directives/ParameterDirectives.scala    |  103 +
 .../javadsl/server/directives/PathDirectives.scala |  301 +++
 .../server/directives/RangeDirectives.scala        |   30 +
 .../server/directives/RespondWithDirectives.scala  |   48 +
 .../javadsl/server/directives/RouteAdapter.scala   |   63 +
 .../server/directives/RouteDirectives.scala        |  333 +++
 .../server/directives/SchemeDirectives.scala       |   29 +
 .../server/directives/SecurityDirectives.scala     |  317 +++
 .../server/directives/TimeoutDirectives.scala      |   63 +
 .../server/directives/WebSocketDirectives.scala    |   95 +
 .../http/javadsl/settings/RoutingSettings.scala    |   53 +
 .../javadsl/settings/ServerSentEventSettings.scala |   41 +
 .../javadsl/unmarshalling/StringUnmarshaller.scala |   31 +
 .../http/javadsl/unmarshalling/Unmarshaller.scala  |  178 ++
 .../sse/EventStreamUnmarshalling.scala             |   55 +
 .../http/scaladsl/client/RequestBuilding.scala     |  105 +
 .../client/TransformerPipelineSupport.scala        |   49 +
 .../apache/pekko/http/scaladsl/coding/Coder.scala  |    8 +
 .../apache/pekko/http/scaladsl/coding/Coders.scala |   30 +
 .../pekko/http/scaladsl/coding/DataMapper.scala    |   37 +
 .../pekko/http/scaladsl/coding/Decoder.scala       |   65 +
 .../pekko/http/scaladsl/coding/Deflate.scala       |   29 +
 .../http/scaladsl/coding/DeflateCompressor.scala   |  161 ++
 .../pekko/http/scaladsl/coding/Encoder.scala       |  108 +
 .../apache/pekko/http/scaladsl/coding/Gzip.scala   |   35 +
 .../http/scaladsl/coding/GzipCompressor.scala      |  132 ++
 .../pekko/http/scaladsl/coding/NoCoding.scala      |   45 +
 .../common/CsvEntityStreamingSupport.scala         |   49 +
 .../scaladsl/common/EntityStreamingSupport.scala   |  146 ++
 .../common/JsonEntityStreamingSupport.scala        |   50 +
 .../http/scaladsl/common/NameReceptacle.scala      |  152 ++
 .../pekko/http/scaladsl/common/StrictForm.scala    |  163 ++
 .../marshalling/ContentTypeOverrider.scala         |   38 +
 .../http/scaladsl/marshalling/EmptyValue.scala     |   21 +
 .../scaladsl/marshalling/GenericMarshallers.scala  |   45 +
 .../pekko/http/scaladsl/marshalling/Marshal.scala  |   78 +
 .../http/scaladsl/marshalling/Marshaller.scala     |  223 ++
 .../marshalling/MultipartMarshallers.scala         |   43 +
 .../PredefinedToEntityMarshallers.scala            |   60 +
 .../PredefinedToRequestMarshallers.scala           |   30 +
 .../PredefinedToResponseMarshallers.scala          |  161 ++
 .../marshalling/ToResponseMarshallable.scala       |   30 +
 .../pekko/http/scaladsl/marshalling/package.scala  |   20 +
 .../marshalling/sse/EventStreamMarshalling.scala   |   35 +
 .../http/scaladsl/server/ContentNegotation.scala   |  265 +++
 .../pekko/http/scaladsl/server/Directive.scala     |  262 +++
 .../pekko/http/scaladsl/server/Directives.scala    |   48 +
 .../http/scaladsl/server/ExceptionHandler.scala    |   80 +
 .../pekko/http/scaladsl/server/HttpApp.scala       |  173 ++
 .../pekko/http/scaladsl/server/PathMatcher.scala   |  571 +++++
 .../pekko/http/scaladsl/server/Rejection.scala     |  348 ++++
 .../http/scaladsl/server/RejectionHandler.scala    |  317 +++
 .../http/scaladsl/server/RequestContext.scala      |  138 ++
 .../http/scaladsl/server/RequestContextImpl.scala  |  121 ++
 .../apache/pekko/http/scaladsl/server/Route.scala  |  125 ++
 .../http/scaladsl/server/RouteConcatenation.scala  |   56 +
 .../pekko/http/scaladsl/server/RouteResult.scala   |   94 +
 .../pekko/http/scaladsl/server/RoutingLog.scala    |   28 +
 .../pekko/http/scaladsl/server/StandardRoute.scala |   28 +
 .../server/directives/AttributeDirectives.scala    |   39 +
 .../server/directives/BasicDirectives.scala        |  444 ++++
 .../directives/CacheConditionDirectives.scala      |  145 ++
 .../server/directives/CodingDirectives.scala       |  170 ++
 .../server/directives/CookieDirectives.scala       |   73 +
 .../server/directives/DebuggingDirectives.scala    |  112 +
 .../server/directives/ExecutionDirectives.scala    |   68 +
 .../directives/FileAndResourceDirectives.scala     |  430 ++++
 .../server/directives/FileUploadDirectives.scala   |  202 ++
 .../server/directives/FormFieldDirectives.scala    |  358 ++++
 .../FramedEntityStreamingDirectives.scala          |   83 +
 .../server/directives/FutureDirectives.scala       |  118 ++
 .../server/directives/HeaderDirectives.scala       |  243 +++
 .../server/directives/HostDirectives.scala         |   75 +
 .../server/directives/MarshallingDirectives.scala  |   91 +
 .../server/directives/MethodDirectives.scala       |  126 ++
 .../server/directives/MiscDirectives.scala         |  132 ++
 .../server/directives/ParameterDirectives.scala    |  251 +++
 .../server/directives/PathDirectives.scala         |  259 +++
 .../server/directives/RangeDirectives.scala        |  165 ++
 .../server/directives/RespondWithDirectives.scala  |   88 +
 .../server/directives/RouteDirectives.scala        |  163 ++
 .../server/directives/SchemeDirectives.scala       |   35 +
 .../server/directives/SecurityDirectives.scala     |  375 ++++
 .../server/directives/TimeoutDirectives.scala      |  109 +
 .../server/directives/WebSocketDirectives.scala    |   97 +
 .../pekko/http/scaladsl/server/package.scala       |   20 +
 .../http/scaladsl/server/util/ApplyConverter.scala |   18 +
 .../http/scaladsl/server/util/BinaryPolyFunc.scala |   28 +
 .../http/scaladsl/server/util/ClassMagnet.scala    |   32 +
 .../scaladsl/server/util/ConstructFromTuple.scala  |   12 +
 .../pekko/http/scaladsl/server/util/Tuple.scala    |   52 +
 .../pekko/http/scaladsl/server/util/TupleOps.scala |   67 +
 .../pekko/http/scaladsl/server/util/Tupler.scala   |   33 +
 .../http/scaladsl/settings/RoutingSettings.scala   |   66 +
 .../settings/ServerSentEventSettings.scala         |   36 +
 .../unmarshalling/GenericUnmarshallers.scala       |   83 +
 .../unmarshalling/MultipartUnmarshallers.scala     |  132 ++
 .../PredefinedFromEntityUnmarshallers.scala        |   56 +
 .../PredefinedFromStringUnmarshallers.scala        |   94 +
 .../http/scaladsl/unmarshalling/Unmarshal.scala    |   28 +
 .../http/scaladsl/unmarshalling/Unmarshaller.scala |  208 ++
 .../http/scaladsl/unmarshalling/package.scala      |   22 +
 .../unmarshalling/sse/EventStreamParser.scala      |   47 +
 .../sse/EventStreamUnmarshalling.scala             |   92 +
 .../scaladsl/unmarshalling/sse/LineParser.scala    |   84 +
 .../unmarshalling/sse/ServerSentEventParser.scala  |  133 ++
 .../akka/http/javadsl/Http2JavaServerTest.java     |   43 -
 .../pekko/http/javadsl/Http2JavaServerTest.java    |   43 +
 .../impl/engine/http2/H2SpecIntegrationSpec.scala  |  190 --
 .../http/impl/engine/http2/H2cUpgradeSpec.scala    |   93 -
 .../impl/engine/http2/HPackEncodingSupport.scala   |   63 -
 .../http/impl/engine/http2/HPackSpecExamples.scala |  210 --
 .../impl/engine/http2/Http2ClientServerSpec.scala  |  198 --
 .../http/impl/engine/http2/Http2ClientSpec.scala   | 1032 ----------
 .../impl/engine/http2/Http2FrameHpackSupport.scala |   73 -
 .../http/impl/engine/http2/Http2FrameProbe.scala   |  263 ---
 .../http/impl/engine/http2/Http2FrameSending.scala |   57 -
 .../engine/http2/Http2PersistentClientSpec.scala   |  449 ----
 .../impl/engine/http2/Http2ServerDemuxSpec.scala   |   62 -
 .../http/impl/engine/http2/Http2ServerSpec.scala   | 1880 -----------------
 .../engine/http2/HttpMessageRenderingSpec.scala    |  157 --
 .../http/impl/engine/http2/PriorityTreeSpec.scala  |  230 ---
 .../impl/engine/http2/ProtocolSwitchSpec.scala     |  146 --
 .../impl/engine/http2/RequestParsingSpec.scala     |  605 ------
 .../http/impl/engine/http2/TelemetrySpiSpec.scala  |  256 ---
 .../http/impl/engine/http2/WindowTracking.scala    |   75 -
 .../engine/http2/WithInPendingUntilFixed.scala     |   16 -
 .../impl/engine/http2/WithPriorKnowledgeSpec.scala |   82 -
 .../engine/http2/framing/Http2FramingSpec.scala    |  507 -----
 .../akka/http/impl/engine/http2/package.scala      |   27 -
 .../scala/akka/http/scaladsl/Http2ServerTest.scala |  133 --
 .../impl/engine/http2/H2SpecIntegrationSpec.scala  |  191 ++
 .../http/impl/engine/http2/H2cUpgradeSpec.scala    |   94 +
 .../impl/engine/http2/HPackEncodingSupport.scala   |   64 +
 .../http/impl/engine/http2/HPackSpecExamples.scala |  211 ++
 .../impl/engine/http2/Http2ClientServerSpec.scala  |  199 ++
 .../http/impl/engine/http2/Http2ClientSpec.scala   | 1033 ++++++++++
 .../impl/engine/http2/Http2FrameHpackSupport.scala |   74 +
 .../http/impl/engine/http2/Http2FrameProbe.scala   |  264 +++
 .../http/impl/engine/http2/Http2FrameSending.scala |   58 +
 .../engine/http2/Http2PersistentClientSpec.scala   |  450 ++++
 .../impl/engine/http2/Http2ServerDemuxSpec.scala   |   63 +
 .../http/impl/engine/http2/Http2ServerSpec.scala   | 1881 +++++++++++++++++
 .../engine/http2/HttpMessageRenderingSpec.scala    |  158 ++
 .../http/impl/engine/http2/PriorityTreeSpec.scala  |  230 +++
 .../impl/engine/http2/ProtocolSwitchSpec.scala     |  147 ++
 .../impl/engine/http2/RequestParsingSpec.scala     |  606 ++++++
 .../http/impl/engine/http2/TelemetrySpiSpec.scala  |  257 +++
 .../http/impl/engine/http2/WindowTracking.scala    |   76 +
 .../engine/http2/WithInPendingUntilFixed.scala     |   16 +
 .../impl/engine/http2/WithPriorKnowledgeSpec.scala |   83 +
 .../engine/http2/framing/Http2FramingSpec.scala    |  508 +++++
 .../pekko/http/impl/engine/http2/package.scala     |   27 +
 .../pekko/http/scaladsl/Http2ServerTest.scala      |  134 ++
 .../src/main/java/akka/parboiled2/util/Base64.java |  672 ------
 .../org/apache/pekko/parboiled2/util/Base64.java   |  672 ++++++
 .../main/scala/akka/http/ccompat/pre213macro.scala |   25 -
 .../scala/akka/http/ccompat/since213macro.scala    |   25 -
 parsing/src/main/scala/akka/macros/LogHelper.scala |   62 -
 .../main/scala/akka/parboiled2/CharPredicate.scala |  314 ---
 .../src/main/scala/akka/parboiled2/CharUtils.scala |  195 --
 .../akka/parboiled2/DynamicRuleDispatch.scala      |   92 -
 .../scala/akka/parboiled2/ErrorFormatter.scala     |  277 ---
 .../main/scala/akka/parboiled2/ParseError.scala    |  158 --
 .../src/main/scala/akka/parboiled2/Parser.scala    |  684 ------
 .../main/scala/akka/parboiled2/ParserInput.scala   |  116 --
 parsing/src/main/scala/akka/parboiled2/Rule.scala  |  138 --
 .../scala/akka/parboiled2/RuleDSLActions.scala     |   89 -
 .../main/scala/akka/parboiled2/RuleDSLBasics.scala |  128 --
 .../scala/akka/parboiled2/RuleDSLCombinators.scala |  118 --
 .../main/scala/akka/parboiled2/ValueStack.scala    |  255 ---
 .../src/main/scala/akka/parboiled2/package.scala   |   36 -
 .../scala/akka/parboiled2/support/ActionOps.scala  | 2171 --------------------
 .../akka/parboiled2/support/ActionOpsSupport.scala |   93 -
 .../scala/akka/parboiled2/support/HListable.scala  |   32 -
 .../scala/akka/parboiled2/support/Lifter.scala     |   50 -
 .../akka/parboiled2/support/OpTreeContext.scala    |  765 -------
 .../scala/akka/parboiled2/support/RunResult.scala  |   52 -
 .../scala/akka/parboiled2/support/TailSwitch.scala |   71 -
 .../scala/akka/parboiled2/support/Unpack.scala     |   67 -
 .../scala/akka/parboiled2/support/package.scala    |   21 -
 parsing/src/main/scala/akka/shapeless/hlists.scala |   66 -
 .../src/main/scala/akka/shapeless/ops/hlists.scala |  152 --
 .../src/main/scala/akka/shapeless/package.scala    |   29 -
 .../main/scala/akka/shapeless/syntax/hlists.scala  |   40 -
 .../apache/pekko/http/ccompat/pre213macro.scala    |   25 +
 .../apache/pekko/http/ccompat/since213macro.scala  |   25 +
 .../scala/org/apache/pekko/macros/LogHelper.scala  |   63 +
 .../apache/pekko/parboiled2/CharPredicate.scala    |  314 +++
 .../org/apache/pekko/parboiled2/CharUtils.scala    |  195 ++
 .../pekko/parboiled2/DynamicRuleDispatch.scala     |   92 +
 .../apache/pekko/parboiled2/ErrorFormatter.scala   |  277 +++
 .../org/apache/pekko/parboiled2/ParseError.scala   |  158 ++
 .../scala/org/apache/pekko/parboiled2/Parser.scala |  684 ++++++
 .../org/apache/pekko/parboiled2/ParserInput.scala  |  116 ++
 .../scala/org/apache/pekko/parboiled2/Rule.scala   |  138 ++
 .../apache/pekko/parboiled2/RuleDSLActions.scala   |   89 +
 .../apache/pekko/parboiled2/RuleDSLBasics.scala    |  128 ++
 .../pekko/parboiled2/RuleDSLCombinators.scala      |  118 ++
 .../org/apache/pekko/parboiled2/ValueStack.scala   |  255 +++
 .../org/apache/pekko/parboiled2/package.scala      |   36 +
 .../pekko/parboiled2/support/ActionOps.scala       | 2171 ++++++++++++++++++++
 .../parboiled2/support/ActionOpsSupport.scala      |   93 +
 .../pekko/parboiled2/support/HListable.scala       |   32 +
 .../apache/pekko/parboiled2/support/Lifter.scala   |   50 +
 .../pekko/parboiled2/support/OpTreeContext.scala   |  768 +++++++
 .../pekko/parboiled2/support/RunResult.scala       |   52 +
 .../pekko/parboiled2/support/TailSwitch.scala      |   71 +
 .../apache/pekko/parboiled2/support/Unpack.scala   |   67 +
 .../apache/pekko/parboiled2/support/package.scala  |   21 +
 .../scala/org/apache/pekko/shapeless/hlists.scala  |   66 +
 .../org/apache/pekko/shapeless/ops/hlists.scala    |  152 ++
 .../scala/org/apache/pekko/shapeless/package.scala |   29 +
 .../org/apache/pekko/shapeless/syntax/hlists.scala |   40 +
 project/AkkaDependency.scala                       |  116 --
 project/Doc.scala                                  |    2 +-
 project/PekkoDependency.scala                      |  119 ++
 project/VersionGenerator.scala                     |   20 +-
 2076 files changed, 117131 insertions(+), 116466 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c51d4107f..62c14a046 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -141,8 +141,8 @@ an error like this:
 
 ```
 [info] pekko-stream: found 1 potential binary incompatibilities while checking against org.apache.pekko:pekko-stream_2.11:2.4.2  (filtered 222)
-[error]  * method foldAsync(java.lang.Object,scala.Function2)akka.stream.scaladsl.FlowOps in trait akka.stream.scaladsl.FlowOps is present only in current version
-[error]    filter with: ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.stream.scaladsl.FlowOps.foldAsync")
+[error]  * method foldAsync(java.lang.Object,scala.Function2)org.apache.pekko.stream.scaladsl.FlowOps in trait org.apache.pekko.stream.scaladsl.FlowOps is present only in current version
+[error]    filter with: ProblemFilters.exclude[ReversedMissingMethodProblem]("org.apache.pekko.stream.scaladsl.FlowOps.foldAsync")
 ```
 
 In such situations it's good to consult with a core team member if the violation can be safely ignored (by adding the above snippet to the project's
@@ -150,7 +150,7 @@ In such situations it's good to consult with a core team member if the violation
 
 Situations when it may be fine to ignore a MiMa issued warning include:
 
-- if it is touching any class marked as `private[akka]`, `/** INTERNAL API*/` or similar markers
+- if it is touching any class marked as `private[pekko]`, `/** INTERNAL API*/` or similar markers
 - if it is concerning internal classes (often recognizable by package names like `dungeon`, `impl`, `internal` etc.)
 - if it is adding API to classes / traits which are only meant for extension by Pekko itself, i.e. should not be extended by end-users
 - if it is touching any class marked with the `@InternalApi`, `@DoNotInherit`, and `@ApiMayChange`. See [API stability annotations and comments](https://doc.akka.io/docs/akka/current/common/binary-compatibility-rules.html#api-stability-annotations-and-comments)
diff --git a/build.sbt b/build.sbt
index 473a83b16..61d94d360 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 import akka._
 import akka.ValidatePullRequest._
-import AkkaDependency._
+import PekkoDependency._
 import Dependencies.{ h2specExe, h2specName }
 import com.typesafe.sbt.SbtMultiJvm.MultiJvmKeys.MultiJvm
 import java.nio.file.Files
@@ -35,7 +35,7 @@ inThisBuild(Def.settings(
   concurrentRestrictions in Global += Tags.limit(Tags.Test, 1),
   onLoad in Global := {
     sLog.value.info(
-      s"Building Pekko HTTP ${version.value} against Pekko ${AkkaDependency.akkaVersion} on Scala ${(httpCore / scalaVersion).value}")
+      s"Building Pekko HTTP ${version.value} against Pekko ${PekkoDependency.pekkoVersion} on Scala ${(httpCore / scalaVersion).value}")
     (onLoad in Global).value
   },
   scalafixScalaBinaryVersion := scalaBinaryVersion.value))
@@ -128,7 +128,7 @@ lazy val parsing = project("parsing")
   .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.parsing"))
   .settings(MetaInfLicenseNoticeCopy.settings)
-  .addAkkaModuleDependency("akka-actor", "provided")
+  .addPekkoModuleDependency("pekko-actor", "provided")
   .settings(Dependencies.parsing)
   .settings(
     scalacOptions --= Seq("-Xfatal-warnings", "-Xlint", "-Ywarn-dead-code"), // disable warnings for parboiled code
@@ -143,13 +143,13 @@ lazy val httpCore = project("http-core")
   .settings(AutomaticModuleName.settings("pekko.http.core"))
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(parsing, httpScalafixRules % ScalafixConfig)
-  .addAkkaModuleDependency("akka-stream", "provided")
-  .addAkkaModuleDependency(
-    "akka-stream-testkit",
+  .addPekkoModuleDependency("pekko-stream", "provided")
+  .addPekkoModuleDependency(
+    "pekko-stream-testkit",
     "test",
-    akka =
-      if (System.getProperty("akka.http.test-against-akka-main", "false") == "true") AkkaDependency.masterSnapshot
-      else AkkaDependency.default)
+    pekko =
+      if (System.getProperty("pekko.http.test-against-pekko-main", "false") == "true") PekkoDependency.masterSnapshot
+      else PekkoDependency.default)
   .settings(Dependencies.httpCore)
   .settings(VersionGenerator.versionSettings)
   .settings(scalaMacroSupport)
@@ -161,7 +161,7 @@ lazy val http = project("http")
   .settings(AutomaticModuleName.settings("pekko.http"))
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(httpCore)
-  .addAkkaModuleDependency("akka-stream", "provided")
+  .addPekkoModuleDependency("pekko-stream", "provided")
   .settings(Dependencies.http)
   .settings(
     Compile / scalacOptions += "-language:_")
@@ -181,8 +181,8 @@ lazy val http2Support = project("http2-support")
   .settings(AutomaticModuleName.settings("pekko.http.http2"))
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(httpCore, httpTestkit % "test", httpCore % "test->test")
-  .addAkkaModuleDependency("akka-stream", "provided")
-  .addAkkaModuleDependency("akka-stream-testkit", "test")
+  .addPekkoModuleDependency("pekko-stream", "provided")
+  .addPekkoModuleDependency("pekko-stream-testkit", "test")
   .settings(Dependencies.http2)
   .settings(Dependencies.http2Support)
   .settings {
@@ -223,14 +223,14 @@ lazy val httpTestkit = project("http-testkit")
   .settings(AutomaticModuleName.settings("pekko.http.testkit"))
   .settings(MetaInfLicenseNoticeCopy.settings)
   .dependsOn(http)
-  .addAkkaModuleDependency("akka-stream-testkit", "provided")
-  .addAkkaModuleDependency("akka-testkit", "provided")
+  .addPekkoModuleDependency("pekko-stream-testkit", "provided")
+  .addPekkoModuleDependency("pekko-testkit", "provided")
   .settings(Dependencies.httpTestkit)
   .settings(
     // don't ignore Suites which is the default for the junit-interface
     testOptions += Tests.Argument(TestFrameworks.JUnit, "--ignore-runners="),
     Compile / scalacOptions ++= Seq("-language:_"),
-    Test / run / mainClass := Some("akka.http.javadsl.SimpleServerApp"))
+    Test / run / mainClass := Some("org.apache.pekko.http.javadsl.SimpleServerApp"))
   .enablePlugins(BootstrapGenjavadoc, MultiNodeScalaTest, ScaladocNoVerificationOfDiagrams)
   .enablePlugins(ReproducibleBuildsPlugin)
   .disablePlugins(MimaPlugin) // testkit, no bin compat guaranteed
@@ -247,8 +247,8 @@ lazy val httpTests = project("http-tests")
   .configs(MultiJvm)
   .settings(headerSettings(MultiJvm))
   .settings(ValidatePR / additionalTasks += MultiJvm / headerCheck)
-  .addAkkaModuleDependency("akka-stream", "provided")
-  .addAkkaModuleDependency("akka-multi-node-testkit", "test")
+  .addPekkoModuleDependency("pekko-stream", "provided")
+  .addPekkoModuleDependency("pekko-multi-node-testkit", "test")
   .settings(
     // Fix to reenable scala-steward, see https://gitter.im/scala-steward-org/scala-steward?at=6183bb66d78911028a1b7cd8
     // Putting that jar file with the complicated name into the git tree directly breaks if something in the environment
@@ -267,7 +267,7 @@ lazy val httpTests = project("http-tests")
 lazy val httpJmhBench = project("http-bench-jmh")
   .settings(commonSettings)
   .dependsOn(http, http2Support % "compile->compile,test")
-  .addAkkaModuleDependency("akka-stream")
+  .addPekkoModuleDependency("pekko-stream")
   .enablePlugins(JmhPlugin)
   .enablePlugins(NoPublish) // don't release benchs
   .disablePlugins(MimaPlugin)
@@ -282,14 +282,14 @@ lazy val httpXml =
   httpMarshallersScalaSubproject("xml")
     .settings(AutomaticModuleName.settings("pekko.http.marshallers.scalaxml"))
     .settings(MetaInfLicenseNoticeCopy.settings)
-    .addAkkaModuleDependency("akka-stream", "provided")
+    .addPekkoModuleDependency("pekko-stream", "provided")
     .settings(Dependencies.httpXml)
 
 lazy val httpSprayJson =
   httpMarshallersScalaSubproject("spray-json")
     .settings(AutomaticModuleName.settings("pekko.http.marshallers.sprayjson"))
     .settings(MetaInfLicenseNoticeCopy.settings)
-    .addAkkaModuleDependency("akka-stream", "provided")
+    .addPekkoModuleDependency("pekko-stream", "provided")
     .settings(Dependencies.httpSprayJson)
 
 lazy val httpMarshallersJava = project("http-marshallers-java")
@@ -302,8 +302,8 @@ lazy val httpJackson =
   httpMarshallersJavaSubproject("jackson")
     .settings(AutomaticModuleName.settings("pekko.http.marshallers.jackson"))
     .settings(MetaInfLicenseNoticeCopy.settings)
-    .addAkkaModuleDependency("akka-stream", "provided")
-    .addAkkaModuleDependency("akka-stream-testkit", "test")
+    .addPekkoModuleDependency("pekko-stream", "provided")
+    .addPekkoModuleDependency("pekko-stream-testkit", "test")
     .dependsOn(httpTestkit % "test")
     .settings(Dependencies.httpJackson)
     .enablePlugins(ScaladocNoVerificationOfDiagrams)
@@ -314,8 +314,8 @@ lazy val httpCaching = project("http-caching")
   .settings(commonSettings)
   .settings(AutomaticModuleName.settings("pekko.http.caching"))
   .settings(MetaInfLicenseNoticeCopy.settings)
-  .addAkkaModuleDependency("akka-stream", "provided")
-  .addAkkaModuleDependency("akka-stream-testkit", "provided")
+  .addPekkoModuleDependency("pekko-stream", "provided")
+  .addPekkoModuleDependency("pekko-stream-testkit", "provided")
   .settings(Dependencies.httpCaching)
   .dependsOn(http, httpCore, httpTestkit % "test")
   .enablePlugins(BootstrapGenjavadoc)
@@ -361,7 +361,7 @@ lazy val httpScalafixRules =
 lazy val httpScalafixTestInput =
   Project(id = "http-scalafix-test-input", base = file("http-scalafix/scalafix-test-input"))
     .dependsOn(http)
-    .addAkkaModuleDependency("akka-stream")
+    .addPekkoModuleDependency("pekko-stream")
     .enablePlugins(NoPublish)
     .disablePlugins(MimaPlugin, HeaderPlugin /* because it gets confused about metaheader required for tests */ )
     .settings(
@@ -375,7 +375,7 @@ lazy val httpScalafixTestInput =
 lazy val httpScalafixTestOutput =
   Project(id = "http-scalafix-test-output", base = file("http-scalafix/scalafix-test-output"))
     .dependsOn(http)
-    .addAkkaModuleDependency("akka-stream")
+    .addPekkoModuleDependency("pekko-stream")
     .enablePlugins(NoPublish)
     .disablePlugins(MimaPlugin, HeaderPlugin /* because it gets confused about metaheader required for tests */ )
 
@@ -402,11 +402,11 @@ lazy val httpScalafixTests =
 lazy val docs = project("docs")
   .enablePlugins(ParadoxPlugin, NoPublish, PublishRsyncPlugin)
   .disablePlugins(MimaPlugin)
-  .addAkkaModuleDependency("akka-stream", "provided", AkkaDependency.docs)
-  .addAkkaModuleDependency("akka-actor-typed", "provided", AkkaDependency.docs)
-  .addAkkaModuleDependency("akka-multi-node-testkit", "provided", AkkaDependency.docs)
-  .addAkkaModuleDependency("akka-stream-testkit", "provided", AkkaDependency.docs)
-  .addAkkaModuleDependency("akka-actor-testkit-typed", "provided", AkkaDependency.docs)
+  .addPekkoModuleDependency("pekko-stream", "provided", PekkoDependency.docs)
+  .addPekkoModuleDependency("pekko-actor-typed", "provided", PekkoDependency.docs)
+  .addPekkoModuleDependency("pekko-multi-node-testkit", "provided", PekkoDependency.docs)
+  .addPekkoModuleDependency("pekko-stream-testkit", "provided", PekkoDependency.docs)
+  .addPekkoModuleDependency("pekko-actor-testkit-typed", "provided", PekkoDependency.docs)
   .dependsOn(
     httpCore, http, httpXml, http2Support, httpMarshallersJava, httpMarshallersScala, httpCaching,
     httpTests % "compile;test->test", httpTestkit % "compile;test->test", httpScalafixRules % ScalafixConfig)
@@ -438,9 +438,9 @@ lazy val docs = project("docs")
     Compile / paradoxProperties ++= Map(
       "project.name" -> "Apache Pekko HTTP",
       "canonical.base_url" -> "https://pekko.apache.org/docs/akka-http/current",
-      "akka.version" -> AkkaDependency.docs.version,
-      "akka.minimum.version25" -> AkkaDependency.minimumExpectedAkkaVersion,
-      "akka.minimum.version26" -> AkkaDependency.minimumExpectedAkka26Version,
+      "akka.version" -> PekkoDependency.docs.version,
+      "akka.minimum.version25" -> PekkoDependency.minimumExpectedPekkoVersion,
+      "akka.minimum.version26" -> PekkoDependency.minimumExpectedPekko26Version,
       "jackson.xml.version" -> Dependencies.jacksonXmlVersion,
       "scalafix.version" -> _root_.scalafix.sbt.BuildInfo.scalafixVersion, // grab from scalafix plugin directly
       "extref.pekko-docs.base_url" -> s"https://pekko.apache.org/docs/pekko/current/%s",
@@ -448,19 +448,19 @@ lazy val docs = project("docs")
         val v = if (isSnapshot.value) "current" else version.value
         s"https://doc.akka.io/japi/akka-http/$v"
       },
-      "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${AkkaDependency.docs.link}",
+      "javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${PekkoDependency.docs.link}",
       "javadoc.akka.link_style" -> "direct",
       "scaladoc.akka.http.base_url" -> {
         val v = if (isSnapshot.value) "current" else version.value
         s"https://doc.akka.io/api/akka-http/$v"
       },
-      "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${AkkaDependency.docs.link}",
+      "scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${PekkoDependency.docs.link}",
       "algolia.docsearch.api_key" -> "0ccbb8bf5148554a406fbf07df0a93b9",
       "algolia.docsearch.index_name" -> "akka-http",
       "google.analytics.account" -> "UA-21117439-1",
       "google.analytics.domain.name" -> "akka.io",
       "github.base_url" -> GitHub.url(version.value, isSnapshot.value)),
-    apidocRootPackage := "akka",
+    apidocRootPackage := "org.apache.pekko",
     ValidatePR / additionalTasks += Compile / paradox,
     ThisBuild / publishRsyncHost := "akkarepo@gustav.akka.io",
     publishRsyncArtifacts := List((Compile / paradox).value -> gustavDir("docs").value))
@@ -470,7 +470,7 @@ lazy val docs = project("docs")
 lazy val compatibilityTests = Project("http-compatibility-tests", file("http-compatibility-tests"))
   .enablePlugins(NoPublish)
   .disablePlugins(MimaPlugin)
-  .addAkkaModuleDependency("akka-stream", "provided")
+  .addPekkoModuleDependency("pekko-stream", "provided")
   .settings(
     libraryDependencies ++= Seq(
       "org.apache.pekko" %% "pekko-http" % MiMa.latest101Version % "provided",
diff --git a/docs/src/main/paradox/client-side/client-https-support.md b/docs/src/main/paradox/client-side/client-https-support.md
index 83fd5fcd1..32de026dc 100644
--- a/docs/src/main/paradox/client-side/client-https-support.md
+++ b/docs/src/main/paradox/client-side/client-https-support.md
@@ -6,13 +6,13 @@ The central vehicle for configuring encryption is the @apidoc[HttpsConnectionCon
 the static methods on @apidoc[ConnectionContext]:
 
 Scala
-:  @@snip[ConnectionContext.scala](/http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala) { #https-client-context-creation }
+:  @@snip[ConnectionContext.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ConnectionContext.scala) { #https-client-context-creation }
 
 Java
-:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/akka/http/javadsl/ConnectionContext.scala) { #https-client-context-creation }
+:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectionContext.scala) { #https-client-context-creation }
 
 In addition to the `outgoingConnection`, `newHostConnectionPool` and `cachedHostConnectionPool` methods the
-@scala[@scaladoc[akka.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[akka.http.javadsl.Http](akka.http.javadsl.Http)]
+@scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](akka.http.javadsl.Http)]
 extension also defines `outgoingConnectionHttps`, `newHostConnectionPoolHttps` and
 `cachedHostConnectionPoolHttps`. These methods work identically to their counterparts without the `-Https` suffix,
 with the exception that all connections will always be encrypted.
diff --git a/docs/src/main/paradox/client-side/client-transport.md b/docs/src/main/paradox/client-side/client-transport.md
index 271309292..68a8058b7 100644
--- a/docs/src/main/paradox/client-side/client-transport.md
+++ b/docs/src/main/paradox/client-side/client-transport.md
@@ -2,13 +2,13 @@
 
 The client side infrastructure has support to plug different transport mechanisms underneath (the API may still change in the future). A client side
 transport is represented by an instance of
-@scala[@scaladoc[akka.http.scaladsl.ClientTransport](akka.http.scaladsl.ClientTransport)]@java[@javadoc[akka.http.javadsl.ClientTransport](akka.http.javadsl.ClientTransport)]:
+@scala[@scaladoc[org.apache.pekko.http.scaladsl.ClientTransport](akka.http.scaladsl.ClientTransport)]@java[@javadoc[org.apache.pekko.http.javadsl.ClientTransport](akka.http.javadsl.ClientTransport)]:
 
 Scala
-:  @@snip [ClientTransport.scala](/http-core/src/main/scala/akka/http/scaladsl/ClientTransport.scala) { #client-transport-definition }
+:  @@snip [ClientTransport.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ClientTransport.scala) { #client-transport-definition }
 
 Java
-:  @@snip [ClientTransport.scala](/http-core/src/main/scala/akka/http/javadsl/ClientTransport.scala) { #client-transport-definition }
+:  @@snip [ClientTransport.scala](/http-core/src/main/scala/org/apache/pekko/http/javadsl/ClientTransport.scala) { #client-transport-definition }
 
 A transport implementation defines how the client infrastructure should communicate with a given host.
 
diff --git a/docs/src/main/paradox/client-side/connection-level.md b/docs/src/main/paradox/client-side/connection-level.md
index 576b1dd3a..591586744 100644
--- a/docs/src/main/paradox/client-side/connection-level.md
+++ b/docs/src/main/paradox/client-side/connection-level.md
@@ -79,7 +79,7 @@ On the client-side the stand-alone HTTP layer forms a `BidiStage` stage that "up
 It is defined like this:
 
 @@@ div { .group-scala }
-@@snip [Http.scala](/http-core/src/main/scala/akka/http/scaladsl/Http.scala) { #client-layer }
+@@snip [Http.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala) { #client-layer }
 @@@
 @@@ div { .group-java }
 ```java
diff --git a/docs/src/main/paradox/client-side/host-level.md b/docs/src/main/paradox/client-side/host-level.md
index c3b495300..cc95a284b 100644
--- a/docs/src/main/paradox/client-side/host-level.md
+++ b/docs/src/main/paradox/client-side/host-level.md
@@ -16,7 +16,7 @@ The best way to get a hold of a connection pool to a given target endpoint is th
 method, which returns a @apidoc[Flow] that can be "baked" into an application-level stream setup. This flow is also called
 a "pool client flow".
 
-The connection pool underlying a pool client flow is cached. For every @apidoc[akka.actor.ActorSystem], target endpoint and pool
+The connection pool underlying a pool client flow is cached. For every @apidoc[org.apache.pekko.actor.ActorSystem], target endpoint and pool
 configuration there will never be more than a single pool live at any time.
 
 Also, the HTTP layer transparently manages idle shutdown and restarting of connection pools as configured.
@@ -140,14 +140,14 @@ shutdown of a specific pool by calling `shutdown()` on the `HostConnectionPool`
 flow materializes into. This `shutdown()` call produces a @scala[`Future[Unit]`]@java[`CompletionStage<Done>`] which is fulfilled when the pool
 termination has been completed.
 
-It's also possible to trigger the immediate termination of *all* connection pools in the @apidoc[akka.actor.ActorSystem] at the same
+It's also possible to trigger the immediate termination of *all* connection pools in the @apidoc[org.apache.pekko.actor.ActorSystem] at the same
 time by calling @scala[`Http().shutdownAllConnectionPools()`]@java[`Http.get(system).shutdownAllConnectionPools()`].
 This call too produces a @scala[`Future[Unit]`]@java[`CompletionStage<Done>`] which is fulfilled when all pools have terminated.
 
 @scala[`Http().addClientPoolsToCoordinatedShutdown()`]@java[`Http.get(system).addClientPoolsToCoordinatedShutdown()`] will add the client connection pool shutdown to Apache Pekko's @extref[coordinated shutdown](pekko-docs:coordinated-shutdown.html) so it will be called before the actor system disappears.
 
 @@@ note
-When encountering unexpected @apidoc[akka.stream.AbruptTerminationException] exceptions during @apidoc[akka.actor.ActorSystem] **shutdown**
+When encountering unexpected @apidoc[org.apache.pekko.stream.AbruptTerminationException] exceptions during @apidoc[org.apache.pekko.actor.ActorSystem] **shutdown**
 please make sure that active connections are shut down before shutting down the entire system, this can be done by
 calling the @scala[`Http().shutdownAllConnectionPools()`]@java[`Http.get(system).shutdownAllConnectionPools()`] method,
 and only once its @scala[`Future`]@java[`CompletionStage`] completes, shutting down the actor system.
diff --git a/docs/src/main/paradox/client-side/http2.md b/docs/src/main/paradox/client-side/http2.md
index 4d6177384..f14f384e2 100644
--- a/docs/src/main/paradox/client-side/http2.md
+++ b/docs/src/main/paradox/client-side/http2.md
@@ -64,7 +64,7 @@ slower to respond to. For HTTP/2 it is therefore important to have a way to corr
 it was made for. This can be achieved through a @apidoc[RequestResponseAssociation] set on the request, Apache Pekko HTTP will pass
 such association objects on to the response.
 
-In this sample the built-in @scala[`akka.http.scaladsl.model.ResponsePromise`]@java[`akka.http.javadsl.model.ResponseFuture`] `RequestResponseAssociation`  is used to return
+In this sample the built-in @scala[`org.apache.pekko.http.scaladsl.model.ResponsePromise`]@java[`org.apache.pekko.http.javadsl.model.ResponseFuture`] `RequestResponseAssociation`  is used to return
 a @scala[`Future`]@java[`CompletionStage`] for the response:
 
 Scala
diff --git a/docs/src/main/paradox/common/encoding.md b/docs/src/main/paradox/common/encoding.md
index d57e9368f..28ee01f7c 100644
--- a/docs/src/main/paradox/common/encoding.md
+++ b/docs/src/main/paradox/common/encoding.md
@@ -5,7 +5,7 @@ The [HTTP spec](https://tools.ietf.org/html/rfc7231#section-3.1.2.1) defines a `
 
 Currently, Apache Pekko HTTP supports the compression and decompression of HTTP requests and responses with the `gzip` or
 `deflate` encodings.
-The core logic for this lives in the @scala[@scaladoc[akka.http.scaladsl.coding](akka.http.scaladsl.coding.index) package.]@java[@javadoc[akka.http.javadsl.coding.Coder](akka.http.javadsl.coding.Coder) enum class.]
+The core logic for this lives in the @scala[@scaladoc[org.apache.pekko.http.scaladsl.coding](akka.http.scaladsl.coding.index) package.]@java[@javadoc[org.apache.pekko.http.javadsl.coding.Coder](akka.http.javadsl.coding.Coder) enum class.]
 
 ## Server side
 
diff --git a/docs/src/main/paradox/common/http-model.md b/docs/src/main/paradox/common/http-model.md
index 8d5513c53..ce9c017f3 100644
--- a/docs/src/main/paradox/common/http-model.md
+++ b/docs/src/main/paradox/common/http-model.md
@@ -120,7 +120,7 @@ Scala
 Java
 :   @@snip [ModelDocTest.java](/docs/src/test/java/docs/http/javadsl/ModelDocTest.java) { #construct-response }
 
-In addition to the simple @scala[@apidoc[HttpEntity] constructors]@java[`HttpEntities.create` methods] which create an entity from a fixed `String` or @apidoc[akka.util.ByteString]
+In addition to the simple @scala[@apidoc[HttpEntity] constructors]@java[`HttpEntities.create` methods] which create an entity from a fixed `String` or @apidoc[org.apache.pekko.util.ByteString]
 as shown here the Apache Pekko HTTP model defines a number of subclasses of @apidoc[HttpEntity] which allow body data to be specified as a
 stream of bytes. @java[All of these types can be created using the method on `HttpEntites`.]
 
@@ -149,7 +149,7 @@ received or sent:
 
 @scala[HttpEntity.Strict]@java[HttpEntityStrict]
 : The simplest entity, which is used when all the entity are already available in memory.
-It wraps a plain @apidoc[akka.util.ByteString] and  represents a standard, unchunked entity with a known `Content-Length`.
+It wraps a plain @apidoc[org.apache.pekko.util.ByteString] and  represents a standard, unchunked entity with a known `Content-Length`.
 
 @scala[HttpEntity.Default]@java[HttpEntityDefault]
 : The general, unchunked HTTP/1.1 message entity.
@@ -184,7 +184,7 @@ which allows to use them for requests and responses. In contrast, @scala[`HttpEn
 
 Streaming entity types (i.e. all but @scala[`Strict`]@java[`HttpEntityStrict`]) cannot be shared or serialized. To create a strict, shareable copy of an
 entity or message use `HttpEntity.toStrict` or `HttpMessage.toStrict` which returns a @scala[`Future`]@java[`CompletionStage`] of the object with
-the body data collected into a @apidoc[akka.util.ByteString].
+the body data collected into a @apidoc[org.apache.pekko.util.ByteString].
 
 The @scala[@apidoc[HttpEntity] companion object]@java[class `HttpEntities`] contains @scala[several helper constructors]@java[static methods] to create entities from common types easily.
 
@@ -196,7 +196,7 @@ entity regardless of its concrete subtype.
 
 @@@ note { title='When to use which subtype?' }
 
- * Use @scala[`Strict`]@java[`HttpEntityStrict`] if the amount of data is "small" and already available in memory (e.g. as a `String` or @apidoc[akka.util.ByteString])
+ * Use @scala[`Strict`]@java[`HttpEntityStrict`] if the amount of data is "small" and already available in memory (e.g. as a `String` or @apidoc[org.apache.pekko.util.ByteString])
  * Use @scala[`Default`]@java[`HttpEntityDefault`] if the data is generated by a streaming data source and the size of the data is known
  * Use @scala[`Chunked`]@java[`HttpEntityChunked`] for an entity of unknown length
  * Use @scala[`CloseDelimited`]@java[`HttpEntityCloseDelimited`] for a response as a legacy alternative to @scala[`Chunked`]@java[`HttpEntityChunked`] if the client
@@ -334,7 +334,7 @@ Connection
 the potential wish of the application to close the connection after the respective response has been sent out.
 The actual logic for determining whether to close the connection is quite involved. It takes into account the
 request's method, protocol and potential @apidoc[Connection] header as well as the response's protocol, entity and
-potential @apidoc[Connection] header. See @github[this test](/http-core/src/test/scala/akka/http/impl/engine/rendering/ResponseRendererSpec.scala) { #connection-header-table } for a full table of what happens when.
+potential @apidoc[Connection] header. See @github[this test](/http-core/src/test/scala/org/apache/pekko/http/impl/engine/rendering/ResponseRendererSpec.scala) { #connection-header-table } for a full table of what happens when.
 
 Strict-Transport-Security
 : HTTP Strict Transport Security (HSTS) is a web security policy mechanism which is communicated by the
@@ -356,7 +356,7 @@ or the other way around etc), a helper @scala[trait]@java[classes] for custom He
 Thanks to extending @apidoc[ModeledCustomHeader] instead of the plain @apidoc[CustomHeader] @scala[such header can be matched]@java[the following methods are at your disposal]:
 
 Scala
-:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #modeled-api-key-custom-header }
+:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #modeled-api-key-custom-header }
 
 Java
 :   @@snip [CustomHeaderExampleTest.java](/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java) { #modeled-api-key-custom-header }
@@ -364,7 +364,7 @@ Java
 Which allows this @scala[CustomHeader]@java[modeled custom header] to be used in the following scenarios:
 
 Scala
-:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #matching-examples }
+:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #matching-examples }
 
 Java
 :   @@snip [CustomHeaderExampleTest.java](/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java) { #conversion-creation-custom-header }
@@ -372,7 +372,7 @@ Java
 Including usage within the header directives like in the following @ref[headerValuePF](../routing-dsl/directives/header-directives/headerValuePF.md) example:
 
 Scala
-:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #matching-in-routes }
+:   @@snip [ModeledCustomHeaderSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/ModeledCustomHeaderSpec.scala) { #matching-in-routes }
 
 Java
 :   @@snip [CustomHeaderExampleTest.java](/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java) { #header-value-pf }
@@ -432,7 +432,7 @@ media types, e.g. that `application/custom` is to be treated as `NonBinary` with
 need to register the custom media type in the server's settings by configuring @apidoc[ParserSettings] like this:
 
 Scala
-:   @@snip [CustomMediaTypesSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/CustomMediaTypesSpec.scala) { #application-custom }
+:   @@snip [CustomMediaTypesSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/CustomMediaTypesSpec.scala) { #application-custom }
 
 Java
 :   @@snip [CustomMediaTypesExampleTest.java](/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java) { #application-custom-java }
@@ -448,7 +448,7 @@ well-known status codes, however sometimes you may need to use a custom one (or
 Similarly to the media types registration, you can register custom status codes by configuring @apidoc[ParserSettings] like this:
 
 Scala
-:   @@snip [CustomStatusCodesSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/CustomStatusCodesSpec.scala) { #application-custom }
+:   @@snip [CustomStatusCodesSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/CustomStatusCodesSpec.scala) { #application-custom }
 
 Java
 :   @@snip [CustomStatusCodesExampleTest.java](/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java) { #application-custom-java }
diff --git a/docs/src/main/paradox/common/json-support.md b/docs/src/main/paradox/common/json-support.md
index ee788576d..c28bebe9d 100644
--- a/docs/src/main/paradox/common/json-support.md
+++ b/docs/src/main/paradox/common/json-support.md
@@ -20,17 +20,17 @@ To make use of the support module for (un)marshalling from and to JSON with [Jac
   version="PekkoHttpVersion"
 }
 
-Use `akka.http.javadsl.marshallers.jackson.Jackson.unmarshaller(T.class)` to create an @apidoc[Unmarshaller[HttpEntity,T]] which expects the request
+Use `org.apache.pekko.http.javadsl.marshallers.jackson.Jackson.unmarshaller(T.class)` to create an @apidoc[Unmarshaller[HttpEntity,T]] which expects the request
 body (HttpEntity) to be of type `application/json` and converts it to `T` using Jackson.
 
-@@snip [PetStoreExample.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #unmarshall }
+@@snip [PetStoreExample.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #unmarshall }
 
-Use `akka.http.javadsl.marshallers.jackson.Jackson.marshaller(T.class)` to create a @apidoc[Marshaller[T,RequestEntity]] which can be used with
+Use `org.apache.pekko.http.javadsl.marshallers.jackson.Jackson.marshaller(T.class)` to create a @apidoc[Marshaller[T,RequestEntity]] which can be used with
 `RequestContext.complete` or `RouteDirectives.complete` to convert a POJO to an HttpResponse.
 
-@@snip [PetStoreExample.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #marshall }
+@@snip [PetStoreExample.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #marshall }
 
-Refer to @github[this file](/http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java) in the sources for the complete example.
+Refer to @github[this file](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreExample.java) in the sources for the complete example.
 
 @@@
 
@@ -39,7 +39,7 @@ Refer to @github[this file](/http-tests/src/main/java/akka/http/javadsl/server/e
 
 ## spray-json Support
 
-The @scaladoc[SprayJsonSupport](akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport) trait provides a `FromEntityUnmarshaller[T]` and `ToEntityMarshaller[T]` for every type `T`
+The @scaladoc[SprayJsonSupport](org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport) trait provides a `FromEntityUnmarshaller[T]` and `ToEntityMarshaller[T]` for every type `T`
 that an implicit `spray.json.RootJsonReader` and/or `spray.json.RootJsonWriter` (respectively) is available for.
 
 To enable automatic support for (un)marshalling from and to JSON with [spray-json], add a library dependency onto:
@@ -55,7 +55,7 @@ To enable automatic support for (un)marshalling from and to JSON with [spray-jso
 
 Next, provide a `RootJsonFormat[T]` for your type and bring it into scope. Check out the [spray-json] documentation for more info on how to do this.
 
-Finally, import the `FromEntityUnmarshaller[T]` and `ToEntityMarshaller[T]` implicits directly from `SprayJsonSupport` as shown in the example below or mix the `akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport` trait into your JSON support module.
+Finally, import the `FromEntityUnmarshaller[T]` and `ToEntityMarshaller[T]` implicits directly from `SprayJsonSupport` as shown in the example below or mix the `org.apache.pekko.http.scaladsl.marshallers.sprayjson.SprayJsonSupport` trait into your JSON support module.
 
 Once you have done this (un)marshalling between JSON and your type `T` should work nicely and transparently.
 
@@ -74,7 +74,7 @@ you may have to apply a different framing mechanism, but the general idea remain
 and applying a framing to it, such that the single objects can be easily deserialized using the usual marshalling infrastructure:
 
 Scala
-:   @@snip [EntityStreamingSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/server/EntityStreamingSpec.scala) { #json-streaming-client-example }
+:   @@snip [EntityStreamingSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala) { #json-streaming-client-example }
  
 Java
 :   @@snip [HttpClientExampleDocTest.java](/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java) { #json-streaming-client-example-raw }
@@ -85,14 +85,14 @@ In the above example the marshalling is handled by the implicitly provided `Json
 You can also achieve the same more explicitly, by manually connecting the entity byte stream through a framing and then deserialization stage: 
 
 Scala
-:   @@snip [EntityStreamingSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/server/EntityStreamingSpec.scala) { #json-streaming-client-example-raw }
+:   @@snip [EntityStreamingSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/server/EntityStreamingSpec.scala) { #json-streaming-client-example-raw }
  
 @@@
 
 @@@ div { .group-java }
 
 In the above example the `JsonEntityStreamingSupport` class is used to obtain the proper framing, though you could also
-pick the framing manually by using `akka.stream.javadsl.Framing` or `akka.stream.javadsl.JsonFraming`. 
+pick the framing manually by using `org.apache.pekko.stream.javadsl.Framing` or `org.apache.pekko.stream.javadsl.JsonFraming`. 
 Framing stages are used to "chunk up" the pieces of incoming bytes into appropriately sized pieces of valid JSON,
 which then can be handled easily by a not-streaming JSON serializer such as jackson in the example. This technique is simpler to use
 and often good enough rather than writing a fully streaming JSON parser (which also is possible). 
@@ -106,7 +106,7 @@ and often good enough rather than writing a fully streaming JSON parser (which a
 
 By default, spray-json marshals your types to compact printed JSON by implicit conversion using `CompactPrinter`, as defined in:
 
-@@snip [SprayJsonSupport.scala](/http-marshallers-scala/http-spray-json/src/main/scala/akka/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala) { #sprayJsonMarshallerConverter }
+@@snip [SprayJsonSupport.scala](/http-marshallers-scala/http-spray-json/src/main/scala/org/apache/pekko/http/scaladsl/marshallers/sprayjson/SprayJsonSupport.scala) { #sprayJsonMarshallerConverter }
 
 Alternatively to marshal your types to pretty printed JSON, bring a `PrettyPrinter` in scope to perform implicit conversion.
 
diff --git a/docs/src/main/paradox/common/marshalling.md b/docs/src/main/paradox/common/marshalling.md
index 7dcfacb27..0d777c368 100644
--- a/docs/src/main/paradox/common/marshalling.md
+++ b/docs/src/main/paradox/common/marshalling.md
@@ -41,11 +41,11 @@ delaying the actual construction of the marshalling target instance to the very
 
 This is how `Marshalling` is defined:
 
-@@snip [Marshaller.scala](/http/src/main/scala/akka/http/scaladsl/marshalling/Marshaller.scala) { #marshalling }
+@@snip [Marshaller.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/marshalling/Marshaller.scala) { #marshalling }
 
 Apache Pekko HTTP also defines a number of helpful aliases for the types of marshallers that you'll likely work with most:
 
-@@snip [package.scala](/http/src/main/scala/akka/http/scaladsl/marshalling/package.scala) { #marshaller-aliases }
+@@snip [package.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/marshalling/package.scala) { #marshaller-aliases }
 
 @@@
 
@@ -58,12 +58,12 @@ Specifically these are:
 
  * @scaladoc[PredefinedToEntityMarshallers](akka.http.scaladsl.marshalling.PredefinedToEntityMarshallers)
     * `Array[Byte]`
-    * @apidoc[akka.util.ByteString]
+    * @apidoc[org.apache.pekko.util.ByteString]
     * `Array[Char]`
     * `String`
-    * `akka.http.scaladsl.model.FormData`
-    * `akka.http.scaladsl.model.MessageEntity`
-    * `T <: akka.http.scaladsl.model.Multipart`
+    * `org.apache.pekko.http.scaladsl.model.FormData`
+    * `org.apache.pekko.http.scaladsl.model.MessageEntity`
+    * `T <: org.apache.pekko.http.scaladsl.model.Multipart`
  * @scaladoc[PredefinedToResponseMarshallers](akka.http.scaladsl.marshalling.PredefinedToResponseMarshallers)
     * `T`, if a `ToEntityMarshaller[T]` is available
     * @apidoc[HttpResponse]
@@ -90,7 +90,7 @@ Specifically these are:
 
  * Predefined @apidoc[RequestEntity] marshallers:
     * `byte[]`
-    * @apidoc[akka.util.ByteString]
+    * @apidoc[org.apache.pekko.util.ByteString]
     * `char[]`
     * `String`
     * @apidoc[FormData]
@@ -137,7 +137,7 @@ For writing your own marshallers you won't have to "manually" implement the @api
 Rather, it should be possible to use one of the convenience construction helpers defined on the @apidoc[Marshaller]
 companion:
 
-@@snip [Marshaller.scala](/http/src/main/scala/akka/http/scaladsl/marshalling/Marshaller.scala) { #marshaller-creation }
+@@snip [Marshaller.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/marshalling/Marshaller.scala) { #marshaller-creation }
 
 @@@
 
@@ -182,6 +182,6 @@ The best entry point for this is the @scaladoc[Marshal](akka.http.scaladsl.marsh
 
 However, many directives dealing with @ref[marshalling](../routing-dsl/directives/marshalling-directives/index.md) also  require that you pass a marshaller explicitly. The following example shows how to marshal Java bean classes to JSON using the @ref:[Jackson JSON support](json-support.md#jackson-support):
 
-@@snip [PetStoreExample.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #marshall }
+@@snip [PetStoreExample.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/petstore/PetStoreExample.java) { #imports #marshall }
 
 @@@
diff --git a/docs/src/main/paradox/common/sse-support.md b/docs/src/main/paradox/common/sse-support.md
index 16d99bc2c..6f2ac727e 100644
--- a/docs/src/main/paradox/common/sse-support.md
+++ b/docs/src/main/paradox/common/sse-support.md
@@ -44,7 +44,7 @@ Scala
 :  @@snip [ServerSentEventsExampleSpec.scala](/docs/src/test/scala/docs/http/scaladsl/ServerSentEventsExampleSpec.scala) { #event-stream-marshalling-example }
 
 Java
-:  @@snip [EventStreamMarshallingTest.java](/http-tests/src/test/java/akka/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java) { #event-stream-marshalling-example }
+:  @@snip [EventStreamMarshallingTest.java](/http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java) { #event-stream-marshalling-example }
 
 ## Client-side usage: unmarshalling
 
@@ -54,7 +54,7 @@ Scala
 :  @@snip [ServerSentEventsExampleSpec.scala](/docs/src/test/scala/docs/http/scaladsl/ServerSentEventsExampleSpec.scala) { #event-stream-unmarshalling-example }
 
 Java
-:  @@snip [EventStreamMarshallingTest.java](/http-tests/src/test/java/akka/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java) { #event-stream-unmarshalling-example }
+:  @@snip [EventStreamMarshallingTest.java](/http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java) { #event-stream-unmarshalling-example }
 
 Notice that if you are looking for a resilient way to permanently subscribe to an event stream,
 Apache Pekko Connectors provides the [EventSource](https://doc.akka.io/docs/alpakka/current/sse.html)
diff --git a/docs/src/main/paradox/common/timeouts.md b/docs/src/main/paradox/common/timeouts.md
index 23bd21c78..633338886 100644
--- a/docs/src/main/paradox/common/timeouts.md
+++ b/docs/src/main/paradox/common/timeouts.md
@@ -35,7 +35,7 @@ never sending the real response otherwise).
 
 The default @apidoc[HttpResponse] that is written when a request timeout is exceeded looks like this:
 
-@@snip [HttpServerBluePrint.scala](/http-core/src/main/scala/akka/http/impl/engine/server/HttpServerBluePrint.scala) { #default-request-timeout-httpresponse }
+@@snip [HttpServerBluePrint.scala](/http-core/src/main/scala/org/apache/pekko/http/impl/engine/server/HttpServerBluePrint.scala) { #default-request-timeout-httpresponse }
 
 A default request timeout is applied globally to all routes and can be configured using the
 `akka.http.server.request-timeout` setting (which defaults to 20 seconds).
diff --git a/docs/src/main/paradox/common/unmarshalling.md b/docs/src/main/paradox/common/unmarshalling.md
index 08c420973..7134e6408 100644
--- a/docs/src/main/paradox/common/unmarshalling.md
+++ b/docs/src/main/paradox/common/unmarshalling.md
@@ -14,7 +14,7 @@ Unmarshalling of instances of type `A` into instances of type `B` is performed b
 @@@ div { .group-scala }
 Apache Pekko HTTP also predefines a number of helpful aliases for the types of unmarshallers that you'll likely work with most:
 
-@@snip [package.scala](/http/src/main/scala/akka/http/scaladsl/unmarshalling/package.scala) { #unmarshaller-aliases }
+@@snip [package.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/package.scala) { #unmarshaller-aliases }
 
 @@@
 
@@ -44,10 +44,10 @@ Specifically these are:
  * @scala[@scaladoc[PredefinedFromEntityUnmarshallers](akka.http.scaladsl.unmarshalling.PredefinedFromEntityUnmarshallers)]
    @java[@apidoc[Unmarshaller]]
     * @scala[`Array[Byte]`]@java[`byte[]`]
-    * @apidoc[akka.util.ByteString]
+    * @apidoc[org.apache.pekko.util.ByteString]
     * @scala[`Array[Char]`]@java[`char[]`]
     * `String`
-    * @scala[`akka.http.scaladsl.model.FormData`]@java[`akka.http.javadsl.model.FormData`]
+    * @scala[`org.apache.pekko.http.scaladsl.model.FormData`]@java[`org.apache.pekko.http.javadsl.model.FormData`]
 
 @@@ div { .group-scala }
  * @scaladoc[GenericUnmarshallers](akka.http.scaladsl.unmarshalling.GenericUnmarshallers)
@@ -80,10 +80,10 @@ Rather, it should be possible to use one of the convenience construction helpers
 @scala[the @apidoc[Unmarshaller] companion]@java[@apidoc[Unmarshaller]]:
 
 Scala
-:  @@snip [Unmarshaller.scala](/http/src/main/scala/akka/http/scaladsl/unmarshalling/Unmarshaller.scala) { #unmarshaller-creation }
+:  @@snip [Unmarshaller.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/unmarshalling/Unmarshaller.scala) { #unmarshaller-creation }
 
 Java
-:  @@snip [Unmarshallers.scala](/http/src/main/java/akka/http/javadsl/unmarshalling/Unmarshallers.java) { #unmarshaller-creation }
+:  @@snip [Unmarshallers.scala](/http/src/main/java/org/apache/pekko/http/javadsl/unmarshalling/Unmarshallers.java) { #unmarshaller-creation }
 
 @@@ note
 To avoid unnecessary memory pressure, unmarshallers should make sure to either fully consume the incoming entity data stream, or make sure it is properly cancelled on error.
@@ -125,7 +125,7 @@ In many places throughout Apache Pekko HTTP unmarshallers are used implicitly, e
 of a request using the @ref[Routing DSL](../routing-dsl/index.md).
 
 However, you can also use the unmarshalling infrastructure directly if you wish, which can be useful for example in tests.
-The best entry point for this is the @scala[`akka.http.scaladsl.unmarshalling.Unmarshal` object]@java[`akka.http.javadsl.unmarshalling.StringUnmarshallers` class], which you can use like this:
+The best entry point for this is the @scala[`org.apache.pekko.http.scaladsl.unmarshalling.Unmarshal` object]@java[`org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers` class], which you can use like this:
 
 Scala
 :  @@snip [UnmarshalSpec.scala](/docs/src/test/scala/docs/http/scaladsl/UnmarshalSpec.scala) { #use-unmarshal }
diff --git a/docs/src/main/paradox/common/uri-model.md b/docs/src/main/paradox/common/uri-model.md
index 2ecca30c0..a1f75b1b0 100644
--- a/docs/src/main/paradox/common/uri-model.md
+++ b/docs/src/main/paradox/common/uri-model.md
@@ -28,10 +28,10 @@ Below are some more examples of valid URI strings, and how you can construct a @
 @scala[,using `Uri.from()` method by passing `scheme`, `host`, `path` and `query` parameters].
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #valid-uri-examples }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #valid-uri-examples }
 
 Java
-:   @@snip [UriTest.scala](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #valid-uri-examples }
+:   @@snip [UriTest.scala](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #valid-uri-examples }
 
 For exact definitions of the parts of a URI, like `scheme`, `path` and `query` refer to [RFC 3986](https://tools.ietf.org/html/rfc3986#section-1.1.2).
 Here's a little overview:
@@ -50,10 +50,10 @@ For "special" characters in URI, you typically use percent encoding like below.
 Percent encoding is discussed in more detail in the @ref[Query String in URI](#query-string-in-uri) section.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #dont-double-decode }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #dont-double-decode }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #dont-double-decode }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #dont-double-decode }
 
 
 #### Invalid URI strings and IllegalUriException
@@ -61,10 +61,10 @@ Java
 When an invalid URI string is passed to `Uri()` as below, an `IllegalUriException` is thrown.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #illegal-cases-immediate-exception }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #illegal-cases-immediate-exception }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #illegal-scheme #illegal-userinfo #illegal-percent-encoding #illegal-path #illegal-path-with-control-char }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #illegal-scheme #illegal-userinfo #illegal-percent-encoding #illegal-path #illegal-path-with-control-char }
 
 #### Directives to extract URI components
 
@@ -96,10 +96,10 @@ Then, when you call the `query()` method, the query string is parsed from the ra
 You can add query parameters with @apidoc[Uri] class's @scala[`withQuery()` method]@java[`Uri::query()` method]
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #create-uri-with-query }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #create-uri-with-query }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #create-uri-with-query }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #create-uri-with-query }
 
 The below code illustrates how valid query strings are parsed.
 Especially, you can check how percent encoding is used and how special characters like `+` and `;` are parsed.
@@ -109,17 +109,17 @@ The `mode` parameter to `Query()` and `Uri.query()` is discussed in @ref[Strict
 @@@
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-definition }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-definition }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-definition }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-definition }
 
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-mode }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-mode }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-mode }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-mode }
 
 Note that:
 
@@ -141,25 +141,25 @@ some special characters like "/" and "?" are allowed inside a query string, with
 "/" and "?" are commonly used when you have a URI whose query parameter has another URI.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-without-percent-encode }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-without-percent-encode }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-without-percent-encode }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-without-percent-encode }
 
 However, some other special characters can cause `IllegalUriException` without percent encoding as follows.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-1 }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-1 }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-1 }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-1 }
 
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-2 }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-2 }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-2 }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-2 }
 
 #### Strict and Relaxed Mode
 
@@ -167,34 +167,34 @@ The `Uri.query()` method and `Query()` take a parameter `mode`, which is either
 Switching the mode gives different behavior on parsing some special characters in URI.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-relaxed-definition }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-relaxed-definition }
 
 The below two cases threw `IllegalUriException` when you specified the `Strict` mode,
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-1 }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-strict-mode-exception-1 }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-1 #query-strict-mode-exception-2 }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-strict-mode-exception-1 #query-strict-mode-exception-2 }
 
 but the `Relaxed` mode parses them as they are.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode-success }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode-success }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-relaxed-mode-success }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-relaxed-mode-success }
 
 However, even with the `Relaxed` mode, there are still invalid special characters which require percent encoding.
 
 Scala
-:   @@snip [UriSpec.scala](/http-core/src/test/scala/akka/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode-exception }
+:   @@snip [UriSpec.scala](/http-core/src/test/scala/org/apache/pekko/http/scaladsl/model/UriSpec.scala) { #query-relaxed-mode-exception }
 
 Java
-:   @@snip [UriTest.java](/http-core/src/test/java/akka/http/javadsl/model/UriTest.java) { #query-relaxed-mode-exception-1 }
+:   @@snip [UriTest.java](/http-core/src/test/java/org/apache/pekko/http/javadsl/model/UriTest.java) { #query-relaxed-mode-exception-1 }
 
 Other than specifying the `mode` in the parameters, like when using directives, you can specify the `mode` in your configuration as follows.
 
diff --git a/docs/src/main/paradox/common/xml-support.md b/docs/src/main/paradox/common/xml-support.md
index 2e5e3197e..4656a1602 100644
--- a/docs/src/main/paradox/common/xml-support.md
+++ b/docs/src/main/paradox/common/xml-support.md
@@ -45,8 +45,8 @@ the following dependency:
 }
 
 Once you have done this (un)marshalling between XML and `NodeSeq` instances should work nicely and transparently,
-by either using `import akka.http.scaladsl.marshallers.xml.ScalaXmlSupport._` or mixing in the
-`akka.http.scaladsl.marshallers.xml.ScalaXmlSupport` trait.
+by either using `import org.apache.pekko.http.scaladsl.marshallers.xml.ScalaXmlSupport._` or mixing in the
+`org.apache.pekko.http.scaladsl.marshallers.xml.ScalaXmlSupport` trait.
 
 @@@
 
diff --git a/docs/src/main/paradox/compatibility-guidelines.md b/docs/src/main/paradox/compatibility-guidelines.md
index 89a52ee1b..89be5a6cd 100644
--- a/docs/src/main/paradox/compatibility-guidelines.md
+++ b/docs/src/main/paradox/compatibility-guidelines.md
@@ -20,94 +20,94 @@ patch versions. However, binary compatibility will be attempted to be kept as mu
 
 Scala
 :   ```scala
-    akka.http.scaladsl.server.directives.FileUploadDirectives#storeUploadedFile
-    akka.http.scaladsl.server.directives.FileUploadDirectives#storeUploadedFiles
-    akka.http.scaladsl.server.directives.FileUploadDirectives#fileUploadAll
-    akka.http.scaladsl.marshalling.sse.EventStreamMarshalling
-    akka.http.scaladsl.server.HttpApp
-    akka.http.scaladsl.unmarshalling.sse.EventStreamParser
-    akka.http.scaladsl.unmarshalling.sse.EventStreamUnmarshalling
-    akka.http.scaladsl.OutgoingConnectionBuilder#managedPersistentHttp2
-    akka.http.scaladsl.OutgoingConnectionBuilder#managedPersistentHttp2WithPriorKnowledge
+    org.apache.pekko.http.scaladsl.server.directives.FileUploadDirectives#storeUploadedFile
+    org.apache.pekko.http.scaladsl.server.directives.FileUploadDirectives#storeUploadedFiles
+    org.apache.pekko.http.scaladsl.server.directives.FileUploadDirectives#fileUploadAll
+    org.apache.pekko.http.scaladsl.marshalling.sse.EventStreamMarshalling
+    org.apache.pekko.http.scaladsl.server.HttpApp
+    org.apache.pekko.http.scaladsl.unmarshalling.sse.EventStreamParser
+    org.apache.pekko.http.scaladsl.unmarshalling.sse.EventStreamUnmarshalling
+    org.apache.pekko.http.scaladsl.OutgoingConnectionBuilder#managedPersistentHttp2
+    org.apache.pekko.http.scaladsl.OutgoingConnectionBuilder#managedPersistentHttp2WithPriorKnowledge
     ```
 
 Java
 :   ```java
-    akka.http.javadsl.common.PartialApplication#bindParameter
-    akka.http.javadsl.server.Directives#anyOf (all overloads)
-    akka.http.javadsl.server.Directives#allOf (all overloads)
-    akka.http.javadsl.server.directives.FileUploadDirectives#storeUploadedFile
-    akka.http.javadsl.server.directives.FileUploadDirectives#storeUploadedFiles
-    akka.http.javadsl.server.directives.FileUploadDirectives#fileUploadAll
-    akka.http.javadsl.server.HttpApp
-    akka.http.javadsl.model.RequestResponseAssociation
-    akka.http.javadsl.OutgoingConnectionBuilder#managedPersistentHttp2WithPriorKnowledge
-    akka.http.javadsl.OutgoingConnectionBuilder#managedPersistentHttp2
+    org.apache.pekko.http.javadsl.common.PartialApplication#bindParameter
+    org.apache.pekko.http.javadsl.server.Directives#anyOf (all overloads)
+    org.apache.pekko.http.javadsl.server.Directives#allOf (all overloads)
+    org.apache.pekko.http.javadsl.server.directives.FileUploadDirectives#storeUploadedFile
+    org.apache.pekko.http.javadsl.server.directives.FileUploadDirectives#storeUploadedFiles
+    org.apache.pekko.http.javadsl.server.directives.FileUploadDirectives#fileUploadAll
+    org.apache.pekko.http.javadsl.server.HttpApp
+    org.apache.pekko.http.javadsl.model.RequestResponseAssociation
+    org.apache.pekko.http.javadsl.OutgoingConnectionBuilder#managedPersistentHttp2WithPriorKnowledge
+    org.apache.pekko.http.javadsl.OutgoingConnectionBuilder#managedPersistentHttp2
     ```    
 
 #### pekko-http-caching
 
 Scala
 :   ```scala
-    akka.http.caching.LfuCache
-    akka.http.caching.scaladsl.Cache
-    akka.http.scaladsl.server.directives.CachingDirectives
+    org.apache.pekko.http.caching.LfuCache
+    org.apache.pekko.http.caching.scaladsl.Cache
+    org.apache.pekko.http.scaladsl.server.directives.CachingDirectives
     ```
 
 Java
 :   ```java
-    akka.http.caching.LfuCache
-    akka.http.caching.javadsl.Cache
-    akka.http.javadsl.server.directives.CachingDirectives
+    org.apache.pekko.http.caching.LfuCache
+    org.apache.pekko.http.caching.javadsl.Cache
+    org.apache.pekko.http.javadsl.server.directives.CachingDirectives
     ```    
 
 #### pekko-http-core
 
 Scala
 :   ```scala
-    akka.http.scaladsl.ClientTransport
-    akka.http.scaladsl.ConnectionContext#httpsClient
-    akka.http.scaladsl.ConnectionContext#httpsServer
-    akka.http.scaladsl.settings.PoolImplementation
-    akka.http.scaladsl.settings.ClientConnectionSettings#transport
-    akka.http.scaladsl.settings.ClientConnectionSettings#withTransport
-    akka.http.scaladsl.settings.ConnectionPoolSettings#appendHostOverride
-    akka.http.scaladsl.settings.ConnectionPoolSettings#poolImplementation
-    akka.http.scaladsl.settings.ConnectionPoolSettings#responseEntitySubscriptionTimeout
-    akka.http.scaladsl.settings.ConnectionPoolSettings#withHostOverrides
-    akka.http.scaladsl.settings.ConnectionPoolSettings#withOverrides
-    akka.http.scaladsl.settings.ConnectionPoolSettings#withPoolImplementation
-    akka.http.scaladsl.settings.ConnectionPoolSettings#withResponseEntitySubscriptionTimeout
-    akka.http.scaladsl.settings.HostOverride
-    akka.http.scaladsl.settings.Http2ServerSettings
-    akka.http.scaladsl.settings.Http2ClientSettings
-    akka.http.scaladsl.settings.PreviewServerSettings
-    akka.http.scaladsl.settings.ServerSentEventSettings
-    akka.http.scaladsl.model.headers.CacheDirectives.immutableDirective
-    akka.http.scaladsl.model.headers.X-Forwarded-Host
-    akka.http.scaladsl.model.headers.X-Forwarded-Proto
-    akka.http.scaladsl.model.http2.PeerClosedStreamException
-    akka.http.scaladsl.model.http2.Http2Exception
-    akka.http.scaladsl.model.SimpleRequestResponseAttribute
-    akka.http.scaladsl.model.RequestResponseAssociation
+    org.apache.pekko.http.scaladsl.ClientTransport
+    org.apache.pekko.http.scaladsl.ConnectionContext#httpsClient
+    org.apache.pekko.http.scaladsl.ConnectionContext#httpsServer
+    org.apache.pekko.http.scaladsl.settings.PoolImplementation
+    org.apache.pekko.http.scaladsl.settings.ClientConnectionSettings#transport
+    org.apache.pekko.http.scaladsl.settings.ClientConnectionSettings#withTransport
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#appendHostOverride
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#poolImplementation
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#responseEntitySubscriptionTimeout
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#withHostOverrides
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#withOverrides
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#withPoolImplementation
+    org.apache.pekko.http.scaladsl.settings.ConnectionPoolSettings#withResponseEntitySubscriptionTimeout
+    org.apache.pekko.http.scaladsl.settings.HostOverride
+    org.apache.pekko.http.scaladsl.settings.Http2ServerSettings
+    org.apache.pekko.http.scaladsl.settings.Http2ClientSettings
+    org.apache.pekko.http.scaladsl.settings.PreviewServerSettings
+    org.apache.pekko.http.scaladsl.settings.ServerSentEventSettings
+    org.apache.pekko.http.scaladsl.model.headers.CacheDirectives.immutableDirective
+    org.apache.pekko.http.scaladsl.model.headers.X-Forwarded-Host
+    org.apache.pekko.http.scaladsl.model.headers.X-Forwarded-Proto
+    org.apache.pekko.http.scaladsl.model.http2.PeerClosedStreamException
+    org.apache.pekko.http.scaladsl.model.http2.Http2Exception
+    org.apache.pekko.http.scaladsl.model.SimpleRequestResponseAttribute
+    org.apache.pekko.http.scaladsl.model.RequestResponseAssociation
     ```
 
 Java
 :   ```java
-    akka.http.javadsl.ClientTransport
-    akka.http.javadsl.ConnectionContext#httpsClient
-    akka.http.javadsl.ConnectionContext#httpsServer
-    akka.http.javadsl.settings.ClientConnectionSettings#getTransport
-    akka.http.javadsl.settings.ClientConnectionSettings#withTransport
-    akka.http.javadsl.settings.ConnectionPoolSettings#appendHostOverride
-    akka.http.javadsl.settings.ConnectionPoolSettings#getPoolImplementation
-    akka.http.javadsl.settings.ConnectionPoolSettings#getResponseEntitySubscriptionTimeout
-    akka.http.javadsl.settings.ConnectionPoolSettings#withHostOverrides
-    akka.http.javadsl.settings.ConnectionPoolSettings#withPoolImplementation
-    akka.http.javadsl.settings.ConnectionPoolSettings#withResponseEntitySubscriptionTimeout
-    akka.http.javadsl.settings.PoolImplementation
-    akka.http.javadsl.settings.PreviewServerSettings
-    akka.http.javadsl.settings.ServerSentEventSettings
+    org.apache.pekko.http.javadsl.ClientTransport
+    org.apache.pekko.http.javadsl.ConnectionContext#httpsClient
+    org.apache.pekko.http.javadsl.ConnectionContext#httpsServer
+    org.apache.pekko.http.javadsl.settings.ClientConnectionSettings#getTransport
+    org.apache.pekko.http.javadsl.settings.ClientConnectionSettings#withTransport
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#appendHostOverride
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#getPoolImplementation
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#getResponseEntitySubscriptionTimeout
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#withHostOverrides
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#withPoolImplementation
+    org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings#withResponseEntitySubscriptionTimeout
+    org.apache.pekko.http.javadsl.settings.PoolImplementation
+    org.apache.pekko.http.javadsl.settings.PreviewServerSettings
+    org.apache.pekko.http.javadsl.settings.ServerSentEventSettings
     ```
   
 ## Versioning and Compatibility
diff --git a/docs/src/main/paradox/handling-blocking-operations-in-pekko-http-routes.md b/docs/src/main/paradox/handling-blocking-operations-in-pekko-http-routes.md
index 230e95145..faea77ada 100644
--- a/docs/src/main/paradox/handling-blocking-operations-in-pekko-http-routes.md
+++ b/docs/src/main/paradox/handling-blocking-operations-in-pekko-http-routes.md
@@ -66,7 +66,6 @@ For example, the above screenshot shows an Apache Pekko FJP dispatchers threads,
 named "`default-akka.default-dispatcher2,3,4`" going into the blocking state, after having been idle. 
 It can be observed that the number of new threads increases, "`default-akka.actor.default-dispatcher 18,19,20,...`" 
 however they go to sleep state immediately, thus wasting the resources.
-@java[The same happens to the global @apidoc[ForkJoinPool] when using Java Futures.]
 
 The number of such new threads depends on the default dispatcher configuration,
 but it will likely not exceed 50. Since many POST requests are being processed, the entire
diff --git a/docs/src/main/paradox/routing-dsl/directives/attribute-directives/attribute.md b/docs/src/main/paradox/routing-dsl/directives/attribute-directives/attribute.md
index 6bfb586c1..56ff6d61e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/attribute-directives/attribute.md
+++ b/docs/src/main/paradox/routing-dsl/directives/attribute-directives/attribute.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [AttributeDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/AttributeDirectives.scala) { #attribute }
+@@signature [AttributeDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/AttributeDirectives.scala) { #attribute }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/attribute-directives/optionalAttribute.md b/docs/src/main/paradox/routing-dsl/directives/attribute-directives/optionalAttribute.md
index 912d207a1..e054393e5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/attribute-directives/optionalAttribute.md
+++ b/docs/src/main/paradox/routing-dsl/directives/attribute-directives/optionalAttribute.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [AttributeDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/AttributeDirectives.scala) { #optionalAttribute }
+@@signature [AttributeDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/AttributeDirectives.scala) { #optionalAttribute }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejection.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejection.md
index 15979242a..8382dc375 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejection.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejection.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #cancelRejection }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #cancelRejection }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejections.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejections.md
index 04bdb81ac..276a91233 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejections.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/cancelRejections.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #cancelRejections }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #cancelRejections }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extract.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extract.md
index 1febf1e19..cb0fb1c45 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extract.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extract.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extract }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extract }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractActorSystem.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractActorSystem.md
index c908f6601..185cfde1c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractActorSystem.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractActorSystem.md
@@ -4,13 +4,13 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractActorSystem }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractActorSystem }
 
 @@@
 
 ## Description
 
-Extracts the @apidoc[akka.actor.ActorSystem] from the @apidoc[RequestContext], which can be useful when the external API
+Extracts the @apidoc[org.apache.pekko.actor.ActorSystem] from the @apidoc[RequestContext], which can be useful when the external API
 in your route needs one.
 
 ## Example
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractDataBytes.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractDataBytes.md
index 399c07bbc..d66b57a34 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractDataBytes.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractDataBytes.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractDataBytes }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractDataBytes }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractExecutionContext.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractExecutionContext.md
index fdf96f1bd..b9a664703 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractExecutionContext.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractExecutionContext.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractExecutionContext }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractExecutionContext }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractLog.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractLog.md
index bbd3d2192..10c6140cb 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractLog.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractLog.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractLog }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractLog }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMatchedPath.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMatchedPath.md
index 799997164..3c847e947 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMatchedPath.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMatchedPath.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractMatchedPath }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractMatchedPath }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMaterializer.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMaterializer.md
index 2e49fd2ce..f74339d91 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMaterializer.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractMaterializer.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractMaterializer }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractMaterializer }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractParserSettings.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractParserSettings.md
index a6e84e688..7a1313e52 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractParserSettings.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractParserSettings.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractParserSettings }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractParserSettings }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequest.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequest.md
index 76d673a9a..d9d054230 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequest }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestContext.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestContext.md
index ead7f2714..237e442d5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestContext.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestContext.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequestContext }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequestContext }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestEntity.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestEntity.md
index fd779329d..5cf1f5385 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestEntity.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractRequestEntity.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequestEntity }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractRequestEntity }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractSettings.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractSettings.md
index 7502bc3bb..2b3e15e9a 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractSettings.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractSettings.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractSettings }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractSettings }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractStrictEntity.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractStrictEntity.md
index 7d5d7dbe3..41813ba50 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractStrictEntity.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractStrictEntity.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractStrictEntity }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractStrictEntity }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUnmatchedPath.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUnmatchedPath.md
index 8517f0378..c2c0e231d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUnmatchedPath.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUnmatchedPath.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractUnmatchedPath }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractUnmatchedPath }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUri.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUri.md
index de2ee11bd..2646877b3 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUri.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/extractUri.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #extractUri }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #extractUri }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapInnerRoute.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapInnerRoute.md
index bd1fb0cb3..2b288b80c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapInnerRoute.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapInnerRoute.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapInnerRoute }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapInnerRoute }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRejections.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRejections.md
index 3f65645cb..86e543144 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRejections.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRejections.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRejections }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRejections }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequest.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequest.md
index 51ea60aeb..e720d0ec5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRequest }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRequest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequestContext.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequestContext.md
index c3690ce56..44eefcc38 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequestContext.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRequestContext.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRequestContext }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRequestContext }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponse.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponse.md
index e4d1ac7d4..02f19d55a 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponse.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponse.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponse }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponse }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseEntity.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseEntity.md
index 7fd8eaad8..c9fe02331 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseEntity.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseEntity.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponseEntity }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponseEntity }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseHeaders.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseHeaders.md
index 1f0238fa0..4e02e479c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseHeaders.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapResponseHeaders.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponseHeaders }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapResponseHeaders }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResult.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResult.md
index 8123813db..5c1551def 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResult.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResult.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResult }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResult }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultFuture.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultFuture.md
index d5c9efc79..71c25a005 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultFuture.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultFuture.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultFuture }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultFuture }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultPF.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultPF.md
index 1af120300..0d4e42c90 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultPF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultPF.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultPF }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultPF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWith.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWith.md
index 4317d7ca8..f33cc54e4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultWith }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWithPF.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWithPF.md
index 3d77ab5ea..7b21d16df 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWithPF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapRouteResultWithPF.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultWithPF }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapRouteResultWithPF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapSettings.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapSettings.md
index b637409fa..0ab8b97c6 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapSettings.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapSettings.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapSettings }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapSettings }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapUnmatchedPath.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapUnmatchedPath.md
index ebb4002e6..b0f42e7b0 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapUnmatchedPath.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/mapUnmatchedPath.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #mapUnmatchedPath }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #mapUnmatchedPath }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/pass.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/pass.md
index 34745afc1..24a987728 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/pass.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/pass.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #pass }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #pass }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/provide.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/provide.md
index d50247ede..a4f0a6152 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/provide.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/provide.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #provide }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #provide }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejections.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejections.md
index 11476b91c..1a2d25232 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejections.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejections.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #recoverRejections }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #recoverRejections }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejectionsWith.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejectionsWith.md
index f8b1c21c1..d244e38e4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejectionsWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/recoverRejectionsWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #recoverRejectionsWith }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #recoverRejectionsWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/textract.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/textract.md
index 43ec34eaa..80ccd1e8b 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/textract.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/textract.md
@@ -10,7 +10,7 @@ The `textract` directive is not available in the Java API.
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #textract }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #textract }
 
 ## Description
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/toStrictEntity.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/toStrictEntity.md
index 2c8ab0d0a..197708d21 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/toStrictEntity.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/toStrictEntity.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #toStrictEntity }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #toStrictEntity }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/tprovide.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/tprovide.md
index 847468a28..a7d381877 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/tprovide.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/tprovide.md
@@ -9,7 +9,7 @@ The `tprovide` directive is not available in the Java API.
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #tprovide }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #tprovide }
 
 ## Description
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withExecutionContext.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withExecutionContext.md
index 33c6bf45e..b416fbd25 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withExecutionContext.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withExecutionContext.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #withExecutionContext }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #withExecutionContext }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withLog.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withLog.md
index 8133d6db5..1ab409616 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withLog.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withLog.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #withLog }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #withLog }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withMaterializer.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withMaterializer.md
index ee79b538b..ae78152e7 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withMaterializer.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withMaterializer.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #withMaterializer }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #withMaterializer }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withSettings.md b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withSettings.md
index 1e389b9cc..0a52b4691 100644
--- a/docs/src/main/paradox/routing-dsl/directives/basic-directives/withSettings.md
+++ b/docs/src/main/paradox/routing-dsl/directives/basic-directives/withSettings.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [BasicDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/BasicDirectives.scala) { #withSettings }
+@@signature [BasicDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/BasicDirectives.scala) { #withSettings }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/cache-condition-directives/conditional.md b/docs/src/main/paradox/routing-dsl/directives/cache-condition-directives/conditional.md
index 193d5a1f7..6e0ea186e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/cache-condition-directives/conditional.md
+++ b/docs/src/main/paradox/routing-dsl/directives/cache-condition-directives/conditional.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CacheConditionDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CacheConditionDirectives.scala) { #conditional }
+@@signature [CacheConditionDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CacheConditionDirectives.scala) { #conditional }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/caching-directives/alwaysCache.md b/docs/src/main/paradox/routing-dsl/directives/caching-directives/alwaysCache.md
index ccfed7cc7..19d127f97 100644
--- a/docs/src/main/paradox/routing-dsl/directives/caching-directives/alwaysCache.md
+++ b/docs/src/main/paradox/routing-dsl/directives/caching-directives/alwaysCache.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CachingDirectives.scala](/http-caching/src/main/scala/akka/http/scaladsl/server/directives/CachingDirectives.scala) { #alwaysCache }
+@@signature [CachingDirectives.scala](/http-caching/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CachingDirectives.scala) { #alwaysCache }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/caching-directives/cache.md b/docs/src/main/paradox/routing-dsl/directives/caching-directives/cache.md
index d27ccb33c..643489628 100644
--- a/docs/src/main/paradox/routing-dsl/directives/caching-directives/cache.md
+++ b/docs/src/main/paradox/routing-dsl/directives/caching-directives/cache.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CachingDirectives.scala](/http-caching/src/main/scala/akka/http/scaladsl/server/directives/CachingDirectives.scala) { #cache }
+@@signature [CachingDirectives.scala](/http-caching/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CachingDirectives.scala) { #cache }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/caching-directives/cachingProhibited.md b/docs/src/main/paradox/routing-dsl/directives/caching-directives/cachingProhibited.md
index 2f018a60d..06a74b3b9 100644
--- a/docs/src/main/paradox/routing-dsl/directives/caching-directives/cachingProhibited.md
+++ b/docs/src/main/paradox/routing-dsl/directives/caching-directives/cachingProhibited.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CachingDirectives.scala](/http-caching/src/main/scala/akka/http/scaladsl/server/directives/CachingDirectives.scala) { #cachingProhibited }
+@@signature [CachingDirectives.scala](/http-caching/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CachingDirectives.scala) { #cachingProhibited }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
index 9e865be69..0ae30e0f4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #decodeRequest }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #decodeRequest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
index 885369931..0d3a1165a 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/decodeRequestWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #decodeRequestWith }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #decodeRequestWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponse.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponse.md
index 10bc1b2e2..de240d9b1 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponse.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponse.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #encodeResponse }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #encodeResponse }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponseWith.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponseWith.md
index d6e6edc97..bbc052131 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponseWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/encodeResponseWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #encodeResponseWith }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #encodeResponseWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/requestEncodedWith.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/requestEncodedWith.md
index 779a8810e..a5ddac2a7 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/requestEncodedWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/requestEncodedWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #requestEncodedWith }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #requestEncodedWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/responseEncodingAccepted.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/responseEncodingAccepted.md
index 3e096ce8b..6e2248430 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/responseEncodingAccepted.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/responseEncodingAccepted.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #responseEncodingAccepted }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #responseEncodingAccepted }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/coding-directives/withPrecompressedMediaTypeSupport.md b/docs/src/main/paradox/routing-dsl/directives/coding-directives/withPrecompressedMediaTypeSupport.md
index 25547f3a2..410ae23b2 100644
--- a/docs/src/main/paradox/routing-dsl/directives/coding-directives/withPrecompressedMediaTypeSupport.md
+++ b/docs/src/main/paradox/routing-dsl/directives/coding-directives/withPrecompressedMediaTypeSupport.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CodingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CodingDirectives.scala) { #withPrecompressedMediaTypeSupport }
+@@signature [CodingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CodingDirectives.scala) { #withPrecompressedMediaTypeSupport }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/cookie.md b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/cookie.md
index 786d5cfb7..7d5ac777e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/cookie.md
+++ b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/cookie.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CookieDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala) { #cookie }
+@@signature [CookieDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CookieDirectives.scala) { #cookie }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/deleteCookie.md b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/deleteCookie.md
index ffa8badd1..2e97cf43e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/deleteCookie.md
+++ b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/deleteCookie.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CookieDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala) { #deleteCookie }
+@@signature [CookieDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CookieDirectives.scala) { #deleteCookie }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/optionalCookie.md b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/optionalCookie.md
index ff25f3efe..d81d121ae 100644
--- a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/optionalCookie.md
+++ b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/optionalCookie.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CookieDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala) { #optionalCookie }
+@@signature [CookieDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CookieDirectives.scala) { #optionalCookie }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/setCookie.md b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/setCookie.md
index 7dbd86543..080d52a75 100644
--- a/docs/src/main/paradox/routing-dsl/directives/cookie-directives/setCookie.md
+++ b/docs/src/main/paradox/routing-dsl/directives/cookie-directives/setCookie.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [CookieDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/CookieDirectives.scala) { #setCookie }
+@@signature [CookieDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/CookieDirectives.scala) { #setCookie }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/custom-directives.md b/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
index 801a6cf54..e02234713 100644
--- a/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
+++ b/docs/src/main/paradox/routing-dsl/directives/custom-directives.md
@@ -58,7 +58,7 @@ for simple transformations:
 
 @@snip [CustomDirectivesExamplesSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/directives/CustomDirectivesExamplesSpec.scala) { #map-0 }
 
-One example of a predefined directive relying on `map` is the @github[optionalHeaderValue](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue } directive.
+One example of a predefined directive relying on `map` is the @github[optionalHeaderValue](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue } directive.
 
 The tmap modifier has this signature (somewhat simplified):
 
@@ -102,7 +102,7 @@ from the RequestContext with the extract directive and then flatMap with
 some kind of filtering logic. For example, this is the implementation
 of the method directive:
 
-@@snip [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #method }
+@@snip [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #method }
 
 The explicit type parameter `[Unit]` on the flatMap is needed in this case
 because the result of the flatMap is directly concatenated with the
@@ -124,7 +124,7 @@ def require(predicate: T => Boolean, rejections: Rejection*): Directive0
 
 One example of a predefined directive relying on require is the first overload of the host directive:
 
-@@snip[HostDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala) { #require-host }
+@@snip[HostDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HostDirectives.scala) { #require-host }
 
 You can only call require on single-extraction directives. The trequire modifier is the
 more general variant, which takes a predicate of type `Tuple => Boolean`.
@@ -152,7 +152,7 @@ def recoverPF[R >: L: Tuple](
 
 One example of a predefined directive relying `recoverPF` is the `optionalHeaderValue` directive:
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue }
 
 ### collect and tcollect
 
@@ -172,7 +172,7 @@ The third option for creating custom directives is to do it “from scratch”,
 either by using `Directive.apply` or by subclassing `Directive` class directly. The `Directive` is defined like this
 (leaving away operators and modifiers):
 
-@@snip [Directive.scala](/http/src/main/scala/akka/http/scaladsl/server/Directive.scala) { #basic }
+@@snip [Directive.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/Directive.scala) { #basic }
 
 It only has one abstract member that you need to implement, the `tapply` method, which creates
 the Route the directives presents to the outside from its inner Route building function
diff --git a/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleExceptions.md b/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleExceptions.md
index 49ea1619e..073cba577 100644
--- a/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleExceptions.md
+++ b/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleExceptions.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [ExecutionDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala) { #handleExceptions }
+@@signature [ExecutionDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/ExecutionDirectives.scala) { #handleExceptions }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleRejections.md b/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleRejections.md
index 4161d0e9d..5d6ca59d3 100644
--- a/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleRejections.md
+++ b/docs/src/main/paradox/routing-dsl/directives/execution-directives/handleRejections.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [ExecutionDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/ExecutionDirectives.scala) { #handleRejections }
+@@signature [ExecutionDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/ExecutionDirectives.scala) { #handleRejections }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.md
index badef284d..e60630a13 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectories.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromBrowseableDirectories }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromBrowseableDirectories }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.md
index 1c10247eb..a5c6a1fea 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromBrowseableDirectory.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromBrowseableDirectory }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromBrowseableDirectory }
 
 @@@
 
@@ -34,7 +34,7 @@ Directives which list directories (e.g. `getFromBrowsableDirectory`) use an impl
 instance to perform the actual rendering of the file listing. This rendered can be easily overridden by simply
 providing one in-scope for the directives to use, so you can build your custom directory listings.
 
-The default renderer is `akka.http.scaladsl.server.directives.FileAndResourceDirectives.defaultDirectoryRenderer`,
+The default renderer is `org.apache.pekko.http.scaladsl.server.directives.FileAndResourceDirectives.defaultDirectoryRenderer`,
 and renders a listing which looks like this:
 
 ![akka-http-file-listing.png](../../../akka-http-file-listing.png)
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromDirectory.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromDirectory.md
index bce66a6b6..dca4dc511 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromDirectory.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromDirectory.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromDirectory }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromDirectory }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromFile.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromFile.md
index f6fab0a57..238039922 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromFile.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromFile.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromFile }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromFile }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResource.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResource.md
index 31100307f..839169286 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResource.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResource.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromResource }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromResource }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.md
index 71de2e55a..e0c4de8ed 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/getFromResourceDirectory.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromResourceDirectory }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #getFromResourceDirectory }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.md b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.md
index 23ccec123..1efffadc2 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-and-resource-directives/listDirectoryContents.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #listDirectoryContents }
+@@signature [FileAndResourceDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileAndResourceDirectives.scala) { #listDirectoryContents }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUpload.md b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUpload.md
index 21537d531..7b672bc8c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUpload.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUpload.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FileUploadDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala) { #fileUpload }
+@@signature [FileUploadDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectives.scala) { #fileUpload }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUploadAll.md b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUploadAll.md
index c30f884b8..203a32405 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUploadAll.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/fileUploadAll.md
@@ -4,7 +4,7 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [FileUploadDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala) { #fileUploadAll }
+@@signature [FileUploadDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectives.scala) { #fileUploadAll }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFile.md b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFile.md
index 79500c750..a96148ec0 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFile.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFile.md
@@ -4,7 +4,7 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [FileUploadDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala) { #storeUploadedFile }
+@@signature [FileUploadDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectives.scala) { #storeUploadedFile }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFiles.md b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFiles.md
index 0da3dab23..09a4c655e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFiles.md
+++ b/docs/src/main/paradox/routing-dsl/directives/file-upload-directives/storeUploadedFiles.md
@@ -4,7 +4,7 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [FileUploadDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FileUploadDirectives.scala) { #storeUploadedFiles }
+@@signature [FileUploadDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FileUploadDirectives.scala) { #storeUploadedFiles }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMap.md b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMap.md
index 472da1ddf..e74b32981 100644
--- a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMap.md
+++ b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMap.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FormFieldDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldMap }
+@@signature [FormFieldDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldMap }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMultiMap.md b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMultiMap.md
index a92fd7eaf..5550b4a75 100644
--- a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMultiMap.md
+++ b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldMultiMap.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FormFieldDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldMultiMap }
+@@signature [FormFieldDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldMultiMap }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldSeq.md b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldSeq.md
index a5c24ed5e..0c8a89b73 100644
--- a/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldSeq.md
+++ b/docs/src/main/paradox/routing-dsl/directives/form-field-directives/formFieldSeq.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FormFieldDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldSeq }
+@@signature [FormFieldDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FormFieldDirectives.scala) { #formFieldSeq }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/future-directives/completeOrRecoverWith.md b/docs/src/main/paradox/routing-dsl/directives/future-directives/completeOrRecoverWith.md
index 6af3d197d..86f45db9f 100644
--- a/docs/src/main/paradox/routing-dsl/directives/future-directives/completeOrRecoverWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/future-directives/completeOrRecoverWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FutureDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala) { #completeOrRecoverWith }
+@@signature [FutureDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FutureDirectives.scala) { #completeOrRecoverWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md b/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
index 3f514eee3..371692fff 100644
--- a/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
+++ b/docs/src/main/paradox/routing-dsl/directives/future-directives/onComplete.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FutureDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala) { #onComplete }
+@@signature [FutureDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FutureDirectives.scala) { #onComplete }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/future-directives/onCompleteWithBreaker.md b/docs/src/main/paradox/routing-dsl/directives/future-directives/onCompleteWithBreaker.md
index 711c11cc3..9e80b8dcb 100644
--- a/docs/src/main/paradox/routing-dsl/directives/future-directives/onCompleteWithBreaker.md
+++ b/docs/src/main/paradox/routing-dsl/directives/future-directives/onCompleteWithBreaker.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [FutureDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/FutureDirectives.scala) { #onCompleteWithBreaker }
+@@signature [FutureDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/FutureDirectives.scala) { #onCompleteWithBreaker }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/checkSameOrigin.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/checkSameOrigin.md
index 130ac3681..46595911e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/checkSameOrigin.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/checkSameOrigin.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #checkSameOrigin }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #checkSameOrigin }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValue.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValue.md
index 3258f87c7..85f975df5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValue.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValue.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValue }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValue }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValueByName.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValueByName.md
index 9213099d0..0ecdf770b 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValueByName.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValueByName.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValueByName }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValueByName }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValuePF.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValuePF.md
index 349fe7e6d..9ffa00125 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValuePF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/headerValuePF.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValuePF }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #headerValuePF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValue.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValue.md
index b76966fce..529d3720b 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValue.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValue.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValue }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValueByName.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValueByName.md
index 5d9377d4b..43e6167e6 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValueByName.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValueByName.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValueByName }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValueByName }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValuePF.md b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValuePF.md
index 6b74556dc..ca0f00f81 100644
--- a/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValuePF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/header-directives/optionalHeaderValuePF.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [HeaderDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValuePF }
+@@signature [HeaderDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HeaderDirectives.scala) { #optionalHeaderValuePF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/host-directives/extractHost.md b/docs/src/main/paradox/routing-dsl/directives/host-directives/extractHost.md
index 6d03c98b6..f4f4fc967 100644
--- a/docs/src/main/paradox/routing-dsl/directives/host-directives/extractHost.md
+++ b/docs/src/main/paradox/routing-dsl/directives/host-directives/extractHost.md
@@ -7,7 +7,7 @@ to its inner route.
 
 ## Signature
 
-@@signature [HostDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala) { #extractHost }
+@@signature [HostDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HostDirectives.scala) { #extractHost }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/host-directives/host.md b/docs/src/main/paradox/routing-dsl/directives/host-directives/host.md
index b0c46707e..ecd02993c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/host-directives/host.md
+++ b/docs/src/main/paradox/routing-dsl/directives/host-directives/host.md
@@ -7,7 +7,7 @@ in the request.
 
 ## Signature
 
-@@signature [HostDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/HostDirectives.scala) { #host }
+@@signature [HostDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/HostDirectives.scala) { #host }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/index.md b/docs/src/main/paradox/routing-dsl/directives/index.md
index 342fd2993..cc8e28bc9 100644
--- a/docs/src/main/paradox/routing-dsl/directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/index.md
@@ -368,7 +368,7 @@ Java
 anyOf(this::extractClientIP, this::extractMethod, routeProvider) // doesn't compile
 anyOf(bindParameter(this::parameter, "foo"), bindParameter(this::parameter, "bar"), routeProvider) // ok
 ```
-In this previous example we make use of the `bindParameter` function located in `pekko-http/akka.http.javadsl.common.PartialApplication`.
+In this previous example we make use of the `bindParameter` function located in `http/org.apache.pekko.http.javadsl.common.PartialApplication`.
 In order to be able to call `anyOf`, we need to convert our directive that takes 2 parameters to a function that takes only 1.
 In this particular case we want to use the `parameter` directive that takes a `String` and a function from `String` to @scala[@scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult])]@java[@javadoc[Route](akka.http.javadsl.server.Route)],
 so to be able to use it in combination with `anyOf`, we need to bind the first parameter to `foo` and to `bar` in the second one. `bindParameter(this::parameter, "foo")` is equivalent 
diff --git a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/completeWith.md b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/completeWith.md
index 0958cde85..c17ba0fb5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/completeWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/completeWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MarshallingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala) { #completeWith }
+@@signature [MarshallingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MarshallingDirectives.scala) { #completeWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/entity.md b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/entity.md
index 1dcf41895..f5f6bae93 100644
--- a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/entity.md
+++ b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/entity.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MarshallingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala) { #entity }
+@@signature [MarshallingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MarshallingDirectives.scala) { #entity }
 
 @@@
 
@@ -15,7 +15,7 @@ returns an `Either` with `Right(value)` if successful or `Left(exception)` for a
 The `entity` method will either pass the `value` to the inner route or map the `exception` to a
 @apidoc[Rejection].
 
-@scala[The `entity` directive works in conjunction with `as` and `akka.http.scaladsl.unmarshalling` to
+@scala[The `entity` directive works in conjunction with `as` and `org.apache.pekko.http.scaladsl.unmarshalling` to
 convert some serialized "wire format" value into a higher-level object structure.]  
 @ref[The unmarshalling documentation](../../../common/unmarshalling.md) explains this process in detail.
 This directive simplifies extraction and error handling to the specified type from the request.
diff --git a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/handleWith.md b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/handleWith.md
index d0feb87bc..9d5a9e056 100644
--- a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/handleWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/handleWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MarshallingDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala) { #handleWith }
+@@signature [MarshallingDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MarshallingDirectives.scala) { #handleWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/index.md b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/index.md
index 39f78e70b..7793a286e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/index.md
+++ b/docs/src/main/paradox/routing-dsl/directives/marshalling-directives/index.md
@@ -1,6 +1,6 @@
 # Marshalling Directives
 
-Marshalling directives work in conjunction with `akka.http.scaladsl.marshalling` and `akka.http.scaladsl.unmarshalling` to convert
+Marshalling directives work in conjunction with `org.apache.pekko.http.scaladsl.marshalling` and `org.apache.pekko.http.scaladsl.unmarshalling` to convert
 a request entity to a specific type or a type to a response.
 
 See @ref[marshalling](../../../common/marshalling.md) and @ref[unmarshalling](../../../common/unmarshalling.md) for specific
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/delete.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/delete.md
index d3cfa62fd..1b588041b 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/delete.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/delete.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `DELETE`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #delete }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #delete }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/extractMethod.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/extractMethod.md
index bf213a6de..a784fee9b 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/extractMethod.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/extractMethod.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #extractMethod }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #extractMethod }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/get.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/get.md
index e0c38c75d..6078e0bc2 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/get.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/get.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `GET`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #get }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #get }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/head.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/head.md
index c8cd2722e..2377ff6f2 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/head.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/head.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `HEAD`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #head }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #head }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/method.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/method.md
index 251837923..1fc6b21e9 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/method.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/method.md
@@ -6,7 +6,7 @@ Matches HTTP requests based on their method.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #method }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #method }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/options.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/options.md
index a703edf0e..d1b1f8c37 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/options.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/options.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `OPTIONS`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #options }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #options }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/overrideMethodWithParameter.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/overrideMethodWithParameter.md
index 88f0fd8e0..48a78dc0c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/overrideMethodWithParameter.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/overrideMethodWithParameter.md
@@ -3,7 +3,7 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #overrideMethodWithParameter }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #overrideMethodWithParameter }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/patch.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/patch.md
index d27d16fc6..66c2443c7 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/patch.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/patch.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `PATCH`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #patch }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #patch }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/post.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/post.md
index 9a6fcab06..3c054ff93 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/post.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/post.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `POST`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #post }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #post }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/method-directives/put.md b/docs/src/main/paradox/routing-dsl/directives/method-directives/put.md
index b7e37e422..fd1cbd666 100644
--- a/docs/src/main/paradox/routing-dsl/directives/method-directives/put.md
+++ b/docs/src/main/paradox/routing-dsl/directives/method-directives/put.md
@@ -6,7 +6,7 @@ Matches requests with HTTP method `PUT`.
 
 ## Signature
 
-@@signature [MethodDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MethodDirectives.scala) { #put }
+@@signature [MethodDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MethodDirectives.scala) { #put }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/extractClientIP.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/extractClientIP.md
index 0b7fb7510..3250e1b64 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/extractClientIP.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/extractClientIP.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #extractClientIP }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #extractClientIP }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/rejectEmptyResponse.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/rejectEmptyResponse.md
index d1f3801a3..890ccc62c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/rejectEmptyResponse.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/rejectEmptyResponse.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #rejectEmptyResponse }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #rejectEmptyResponse }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityEmpty.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityEmpty.md
index 263608269..651f320ec 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityEmpty.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityEmpty.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #requestEntityEmpty }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #requestEntityEmpty }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityPresent.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityPresent.md
index bbc07559f..d009dc500 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityPresent.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/requestEntityPresent.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #requestEntityPresent }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #requestEntityPresent }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/selectPreferredLanguage.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/selectPreferredLanguage.md
index 49ae60342..916b9b919 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/selectPreferredLanguage.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/selectPreferredLanguage.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #selectPreferredLanguage }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #selectPreferredLanguage }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/validate.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/validate.md
index 3acab2c7a..da9ac0fed 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/validate.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/validate.md
@@ -6,7 +6,7 @@ Allows validating a precondition before handling a route.
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #validate }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #validate }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/withSizeLimit.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/withSizeLimit.md
index 1e4b4f102..7d8d24a76 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/withSizeLimit.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/withSizeLimit.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #withSizeLimit }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #withSizeLimit }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/misc-directives/withoutSizeLimit.md b/docs/src/main/paradox/routing-dsl/directives/misc-directives/withoutSizeLimit.md
index 7f3bf2990..aa6d6d5fa 100644
--- a/docs/src/main/paradox/routing-dsl/directives/misc-directives/withoutSizeLimit.md
+++ b/docs/src/main/paradox/routing-dsl/directives/misc-directives/withoutSizeLimit.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [MiscDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/MiscDirectives.scala) { #withoutSizeLimit }
+@@signature [MiscDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/MiscDirectives.scala) { #withoutSizeLimit }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMap.md b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMap.md
index be5835e8f..f39395d7c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMap.md
+++ b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMap.md
@@ -3,7 +3,7 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [ParameterDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterMap }
+@@signature [ParameterDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterMap }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMultiMap.md b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMultiMap.md
index c2aa785ac..76f55769d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMultiMap.md
+++ b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterMultiMap.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [ParameterDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterMultiMap }
+@@signature [ParameterDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterMultiMap }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterSeq.md b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterSeq.md
index f40ce5905..15ddd4333 100644
--- a/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterSeq.md
+++ b/docs/src/main/paradox/routing-dsl/directives/parameter-directives/parameterSeq.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [ParameterDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterSeq }
+@@signature [ParameterDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/ParameterDirectives.scala) { #parameterSeq }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/ignoreTrailingSlash.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/ignoreTrailingSlash.md
index 16112b29d..6f8c7a0d5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/ignoreTrailingSlash.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/ignoreTrailingSlash.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #ignoreTrailingSlash }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #ignoreTrailingSlash }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/path.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/path.md
index ad94b4d20..6fe3ebb2a 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/path.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/path.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #path }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #path }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEnd.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEnd.md
index 3ebc42871..f280273e3 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEnd.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEnd.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathEnd }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathEnd }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEndOrSingleSlash.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEndOrSingleSlash.md
index fb2bb5602..cadd1211c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEndOrSingleSlash.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathEndOrSingleSlash.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathEndOrSingleSlash }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathEndOrSingleSlash }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefix.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefix.md
index 1fa6dd048..f7f14d71e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefix.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefix.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathPrefix }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathPrefix }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefixTest.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefixTest.md
index be6cef93d..70536d8a0 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefixTest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathPrefixTest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathPrefixTest }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathPrefixTest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSingleSlash.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSingleSlash.md
index 43780dd55..08751ba75 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSingleSlash.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSingleSlash.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathSingleSlash }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathSingleSlash }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffix.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffix.md
index 3786f3ffa..b5214fab0 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffix.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffix.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathSuffix }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathSuffix }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffixTest.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffixTest.md
index 287ceed12..824b111b9 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffixTest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/pathSuffixTest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #pathSuffixTest }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #pathSuffixTest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefix.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefix.md
index 78bac72df..617a9a28d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefix.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefix.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #rawPathPrefix }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #rawPathPrefix }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefixTest.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefixTest.md
index aec97a7ee..06b5643b1 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefixTest.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/rawPathPrefixTest.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #rawPathPrefixTest }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #rawPathPrefixTest }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.md
index dd4f11d34..05e7e76f1 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToNoTrailingSlashIfPresent.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #redirectToNoTrailingSlashIfPresent }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #redirectToNoTrailingSlashIfPresent }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.md b/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.md
index 7230bb421..db0974a17 100644
--- a/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.md
+++ b/docs/src/main/paradox/routing-dsl/directives/path-directives/redirectToTrailingSlashIfMissing.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [PathDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/PathDirectives.scala) { #redirectToTrailingSlashIfMissing }
+@@signature [PathDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/PathDirectives.scala) { #redirectToTrailingSlashIfMissing }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.md b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.md
index 42677136a..93e4304c6 100644
--- a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.md
+++ b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeader.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RespondWithDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithDefaultHeader }
+@@signature [RespondWithDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithDefaultHeader }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.md b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.md
index 0e0479054..a8efaf8be 100644
--- a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.md
+++ b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithDefaultHeaders.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RespondWithDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithDefaultHeaders }
+@@signature [RespondWithDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithDefaultHeaders }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeader.md b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeader.md
index 7747cc24a..7ff78ae24 100644
--- a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeader.md
+++ b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeader.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RespondWithDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithHeader }
+@@signature [RespondWithDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithHeader }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeaders.md b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeaders.md
index cdbc6cefc..35dd8f211 100644
--- a/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeaders.md
+++ b/docs/src/main/paradox/routing-dsl/directives/respond-with-directives/respondWithHeaders.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RespondWithDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithHeaders }
+@@signature [RespondWithDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RespondWithDirectives.scala) { #respondWithHeaders }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/failWith.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/failWith.md
index 540418424..8a0a52f37 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/failWith.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/failWith.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RouteDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala) { #failWith }
+@@signature [RouteDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RouteDirectives.scala) { #failWith }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
index 2433646b1..5403ecf00 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/handle.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RouteDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala) { #handle }
+@@signature [RouteDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RouteDirectives.scala) { #handle }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
index 0568d331a..cef33320e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/handleSync.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RouteDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala) { #handleSync }
+@@signature [RouteDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RouteDirectives.scala) { #handleSync }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/redirect.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/redirect.md
index 592549cdb..8a34946d5 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/redirect.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/redirect.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RouteDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala) { #redirect }
+@@signature [RouteDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RouteDirectives.scala) { #redirect }
 
 @@@
 
@@ -16,7 +16,7 @@ Completes the request with a redirection response to a given target URI and of a
 It is equivalent to this snippet relying on the `complete` method on @apidoc[RequestContext], and a directive is also available:
 
 Scala
-:   @@snip [RequestContextImpl.scala](/http/src/main/scala/akka/http/scaladsl/server/RequestContextImpl.scala) { #red-impl }
+:   @@snip [RequestContextImpl.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/RequestContextImpl.scala) { #red-impl }
 
 Java
 :  @@snip [RouteDirectivesExamplesTest.java](/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java) { #red-impl }
diff --git a/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md b/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
index ec4ad87a4..a58109e24 100644
--- a/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
+++ b/docs/src/main/paradox/routing-dsl/directives/route-directives/reject.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [RouteDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/RouteDirectives.scala) { #reject }
+@@signature [RouteDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/RouteDirectives.scala) { #reject }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/scheme-directives/extractScheme.md b/docs/src/main/paradox/routing-dsl/directives/scheme-directives/extractScheme.md
index 42a9f268d..7d09b9285 100644
--- a/docs/src/main/paradox/routing-dsl/directives/scheme-directives/extractScheme.md
+++ b/docs/src/main/paradox/routing-dsl/directives/scheme-directives/extractScheme.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [SchemeDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala) { #extractScheme }
+@@signature [SchemeDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SchemeDirectives.scala) { #extractScheme }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/scheme-directives/scheme.md b/docs/src/main/paradox/routing-dsl/directives/scheme-directives/scheme.md
index 8a2a5073d..30c13d7f4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/scheme-directives/scheme.md
+++ b/docs/src/main/paradox/routing-dsl/directives/scheme-directives/scheme.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [SchemeDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SchemeDirectives.scala) { #scheme }
+@@signature [SchemeDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SchemeDirectives.scala) { #scheme }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
index dd1585865..a62f20e25 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasic.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #Authenticator }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #Authenticator }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasic }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasic }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
index ba37128c1..334bc0ee4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicAsync.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticator }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticator }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicAsync }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicAsync }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
index 6e30559b1..e72f1a5d3 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPF.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticatorPF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticatorPF }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicPF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicPF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
index f1828065c..c8817757e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateBasicPFAsync.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticatorPF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticatorPF }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicPFAsync }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateBasicPFAsync }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
index 0d1e3a65d..6fcf432d6 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #Authenticator }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #Authenticator }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2 }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2 }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
index c796d9e6a..2b868af2c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2Async.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticator }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticator }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2Async }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2Async }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
index 81d1f8a7f..9a8c6c7e1 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PF.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticatorPF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticatorPF }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2PF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2PF }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
index 61982a40f..aff75b046 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOAuth2PFAsync.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticatorPF }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AsyncAuthenticatorPF }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2PFAsync }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOAuth2PFAsync }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.md
index d59fa8ead..1565f1710 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authenticateOrRejectWithChallenge.md
@@ -3,9 +3,9 @@
 @@@ div { .group-scala }
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticationResult }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #AuthenticationResult }
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOrRejectWithChallenge }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authenticateOrRejectWithChallenge }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authorize.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authorize.md
index 093ca7ee0..ac2fbf7bf 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authorize.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authorize.md
@@ -6,7 +6,7 @@ Applies the given authorization check to the request.
 
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authorize }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authorize }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/authorizeAsync.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/authorizeAsync.md
index 58e2940d1..e8eb19d75 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/authorizeAsync.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/authorizeAsync.md
@@ -6,7 +6,7 @@ Applies the given authorization check to the request.
 
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #authorizeAsync }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #authorizeAsync }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/security-directives/extractCredentials.md b/docs/src/main/paradox/routing-dsl/directives/security-directives/extractCredentials.md
index 0ce0877ec..518ff01bb 100644
--- a/docs/src/main/paradox/routing-dsl/directives/security-directives/extractCredentials.md
+++ b/docs/src/main/paradox/routing-dsl/directives/security-directives/extractCredentials.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [SecurityDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/SecurityDirectives.scala) { #extractCredentials }
+@@signature [SecurityDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/SecurityDirectives.scala) { #extractCredentials }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/extractRequestTimeout.md b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/extractRequestTimeout.md
index 49d9b3c47..20a597e50 100644
--- a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/extractRequestTimeout.md
+++ b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/extractRequestTimeout.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [TimeoutDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/TimeoutDirectives.scala) { #extractRequestTimeout }
+@@signature [TimeoutDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/TimeoutDirectives.scala) { #extractRequestTimeout }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeout.md b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeout.md
index 103ed40ea..51f8a2b3d 100644
--- a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeout.md
+++ b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeout.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [TimeoutDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withRequestTimeout }
+@@signature [TimeoutDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withRequestTimeout }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeoutResponse.md b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeoutResponse.md
index 986eb1d0c..9dd7b211c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeoutResponse.md
+++ b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withRequestTimeoutResponse.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [TimeoutDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withRequestTimeoutResponse }
+@@signature [TimeoutDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withRequestTimeoutResponse }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withoutRequestTimeout.md b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withoutRequestTimeout.md
index 1baa31eb4..4d1974d21 100644
--- a/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withoutRequestTimeout.md
+++ b/docs/src/main/paradox/routing-dsl/directives/timeout-directives/withoutRequestTimeout.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [TimeoutDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withoutRequestTimeout }
+@@signature [TimeoutDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/TimeoutDirectives.scala) { #withoutRequestTimeout }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractOfferedWsProtocols.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractOfferedWsProtocols.md
index d1d7093e3..b3783a499 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractOfferedWsProtocols.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractOfferedWsProtocols.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractOfferedWsProtocols }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractOfferedWsProtocols }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractUpgradeToWebSocket.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractUpgradeToWebSocket.md
index 82e272f20..f2e5c0da4 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractUpgradeToWebSocket.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractUpgradeToWebSocket.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractUpgradeToWebSocket }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractUpgradeToWebSocket }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractWebSocketUpgrade.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractWebSocketUpgrade.md
index 5057ca184..d679bad2e 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractWebSocketUpgrade.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/extractWebSocketUpgrade.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractWebSocketUpgrade }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #extractWebSocketUpgrade }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessages.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessages.md
index 697e3c4af..0d30e5a1c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessages.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessages.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessages }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessages }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForOptionalProtocol.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForOptionalProtocol.md
index 2f8baf8d0..9c978800c 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForOptionalProtocol.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForOptionalProtocol.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessagesForOptionalProtocol }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessagesForOptionalProtocol }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForProtocol.md b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForProtocol.md
index 83472d50b..9a3184a54 100644
--- a/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForProtocol.md
+++ b/docs/src/main/paradox/routing-dsl/directives/websocket-directives/handleWebSocketMessagesForProtocol.md
@@ -4,7 +4,7 @@
 
 ## Signature
 
-@@signature [WebSocketDirectives.scala](/http/src/main/scala/akka/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessagesForProtocol }
+@@signature [WebSocketDirectives.scala](/http/src/main/scala/org/apache/pekko/http/scaladsl/server/directives/WebSocketDirectives.scala) { #handleWebSocketMessagesForProtocol }
 
 @@@
 
diff --git a/docs/src/main/paradox/routing-dsl/overview.md b/docs/src/main/paradox/routing-dsl/overview.md
index eb51331fd..70fe011a4 100644
--- a/docs/src/main/paradox/routing-dsl/overview.md
+++ b/docs/src/main/paradox/routing-dsl/overview.md
@@ -18,7 +18,7 @@ service definition as [DRY](https://en.wikipedia.org/wiki/Don%27t_repeat_yoursel
 As an alternative Apache Pekko HTTP provides a flexible DSL for expressing your service behavior as a structure of
 composable elements (called @ref[Directives](directives/index.md)) in a concise and readable way. Directives are assembled into a so called
 *route structure* which, at its top-level, can be used to create a handler @apidoc[Flow] or async handler function that
-can be directly supplied to a `bind` call. @scala[The conversion from @scaladoc[Route](akka.http.scaladsl.server.index#Route=akka.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[akka.http.scaladsl.server.RouteResult]) to flow can either be invoked explicitly
+can be directly supplied to a `bind` call. @scala[The conversion from @scaladoc[Route](org.apache.pekko.http.scaladsl.server.index#Route=org.apache.pekko.http.scaladsl.server.RequestContext=%3Escala.concurrent.Future[org.apache.pekko.http.scaladsl.server.RouteResult]) to flow can either be invoked explicitly
 using `Route.toFlow` or, otherwise, the conversion is also provided implicitly by
 `RouteResult.routeToFlow` <a id="^1" href="#1">[1]</a>.]
 
@@ -34,17 +34,17 @@ The core of the Routing DSL becomes available with a single import:
 
 Scala
 :   ```scala
-import akka.http.scaladsl.server.Directives._
+import org.apache.pekko.http.scaladsl.server.Directives._
 ```
 
 Java
 :   ```java
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 ```
 
 @@@ div { .group-java }
 
-Or by extending the `akka.http.javadsl.server.AllDirectives` class which brings together all directives into a single class
+Or by extending the `org.apache.pekko.http.javadsl.server.AllDirectives` class which brings together all directives into a single class
 for easier access:
 
 ```java
@@ -60,7 +60,7 @@ Of course it is possible to directly import only the directives you need (i.e. @
 This example also relies on the pre-defined support for Scala XML with:
 
 ```scala
-import akka.http.scaladsl.marshallers.xml.ScalaXmlSupport._
+import org.apache.pekko.http.scaladsl.marshallers.xml.ScalaXmlSupport._
 ```
 
 @@@
diff --git a/docs/src/main/paradox/routing-dsl/path-matchers.md b/docs/src/main/paradox/routing-dsl/path-matchers.md
index 151e15137..f37a1b5f7 100644
--- a/docs/src/main/paradox/routing-dsl/path-matchers.md
+++ b/docs/src/main/paradox/routing-dsl/path-matchers.md
@@ -25,7 +25,7 @@ Scala
 
 Java
 :   ```java
-    package akka.http.javadsl.server;
+    package org.apache.pekko.http.javadsl.server;
     class PathMatcher0
     class PathMatcher1<T1>
     class PathMatcher2<T1, T2>
diff --git a/docs/src/main/paradox/routing-dsl/routes.md b/docs/src/main/paradox/routing-dsl/routes.md
index 0741638f9..e50c65daf 100644
--- a/docs/src/main/paradox/routing-dsl/routes.md
+++ b/docs/src/main/paradox/routing-dsl/routes.md
@@ -132,7 +132,7 @@ val route =
 @@@ div { .group-java }
 
 ```java
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.http.javadsl.server.Directives.*;
 
 Route route =
   directiveA(concat(() ->
@@ -203,7 +203,7 @@ their Java and Scala DSL representations. You can do so using the `asScala` meth
 Converting Scala DSL routes to Java DSL:
 
 Scala
-:   @@snip [RouteJavaScalaDslConversionSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/RouteJavaScalaDslConversionSpec.scala) { #scala-to-java }
+:   @@snip [RouteJavaScalaDslConversionSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/RouteJavaScalaDslConversionSpec.scala) { #scala-to-java }
 
 Java
 :   @@snip [RouteSealExample.java](/http-tests/src/test/java/docs/http/javadsl/server/RouteJavaScalaDslConversionTest.java) { #scala-to-java }
@@ -211,7 +211,7 @@ Java
 Converting Java DSL routes to Scala DSL:
 
 Scala
-:   @@snip [RouteJavaScalaDslConversionSpec.scala](/http-tests/src/test/scala/akka/http/scaladsl/RouteJavaScalaDslConversionSpec.scala) { #java-to-scala }
+:   @@snip [RouteJavaScalaDslConversionSpec.scala](/http-tests/src/test/scala/org/apache/pekko/http/scaladsl/RouteJavaScalaDslConversionSpec.scala) { #java-to-scala }
 
 Java
 :   @@snip [RouteSealExample.java](/http-tests/src/test/java/docs/http/javadsl/server/RouteJavaScalaDslConversionTest.java) { #java-to-scala }
diff --git a/docs/src/main/paradox/routing-dsl/testkit.md b/docs/src/main/paradox/routing-dsl/testkit.md
index d11215f92..195dd4732 100644
--- a/docs/src/main/paradox/routing-dsl/testkit.md
+++ b/docs/src/main/paradox/routing-dsl/testkit.md
@@ -41,7 +41,7 @@ REQUEST ~> ROUTE ~> check {
 
 In this template *REQUEST* is an expression evaluating to an @apidoc[HttpRequest] instance.
 In most cases your test will, in one way or another, extend from @apidoc[RouteTest] which itself mixes in the
-`akka.http.scaladsl.client.RequestBuilding` trait, which gives you a concise and convenient way of constructing
+`org.apache.pekko.http.scaladsl.client.RequestBuilding` trait, which gives you a concise and convenient way of constructing
 test requests. <a id="^1" href="#1">[1]</a>
 
 *ROUTE* is an expression evaluating to a @ref[Route](routes.md). You can specify one inline or simply refer to the
@@ -120,7 +120,7 @@ Java
 
 The testkit supports a fluent DSL to write compact assertions on the response by chaining assertions
 using "dot-syntax". To simplify working with streamed responses the entity of the response is first "strictified", i.e.
-entity data is collected into a single @apidoc[akka.util.ByteString] and provided the entity is supplied as an `HttpEntityStrict`. This
+entity data is collected into a single @apidoc[org.apache.pekko.util.ByteString] and provided the entity is supplied as an `HttpEntityStrict`. This
 allows to write several assertions against the same entity data which wouldn't (necessarily) be possible for the
 streamed version.
 
@@ -148,7 +148,7 @@ entity data.
 ## Supporting Custom Test Frameworks
 
 Adding support for a custom test framework is achieved by creating new superclass analogous to
-`JUnitRouteTest` for writing tests with the custom test framework deriving from `akka.http.javadsl.testkit.RouteTest`
+`JUnitRouteTest` for writing tests with the custom test framework deriving from `org.apache.pekko.http.javadsl.testkit.RouteTest`
 and implementing its abstract methods. This will allow users of the test framework to use `testRoute` and
 to write assertions using the assertion methods defined on `TestResponse`.
 
@@ -225,7 +225,7 @@ Remember to configure the timeout using `dilated` if you want to account for slo
 
 ## Testing Actor integration
 
-The @scala[`ScalatestRouteTest`]@java[`JUnitRouteTest`] still provides a Classic @apidoc[akka.actor.ActorSystem],
+The @scala[`ScalatestRouteTest`]@java[`JUnitRouteTest`] still provides a Classic @apidoc[org.apache.pekko.actor.ActorSystem],
 so if you are not using the Classic API you will need to adapt it:
 
 Scala
diff --git a/docs/src/main/paradox/server-side/graceful-termination.md b/docs/src/main/paradox/server-side/graceful-termination.md
index 64593474f..9592d2ca9 100644
--- a/docs/src/main/paradox/server-side/graceful-termination.md
+++ b/docs/src/main/paradox/server-side/graceful-termination.md
@@ -67,7 +67,7 @@ Next, all in flight requests will be handled. If a request is "in-flight" (being
   which could trap the server in a situation where it could not terminate if it were to wait for a response to "finish".
     - existing streaming responses must complete before the deadline as well.
       When the deadline is reached the connection will be terminated regardless of status of the streaming responses.
-- if user code does not reply with a response within the deadline we produce a special @java[`akka.http.javadsl.settings.ServerSettings.getTerminationDeadlineExceededResponse`]@scala[`akka.http.scaladsl.settings.ServerSettings.terminationDeadlineExceededResponse`] 
+- if user code does not reply with a response within the deadline we produce a special @java[`org.apache.pekko.http.javadsl.settings.ServerSettings.getTerminationDeadlineExceededResponse`]@scala[`org.apache.pekko.http.scaladsl.settings.ServerSettings.terminationDeadlineExceededResponse`] 
 HTTP response (e.g. `503 Service Unavailable`) with a `Connection: close` header and close connection.
 
 During that time incoming requests continue to be served. The existing connections will remain alive until the 
diff --git a/docs/src/main/paradox/server-side/low-level-api.md b/docs/src/main/paradox/server-side/low-level-api.md
index 71cbeb45a..ab1bcfd67 100644
--- a/docs/src/main/paradox/server-side/low-level-api.md
+++ b/docs/src/main/paradox/server-side/low-level-api.md
@@ -34,7 +34,7 @@ the @ref[HTTP Model](../common/http-model.md) for more information on how HTTP m
 
 ## Starting and Stopping
 
-On the most basic level an Apache Pekko HTTP server is bound by invoking the `bind` method of the @scala[@scaladoc[akka.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[akka.http.javadsl.Http](akka.http.javadsl.Http)]
+On the most basic level an Apache Pekko HTTP server is bound by invoking the `bind` method of the @scala[@scaladoc[org.apache.pekko.http.scaladsl.Http](akka.http.scaladsl.Http$)]@java[@javadoc[org.apache.pekko.http.javadsl.Http](akka.http.javadsl.Http)]
 extension:
 
 Scala
@@ -128,7 +128,7 @@ some other source. Potential scenarios where this might be useful include tests,
 @@@ div { .group-scala }
 On the server-side the stand-alone HTTP layer forms a @apidoc[BidiFlow] that is defined like this:
 
-@@snip [Http.scala](/http-core/src/main/scala/akka/http/scaladsl/Http.scala) { #server-layer }
+@@snip [Http.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/Http.scala) { #server-layer }
 
 You create an instance of `Http.ServerLayer` by calling one of the two overloads of the `Http().serverLayer` method,
 which also allows for varying degrees of configuration.
diff --git a/docs/src/main/paradox/server-side/server-https-support.md b/docs/src/main/paradox/server-side/server-https-support.md
index 12c6fcf2c..ce74a210a 100644
--- a/docs/src/main/paradox/server-side/server-https-support.md
+++ b/docs/src/main/paradox/server-side/server-https-support.md
@@ -6,10 +6,10 @@ The central vehicle for configuring encryption is the @apidoc[HttpsConnectionCon
 the static method `ConnectionContext.httpsServer` which is defined like this:
 
 Scala
-:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/akka/http/scaladsl/ConnectionContext.scala) { #https-server-context-creation }
+:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/ConnectionContext.scala) { #https-server-context-creation }
 
 Java
-:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/akka/http/javadsl/ConnectionContext.scala) { #https-server-context-creation }
+:  @@snip [ConnectionContext.scala](/http-core/src/main/scala/org/apache/pekko/http/javadsl/ConnectionContext.scala) { #https-server-context-creation }
 
 On the server-side, the @apidoc[ServerBuilder] defines a method `enableHttps` with an `httpsContext` parameter,
 which can receive the HTTPS configuration in the form of an `HttpsConnectionContext` instance.
@@ -41,7 +41,7 @@ Scala
 :  @@snip [HttpsServerExampleSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/HttpsServerExampleSpec.scala) { #imports #low-level-default }
 
 Java
-:  @@snip [SimpleServerApp.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java) { #https-http-config }
+:  @@snip [SimpleServerApp.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerApp.java) { #https-http-config }
 
 After that you can pass it to `enableHttps`, like displayed below:
 
@@ -49,7 +49,7 @@ Scala
 :  @@snip [HttpsServerExampleSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/HttpsServerExampleSpec.scala) { #bind-low-level-context }
 
 Java
-:  @@snip [SimpleServerApp.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerApp.java) { #bind-low-level-context }
+:  @@snip [SimpleServerApp.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerApp.java) { #bind-low-level-context }
 
 ## Running both HTTP and HTTPS
 
@@ -60,7 +60,7 @@ Scala
 :  @@snip [HttpsServerExampleSpec.scala](/docs/src/test/scala/docs/http/scaladsl/server/HttpsServerExampleSpec.scala) { #both-https-and-http }
 
 Java
-:  @@snip [SimpleServerHttpHttpsApp.java](/http-tests/src/main/java/akka/http/javadsl/server/examples/simple/SimpleServerHttpHttpsApp.java) { #both-https-and-http }
+:  @@snip [SimpleServerHttpHttpsApp.java](/http-tests/src/main/java/org/apache/pekko/http/javadsl/server/examples/simple/SimpleServerHttpHttpsApp.java) { #both-https-and-http }
 
 ## Mutual authentication
 
diff --git a/docs/src/main/paradox/server-side/websocket-support.md b/docs/src/main/paradox/server-side/websocket-support.md
index 9429c765e..ec27b42d7 100644
--- a/docs/src/main/paradox/server-side/websocket-support.md
+++ b/docs/src/main/paradox/server-side/websocket-support.md
@@ -17,13 +17,13 @@ In the data model the two kinds of messages, binary and text messages, are repre
 @scala[The subclasses @apidoc[BinaryMessage] and @apidoc[TextMessage] contain methods to access the data.]
 @java[The superclass @javadoc[Message](akka.http.javadsl.model.ws.Message)]
 contains `isText` and `isBinary` methods to distinguish a message and `asBinaryMessage` and `asTextMessage` methods to cast a message.]
-Take the API of @apidoc[TextMessage] as an example (@apidoc[BinaryMessage] is very similar with `String` replaced by @apidoc[akka.util.ByteString]):
+Take the API of @apidoc[TextMessage] as an example (@apidoc[BinaryMessage] is very similar with `String` replaced by @apidoc[org.apache.pekko.util.ByteString]):
 
 Scala
-:  @@snip [Message.scala](/http-core/src/main/scala/akka/http/scaladsl/model/ws/Message.scala) { #message-model }
+:  @@snip [Message.scala](/http-core/src/main/scala/org/apache/pekko/http/scaladsl/model/ws/Message.scala) { #message-model }
 
 Java
-:  @@snip [Message.scala](/http-core/src/main/scala/akka/http/javadsl/model/ws/Message.scala) { #message-model }
+:  @@snip [Message.scala](/http-core/src/main/scala/org/apache/pekko/http/javadsl/model/ws/Message.scala) { #message-model }
 
 The data of a message is provided as a stream because WebSocket messages do not have a predefined size and could
 (in theory) be infinitely long. However, only one message can be open per direction of the WebSocket connection,
@@ -32,7 +32,7 @@ single application-level data units like "one event" or "one chat message".
 
 Many messages are small enough to be sent or received in one go. As an opportunity for optimization, the model provides
 the notion of a "strict" message to represent cases where a whole message was received in one go.
-@scala[Strict messages are represented with the `Strict` subclass for each kind of message which contains data as a strict, i.e. non-streamed, @apidoc[akka.util.ByteString] or `String`.]
+@scala[Strict messages are represented with the `Strict` subclass for each kind of message which contains data as a strict, i.e. non-streamed, @apidoc[org.apache.pekko.util.ByteString] or `String`.]
 @java[If `TextMessage.isStrict` returns true, the complete data is already available and can be accessed with `TextMessage.getStrictText` (analogously for @apidoc[BinaryMessage]).]
 
 When receiving data from the network connection the WebSocket implementation tries to create a strict message whenever
diff --git a/docs/src/test/java/docs/http/javadsl/ClientSingleRequestExample.java b/docs/src/test/java/docs/http/javadsl/ClientSingleRequestExample.java
index 33e024a85..a7dc86c03 100644
--- a/docs/src/test/java/docs/http/javadsl/ClientSingleRequestExample.java
+++ b/docs/src/test/java/docs/http/javadsl/ClientSingleRequestExample.java
@@ -5,17 +5,17 @@
 package docs.http.javadsl;
 
 //#unmarshall-response-body
-import akka.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
 
 //#unmarshall-response-body
 
 //#single-request-example
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.examples.petstore.Pet;
-import akka.stream.SystemMaterializer;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.examples.petstore.Pet;
+import org.apache.pekko.stream.SystemMaterializer;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/docs/src/test/java/docs/http/javadsl/ComposeDirectivesExampleTest.java b/docs/src/test/java/docs/http/javadsl/ComposeDirectivesExampleTest.java
index fe90f3de2..c497d8f04 100644
--- a/docs/src/test/java/docs/http/javadsl/ComposeDirectivesExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/ComposeDirectivesExampleTest.java
@@ -4,22 +4,22 @@
 
 package docs.http.javadsl;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.PathMatcher1;
-import akka.http.javadsl.server.Route;
-import akka.stream.ActorMaterializer;
-import akka.stream.javadsl.Flow;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.PathMatcher1;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.javadsl.Flow;
 
-import static akka.http.javadsl.common.PartialApplication.*;
-import static akka.http.javadsl.server.PathMatchers.*;
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.common.PartialApplication.*;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 
 
 import java.util.concurrent.CompletionStage;
diff --git a/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
index 3ad958dc6..ef46d340f 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomHeaderExampleTest.java
@@ -4,15 +4,15 @@
 
 package docs.http.javadsl;
 
-import akka.http.javadsl.model.HttpHeader;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.ModeledCustomHeader;
-import akka.http.javadsl.model.headers.ModeledCustomHeaderFactory;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.japi.JavaPartialFunction;
+import org.apache.pekko.http.javadsl.model.HttpHeader;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.ModeledCustomHeader;
+import org.apache.pekko.http.javadsl.model.headers.ModeledCustomHeaderFactory;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.japi.JavaPartialFunction;
 import org.junit.Test;
 import scala.PartialFunction;
 
@@ -21,9 +21,9 @@ import java.util.Optional;
 import static org.junit.Assert.*;
 
 //#header-value-pf
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.headerValuePF;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValuePF;
 
 //#header-value-pf
 
diff --git a/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
index 419105c1c..a6fcf8435 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomMediaTypesExampleTest.java
@@ -4,20 +4,20 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpCharsets;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.MediaType;
-import akka.http.javadsl.model.MediaTypes;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.settings.ParserSettings;
-import akka.http.javadsl.settings.ServerSettings;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpCharsets;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.MediaType;
+import org.apache.pekko.http.javadsl.model.MediaTypes;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.settings.ParserSettings;
+import org.apache.pekko.http.javadsl.settings.ServerSettings;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -25,11 +25,11 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutionException;
 
 import static org.junit.Assert.assertEquals;
-import static akka.util.ByteString.emptyByteString;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 
 //#application-custom-java
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
 
 //#application-custom-java
 
@@ -82,7 +82,7 @@ public class CustomMediaTypesExampleTest extends JUnitRouteTest {
     final String body = response.entity().toStrict(1000, system).toCompletableFuture().get()
       .getDataBytes().runFold(emptyByteString(), (a, b) -> a.$plus$plus(b), system)
       .toCompletableFuture().get().utf8String();
-    assertEquals("application/custom = class akka.http.scaladsl.model.ContentType$WithFixedCharset", body); // it's the Scala DSL package because it's the only instance of the Java DSL
+    assertEquals("application/custom = class org.apache.pekko.http.scaladsl.model.ContentType$WithFixedCharset", body); // it's the Scala DSL package because it's the only instance of the Java DSL
   }
 
 }
diff --git a/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java b/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
index bb2332ac7..de4dd2ffa 100644
--- a/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/CustomStatusCodesExampleTest.java
@@ -4,22 +4,22 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.ConnectionContext;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCode;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.settings.ClientConnectionSettings;
-import akka.http.javadsl.settings.ConnectionPoolSettings;
-import akka.http.javadsl.settings.ParserSettings;
-import akka.http.javadsl.settings.ServerSettings;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.ConnectionContext;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCode;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
+import org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings;
+import org.apache.pekko.http.javadsl.settings.ParserSettings;
+import org.apache.pekko.http.javadsl.settings.ServerSettings;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.stream.Materializer;
 import org.junit.Test;
 
 import javax.net.ssl.SSLContext;
@@ -30,8 +30,8 @@ import java.util.concurrent.ExecutionException;
 import static org.junit.Assert.assertEquals;
 
 //#application-custom-java
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
 
 //#application-custom-java
 
diff --git a/docs/src/test/java/docs/http/javadsl/ExceptionHandlerExample.java b/docs/src/test/java/docs/http/javadsl/ExceptionHandlerExample.java
index 3007b8083..81713b677 100644
--- a/docs/src/test/java/docs/http/javadsl/ExceptionHandlerExample.java
+++ b/docs/src/test/java/docs/http/javadsl/ExceptionHandlerExample.java
@@ -6,18 +6,18 @@ package docs.http.javadsl;
 
 //#explicit-handler-example
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.ExceptionHandler;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.ExceptionHandler;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.util.concurrent.CompletionStage;
 
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
 
 public class ExceptionHandlerExample extends AllDirectives {
   public static void main(String[] args) {
diff --git a/docs/src/test/java/docs/http/javadsl/ExceptionHandlerInSealExample.java b/docs/src/test/java/docs/http/javadsl/ExceptionHandlerInSealExample.java
index d029791ed..0906d05cf 100644
--- a/docs/src/test/java/docs/http/javadsl/ExceptionHandlerInSealExample.java
+++ b/docs/src/test/java/docs/http/javadsl/ExceptionHandlerInSealExample.java
@@ -5,14 +5,14 @@
 package docs.http.javadsl;
 
 //#seal-handler-example
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.ExceptionHandler;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.server.RejectionHandler;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.ExceptionHandler;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.RejectionHandler;
+import org.apache.pekko.http.javadsl.server.Route;
 
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
 
 public class ExceptionHandlerInSealExample extends AllDirectives {
 
diff --git a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
index 3fe83ad24..d0f5ebdff 100644
--- a/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
+++ b/docs/src/test/java/docs/http/javadsl/Http2ClientApp.java
@@ -4,21 +4,21 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.model.AttributeKey;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.ResponseFuture;
-import akka.http.javadsl.model.headers.AcceptEncoding;
-import akka.http.javadsl.model.headers.HttpEncodings;
-import akka.stream.Materializer;
-import akka.stream.OverflowStrategy;
-import akka.stream.SystemMaterializer;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.stream.javadsl.SourceQueueWithComplete;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.model.AttributeKey;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.ResponseFuture;
+import org.apache.pekko.http.javadsl.model.headers.AcceptEncoding;
+import org.apache.pekko.http.javadsl.model.headers.HttpEncodings;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.stream.javadsl.SourceQueueWithComplete;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 
@@ -37,7 +37,7 @@ public class Http2ClientApp {
   public static void main(String[] args) {
     Config config =
         ConfigFactory.parseString(
-            "#akka.loglevel = debug\n" +
+            "#pekko.loglevel = debug\n" +
                "akka.http.client.http2.log-frames = true\n" +
                "akka.http.client.parsing.max-content-length = 20m"
         ).withFallback(ConfigFactory.load());
diff --git a/docs/src/test/java/docs/http/javadsl/Http2Test.java b/docs/src/test/java/docs/http/javadsl/Http2Test.java
index b5181ebd2..eb85c7c0a 100644
--- a/docs/src/test/java/docs/http/javadsl/Http2Test.java
+++ b/docs/src/test/java/docs/http/javadsl/Http2Test.java
@@ -7,25 +7,25 @@ package docs.http.javadsl;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.HttpsConnectionContext;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.HttpsConnectionContext;
 //#trailingHeaders
-import akka.http.javadsl.model.Trailer;
-import akka.http.javadsl.model.headers.RawHeader;
-import static akka.http.javadsl.model.AttributeKeys.trailer;
+import org.apache.pekko.http.javadsl.model.Trailer;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import static org.apache.pekko.http.javadsl.model.AttributeKeys.trailer;
 
 //#trailingHeaders
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.japi.function.Function;
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.Materializer;
 
 //#bindAndHandleSecure
 //#bindAndHandlePlain
 //#http2Client
 //#http2ClientWithPriorKnowledge
-import akka.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.Http;
 
 //#http2ClientWithPriorKnowledge
 //#http2Client
diff --git a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
index 27e074282..0c32d0eae 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpClientDecodingExampleTest.java
@@ -5,12 +5,12 @@
 package docs.http.javadsl;
 
 //#single-request-decoding-example
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.coding.Coder;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.scaladsl.model.headers.HttpEncodings;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.coding.Coder;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.scaladsl.model.headers.HttpEncodings;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/docs/src/test/java/docs/http/javadsl/HttpClientExampleDocTest.java b/docs/src/test/java/docs/http/javadsl/HttpClientExampleDocTest.java
index df2b6a0d0..8daba0221 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpClientExampleDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpClientExampleDocTest.java
@@ -4,22 +4,22 @@
 
 package docs.http.javadsl;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.*;
-import akka.http.javadsl.model.headers.HttpCredentials;
-import akka.http.javadsl.model.headers.SetCookie;
-import akka.util.ByteString;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.*;
+import org.apache.pekko.http.javadsl.model.headers.HttpCredentials;
+import org.apache.pekko.http.javadsl.model.headers.SetCookie;
+import org.apache.pekko.util.ByteString;
 import scala.concurrent.ExecutionContextExecutor;
-import akka.stream.javadsl.*;
-import akka.http.javadsl.ClientTransport;
-import akka.http.javadsl.settings.ClientConnectionSettings;
-import akka.http.javadsl.settings.ConnectionPoolSettings;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.OutgoingConnection;
+import org.apache.pekko.stream.javadsl.*;
+import org.apache.pekko.http.javadsl.ClientTransport;
+import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
+import org.apache.pekko.http.javadsl.settings.ConnectionPoolSettings;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.OutgoingConnection;
 
-import static akka.http.javadsl.ConnectHttp.toHost;
-import static akka.util.ByteString.emptyByteString;
+import static org.apache.pekko.http.javadsl.ConnectHttp.toHost;
+import static org.apache.pekko.util.ByteString.emptyByteString;
 
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
@@ -31,16 +31,16 @@ import java.io.File;
 
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import akka.stream.javadsl.Framing;
-import akka.http.javadsl.model.*;
+import org.apache.pekko.stream.javadsl.Framing;
+import org.apache.pekko.http.javadsl.model.*;
 import scala.concurrent.duration.FiniteDuration;
 //#manual-entity-consume-example-1
 
 //#single-request-in-actor-example
-import akka.actor.AbstractActor;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import static akka.pattern.PatternsCS.pipe;
+import org.apache.pekko.actor.AbstractActor;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import static org.apache.pekko.pattern.PatternsCS.pipe;
 
 //#single-request-in-actor-example
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
index 0fb538f30..7eab220d0 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpRequestDetailedStringExampleTest.java
@@ -4,8 +4,8 @@
 
 package docs.http.javadsl;
 
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.Authorization;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.Authorization;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
index 5274aa9a5..df9f10bfe 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpResponseDetailedStringExampleTest.java
@@ -4,8 +4,8 @@
 
 package docs.http.javadsl;
 
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.Authorization;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.Authorization;
 import org.junit.Test;
 
 import java.util.Arrays;
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerActorInteractionExample.java b/docs/src/test/java/docs/http/javadsl/HttpServerActorInteractionExample.java
index 9319e114e..3148aaf6e 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerActorInteractionExample.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerActorInteractionExample.java
@@ -6,32 +6,32 @@ package docs.http.javadsl;
 
 //#actor-interaction
 
-import akka.NotUsed;
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.AbstractBehavior;
-import akka.actor.typed.javadsl.ActorContext;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.actor.typed.javadsl.Receive;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
-import akka.stream.javadsl.Flow;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.AbstractBehavior;
+import org.apache.pekko.actor.typed.javadsl.ActorContext;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.actor.typed.javadsl.Receive;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.stream.javadsl.Flow;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 
-import static akka.actor.typed.javadsl.AskPattern.ask;
+import static org.apache.pekko.actor.typed.javadsl.AskPattern.ask;
 
 public class HttpServerActorInteractionExample extends AllDirectives {
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerDynamicRoutingExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpServerDynamicRoutingExampleTest.java
index 1a97fda03..75737ac78 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerDynamicRoutingExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerDynamicRoutingExampleTest.java
@@ -4,12 +4,12 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerLowLevelExample.java b/docs/src/test/java/docs/http/javadsl/HttpServerLowLevelExample.java
index f6336e432..48e3c4fd2 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerLowLevelExample.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerLowLevelExample.java
@@ -5,16 +5,16 @@
 package docs.http.javadsl;
 
 //#low-level-server-example
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.ContentTypes;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCodes;
-import akka.stream.SystemMaterializer;
-import akka.util.ByteString;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.ContentTypes;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.stream.SystemMaterializer;
+import org.apache.pekko.util.ByteString;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerMinimalExampleTest.java b/docs/src/test/java/docs/http/javadsl/HttpServerMinimalExampleTest.java
index e17f7f1f4..d464d8b37 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerMinimalExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerMinimalExampleTest.java
@@ -4,12 +4,12 @@
 
 package docs.http.javadsl;
 //#minimal-routing-example
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerStreamRandomNumbersTest.java b/docs/src/test/java/docs/http/javadsl/HttpServerStreamRandomNumbersTest.java
index 27ccd3310..44db7a7a5 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerStreamRandomNumbersTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerStreamRandomNumbersTest.java
@@ -5,18 +5,18 @@
 package docs.http.javadsl;
 
 //#stream-random-numbers
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 
 import java.util.Random;
 import java.util.concurrent.CompletionStage;
diff --git a/docs/src/test/java/docs/http/javadsl/HttpServerWithActorsSample.java b/docs/src/test/java/docs/http/javadsl/HttpServerWithActorsSample.java
index 8c284f21e..2400cf9a7 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpServerWithActorsSample.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpServerWithActorsSample.java
@@ -13,15 +13,15 @@ package docs.http.javadsl;
 
 //#bootstrap
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.PostStop;
-import akka.actor.typed.javadsl.BehaviorBuilder;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.PostStop;
+import org.apache.pekko.actor.typed.javadsl.BehaviorBuilder;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/docs/src/test/java/docs/http/javadsl/HttpsExamplesDocTest.java b/docs/src/test/java/docs/http/javadsl/HttpsExamplesDocTest.java
index 1b57b6d91..607f09031 100644
--- a/docs/src/test/java/docs/http/javadsl/HttpsExamplesDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/HttpsExamplesDocTest.java
@@ -4,11 +4,11 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.ConnectionContext;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.HttpsConnectionContext;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.ConnectionContext;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.HttpsConnectionContext;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
diff --git a/docs/src/test/java/docs/http/javadsl/JacksonExampleTest.java b/docs/src/test/java/docs/http/javadsl/JacksonExampleTest.java
index d785aea4b..a1c42bf4b 100644
--- a/docs/src/test/java/docs/http/javadsl/JacksonExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/JacksonExampleTest.java
@@ -4,20 +4,20 @@
 
 package docs.http.javadsl;
 //#second-jackson-example
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.stream.javadsl.Flow;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.stream.javadsl.Flow;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
@@ -26,7 +26,7 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import static akka.http.javadsl.server.PathMatchers.longSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.longSegment;
 
 public class JacksonExampleTest extends AllDirectives {
 
diff --git a/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java b/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
index 43c6b48ef..63f526674 100644
--- a/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/JacksonXmlExampleTest.java
@@ -11,12 +11,12 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import com.fasterxml.jackson.annotation.JsonRootName;
 
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 
 public class JacksonXmlExampleTest extends JUnitRouteTest {
 
diff --git a/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java b/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
index 5315b6504..eaa482ea2 100644
--- a/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
+++ b/docs/src/test/java/docs/http/javadsl/JacksonXmlSupport.java
@@ -11,9 +11,9 @@ import java.util.Arrays;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.marshalling.Marshaller;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.marshalling.Marshaller;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 
 public class JacksonXmlSupport {
   private static final ObjectMapper DEFAULT_XML_MAPPER =
diff --git a/docs/src/test/java/docs/http/javadsl/JobRepository.java b/docs/src/test/java/docs/http/javadsl/JobRepository.java
index 6cce83d06..5c5d11f92 100644
--- a/docs/src/test/java/docs/http/javadsl/JobRepository.java
+++ b/docs/src/test/java/docs/http/javadsl/JobRepository.java
@@ -9,9 +9,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Behavior;
-import akka.actor.typed.javadsl.*;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Behavior;
+import org.apache.pekko.actor.typed.javadsl.*;
 import com.fasterxml.jackson.annotation.*;
 
 /**
diff --git a/docs/src/test/java/docs/http/javadsl/JobRoutes.java b/docs/src/test/java/docs/http/javadsl/JobRoutes.java
index 06ce0539a..d99c9cbfd 100644
--- a/docs/src/test/java/docs/http/javadsl/JobRoutes.java
+++ b/docs/src/test/java/docs/http/javadsl/JobRoutes.java
@@ -9,16 +9,16 @@ import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.CompletionStage;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
 
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
 
-import static akka.http.javadsl.server.Directives.*;
-import static akka.http.javadsl.unmarshalling.StringUnmarshallers.LONG;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers.LONG;
 
 /**
  * Routes for use with the HttpServerWithActorsSample
diff --git a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
index 9cedda2ae..f9c0c9f82 100644
--- a/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/ModelDocTest.java
@@ -4,13 +4,13 @@
 
 package docs.http.javadsl;
 
-import akka.util.ByteString;
+import org.apache.pekko.util.ByteString;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
 //#import-model
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.*;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.*;
 
 import java.util.Optional;
 
diff --git a/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java b/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
index d8aac4c5f..fccc02576 100644
--- a/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/RespondWithHeaderHandlerExampleTest.java
@@ -6,19 +6,19 @@ package docs.http.javadsl;
 
 //#respond-with-header-exceptionhandler-example
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.ExceptionHandler;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRoute;
-import akka.http.scaladsl.model.ErrorInfo;
-import akka.http.scaladsl.model.IllegalHeaderException;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.ExceptionHandler;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.scaladsl.model.ErrorInfo;
+import org.apache.pekko.http.scaladsl.model.IllegalHeaderException;
 import org.junit.Test;
 
 import java.io.IOException;
diff --git a/docs/src/test/java/docs/http/javadsl/RouteSealExample.java b/docs/src/test/java/docs/http/javadsl/RouteSealExample.java
index a25e44b80..818ceee02 100644
--- a/docs/src/test/java/docs/http/javadsl/RouteSealExample.java
+++ b/docs/src/test/java/docs/http/javadsl/RouteSealExample.java
@@ -4,12 +4,12 @@
 
 package docs.http.javadsl;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.util.concurrent.CompletionStage;
 
diff --git a/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java b/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
index 85c904c16..0eb1e0642 100644
--- a/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
+++ b/docs/src/test/java/docs/http/javadsl/UnmarshalTest.java
@@ -5,17 +5,17 @@
 package docs.http.javadsl;
 
 import static org.junit.Assert.assertEquals;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
-import akka.util.ByteString;
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.util.ByteString;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.Materializer;
 import org.junit.Test;
 
 //#imports
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
diff --git a/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java b/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
index 53b229c3f..6bfdbe87b 100644
--- a/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/WebSocketClientExampleTest.java
@@ -4,26 +4,26 @@
 
 package docs.http.javadsl;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ClientTransport;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.Authorization;
-import akka.http.javadsl.model.headers.HttpCredentials;
-import akka.http.javadsl.model.ws.Message;
-import akka.http.javadsl.model.ws.TextMessage;
-import akka.http.javadsl.model.ws.WebSocketRequest;
-import akka.http.javadsl.model.ws.WebSocketUpgradeResponse;
-import akka.http.javadsl.settings.ClientConnectionSettings;
-import akka.japi.Pair;
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Keep;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ClientTransport;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.Authorization;
+import org.apache.pekko.http.javadsl.model.headers.HttpCredentials;
+import org.apache.pekko.http.javadsl.model.ws.Message;
+import org.apache.pekko.http.javadsl.model.ws.TextMessage;
+import org.apache.pekko.http.javadsl.model.ws.WebSocketRequest;
+import org.apache.pekko.http.javadsl.model.ws.WebSocketUpgradeResponse;
+import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Keep;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.net.InetSocketAddress;
 import java.util.Arrays;
diff --git a/docs/src/test/java/docs/http/javadsl/server/AkkaHttp1020MigrationExample.java b/docs/src/test/java/docs/http/javadsl/server/AkkaHttp1020MigrationExample.java
index cf753822c..2f48a8d5f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/AkkaHttp1020MigrationExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/AkkaHttp1020MigrationExample.java
@@ -4,13 +4,13 @@
 
 package docs.http.javadsl.server;
 
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import static akka.http.javadsl.server.Directives.*;
-import akka.http.javadsl.server.Route;
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.Materializer;
 
 @SuppressWarnings("deprecation")
 public class AkkaHttp1020MigrationExample {
@@ -18,7 +18,7 @@ public class AkkaHttp1020MigrationExample {
         {
             //#old-binding
             // only worked with classic actor system
-            akka.actor.ActorSystem system = akka.actor.ActorSystem.create("TheSystem");
+            org.apache.pekko.actor.ActorSystem system = org.apache.pekko.actor.ActorSystem.create("TheSystem");
             Materializer mat = ActorMaterializer.create(system);
             Route route = get(() -> complete("Hello World!"));
             Http.get(system).bindAndHandle(route.flow(system), ConnectHttp.toHost("localhost", 8080), mat);
@@ -28,9 +28,9 @@ public class AkkaHttp1020MigrationExample {
         {
             //#new-binding
             // works with classic or typed actor system
-            akka.actor.typed.ActorSystem system = akka.actor.typed.ActorSystem.create(Behaviors.empty(), "TheSystem");
+            org.apache.pekko.actor.typed.ActorSystem system = org.apache.pekko.actor.typed.ActorSystem.create(Behaviors.empty(), "TheSystem");
             // or
-            // akka.actor.ActorSystem system = akka.actor.ActorSystem.create("TheSystem");
+            // org.apache.pekko.actor.ActorSystem system = org.apache.pekko.actor.ActorSystem.create("TheSystem");
 
             // materializer not needed any more
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java b/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
index 879beb5b4..30206d20e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
+++ b/docs/src/test/java/docs/http/javadsl/server/BlockingInHttpExamples.java
@@ -4,23 +4,23 @@
 
 package docs.http.javadsl.server;
 
-import akka.actor.ActorSystem;
-import akka.dispatch.MessageDispatcher;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.dispatch.MessageDispatcher;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.concurrent.CompletableFuture;
 
 //#blocking-example-in-default-dispatcher
-import static akka.http.javadsl.server.Directives.completeWithFuture;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.completeWithFuture;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 //#blocking-example-in-default-dispatcher
 //#blocking-example-in-dedicated-dispatcher
-import static akka.http.javadsl.server.Directives.completeWithFuture;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.completeWithFuture;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 //#blocking-example-in-dedicated-dispatcher
 public class BlockingInHttpExamples extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
index 1c9fea2b7..cddb8b81c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/DirectiveExamplesTest.java
@@ -4,76 +4,76 @@
 
 package docs.http.javadsl.server;
 
-import akka.http.javadsl.model.RemoteAddress;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.RemoteAddress;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
 
 //#example1
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
 
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#example1
 //#usingConcat
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.put;
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#usingConcat
 //#usingConcatBig
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.head;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.put;
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.head;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#usingConcatBig
 
 //#getOrPut
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractMethod;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.put;
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMethod;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#getOrPut
 //#getOrPutUsingAnyOf
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.anyOf;
+import static org.apache.pekko.http.javadsl.server.Directives.anyOf;
 
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#getOrPutUsingAnyOf
 //#composeNesting
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractClientIP;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractClientIP;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#composeNesting
 //#allOf
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.allOf;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.allOf;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#allOf
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
index 27e6309da..727476fd0 100644
--- a/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/FileUploadExamplesTest.java
@@ -4,19 +4,19 @@
 
 package docs.http.javadsl.server;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorRef;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.japi.Pair;
-import akka.stream.Materializer;
-import akka.stream.javadsl.FileIO;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Framing;
-import akka.stream.javadsl.Sink;
-import akka.util.ByteString;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorRef;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.japi.Pair;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Framing;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.util.ByteString;
 import org.junit.Test;
 
 import java.io.File;
@@ -27,22 +27,22 @@ import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
-import static akka.http.javadsl.server.PathMatchers.longSegment;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.longSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#simple-upload
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
-import static akka.http.javadsl.server.Directives.onSuccess;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#simple-upload
 
 //#stream-csv-upload
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
-import static akka.http.javadsl.server.Directives.onComplete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.onComplete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#stream-csv-upload
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
index 2c744b86c..cd1599b14 100644
--- a/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/FormFieldRequestValsExampleTest.java
@@ -7,23 +7,23 @@ package docs.http.javadsl.server;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.FormData;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
-import akka.http.javadsl.unmarshalling.StringUnmarshaller;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.japi.Pair;
+import org.apache.pekko.http.javadsl.model.FormData;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshaller;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.japi.Pair;
 
 //#simple
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formField;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formField;
 
 //#simple
 //#custom-unmarshal
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formField;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formField;
 
 //#custom-unmarshal
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
index d35ae09bd..3a48be5c0 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HeaderRequestValsExampleTest.java
@@ -6,20 +6,20 @@ package docs.http.javadsl.server;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.headers.Host;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Host;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
 //#by-class
-import static akka.http.javadsl.server.Directives.extractHost;
-import static akka.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractHost;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 //#by-class
 //#by-name
-import static akka.http.javadsl.server.Directives.headerValueByName;
-import static akka.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValueByName;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 //#by-name
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/HighLevelServerBindFailureExample.java b/docs/src/test/java/docs/http/javadsl/server/HighLevelServerBindFailureExample.java
index e9068d6eb..17982934c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HighLevelServerBindFailureExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HighLevelServerBindFailureExample.java
@@ -6,10 +6,10 @@ package docs.http.javadsl.server;
 
 //#binding-failure-high-level-example
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.io.IOException;
 import java.util.concurrent.CompletionStage;
diff --git a/docs/src/test/java/docs/http/javadsl/server/HighLevelServerExample.java b/docs/src/test/java/docs/http/javadsl/server/HighLevelServerExample.java
index 8f914c092..4bbdfd24f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HighLevelServerExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HighLevelServerExample.java
@@ -6,13 +6,13 @@ package docs.http.javadsl.server;
 
 //#high-level-server-example
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.ContentTypes;
-import akka.http.javadsl.model.HttpEntities;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.ContentTypes;
+import org.apache.pekko.http.javadsl.model.HttpEntities;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.io.IOException;
 import java.util.concurrent.CompletionStage;
diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
index e4d85c9ab..dd2c53767 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HttpBasicAuthenticatorExample.java
@@ -8,16 +8,16 @@ import java.util.Optional;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.headers.Host;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.scaladsl.model.headers.Authorization;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Host;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.scaladsl.model.headers.Authorization;
 
 //#basic-authenticator-java
-import static akka.http.javadsl.server.Directives.authenticateBasic;
-import static akka.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasic;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 //#basic-authenticator-java
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java b/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java
index 0762b93da..ee924da4e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HttpServerExampleDocTest.java
@@ -4,27 +4,27 @@
 
 package docs.http.javadsl.server;
 
-import akka.Done;
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.actor.CoordinatedShutdown;
-import akka.http.javadsl.*;
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.Connection;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Directives;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.japi.function.Function;
-import akka.stream.ActorMaterializer;
-import akka.stream.IOResult;
-import akka.stream.Materializer;
-import akka.stream.javadsl.FileIO;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.Done;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.actor.CoordinatedShutdown;
+import org.apache.pekko.http.javadsl.*;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.Connection;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.japi.function.Function;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.IOResult;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import scala.concurrent.ExecutionContextExecutor;
 
 import java.io.BufferedReader;
@@ -34,7 +34,7 @@ import java.time.Duration;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 
 @SuppressWarnings("unused")
 public class HttpServerExampleDocTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
index 476b8f589..e8acf7d69 100644
--- a/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/HttpsServerExampleTest.java
@@ -4,9 +4,9 @@
 
 package docs.http.javadsl.server;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.ConnectionContext;
-import com.typesafe.sslconfig.akka.AkkaSSLConfig;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.ConnectionContext;
+import com.typesafe.sslconfig.pekko.PekkoSSLConfig;
 import org.junit.Test;
 import org.scalatestplus.junit.JUnitSuite;
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
index 81476250e..b7bb02752 100644
--- a/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/JsonStreamingExamplesTest.java
@@ -4,45 +4,45 @@
 
 package docs.http.javadsl.server;
 
-import akka.NotUsed;
-import akka.http.javadsl.common.CsvEntityStreamingSupport;
-import akka.http.javadsl.common.JsonEntityStreamingSupport;
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.marshalling.Marshaller;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.Accept;
-import akka.http.javadsl.server.*;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRoute;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
-import akka.http.javadsl.common.EntityStreamingSupport;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.http.javadsl.common.CsvEntityStreamingSupport;
+import org.apache.pekko.http.javadsl.common.JsonEntityStreamingSupport;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.marshalling.Marshaller;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.Accept;
+import org.apache.pekko.http.javadsl.server.*;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.common.EntityStreamingSupport;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import org.junit.Test;
 
 import java.util.concurrent.CompletionStage;
 
 //#response-streaming
-import static akka.http.javadsl.server.Directives.completeOKWithSource;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.parameter;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.completeOKWithSource;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.parameter;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#response-streaming
 //#incoming-request-streaming
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entityAsSourceOf;
-import static akka.http.javadsl.server.Directives.extractMaterializer;
-import static akka.http.javadsl.server.Directives.onComplete;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entityAsSourceOf;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMaterializer;
+import static org.apache.pekko.http.javadsl.server.Directives.onComplete;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 //#incoming-request-streaming
 //#csv-example
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.completeWithSource;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.completeWithSource;
 
 //#csv-example
 public class JsonStreamingExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
index dbecd44d8..df0aa2f4a 100644
--- a/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/OAuth2AuthenticatorExample.java
@@ -4,21 +4,21 @@
 
 package docs.http.javadsl.server;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.headers.Host;
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.scaladsl.model.headers.Authorization;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Host;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.scaladsl.model.headers.Authorization;
 
 import java.util.Optional;
 
 import org.junit.Test;
 
 //#oauth2-authenticator-java
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.Route;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.authenticateOAuth2;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateOAuth2;
 
 //#oauth2-authenticator-java
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
index a9c019133..64081f6f1 100644
--- a/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/PathDirectiveExampleTest.java
@@ -4,17 +4,17 @@
 
 package docs.http.javadsl.server;
 
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 //#path-examples
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathEnd;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathSingleSlash;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEnd;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathSingleSlash;
 //#path-examples
 
 public class PathDirectiveExampleTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
index e345d750a..96e79560e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/RejectionHandlerExamplesTest.java
@@ -4,40 +4,40 @@
 
 package docs.http.javadsl.server;
 
-import akka.http.javadsl.coding.Coder;
-import akka.http.javadsl.model.ContentTypes;
-import akka.http.javadsl.model.HttpEntity;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AuthorizationFailedRejection;
-import akka.http.javadsl.server.MethodRejection;
-import akka.http.javadsl.server.MissingCookieRejection;
-import akka.http.javadsl.server.RejectionHandler;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.ValidationRejection;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.coding.Coder;
+import org.apache.pekko.http.javadsl.model.ContentTypes;
+import org.apache.pekko.http.javadsl.model.HttpEntity;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AuthorizationFailedRejection;
+import org.apache.pekko.http.javadsl.server.MethodRejection;
+import org.apache.pekko.http.javadsl.server.MissingCookieRejection;
+import org.apache.pekko.http.javadsl.server.RejectionHandler;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.ValidationRejection;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.stream.Collectors;
 
 //#example1
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.decodeRequestWith;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.decodeRequestWith;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 //#example1
 //#custom-handler-example-java
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.handleRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.handleRejections;
 
 //#custom-handler-example-java
 //#example-json
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.handleRejections;
-import static akka.http.javadsl.server.Directives.validate;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.handleRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.validate;
 
 //#example-json
 public class RejectionHandlerExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/ServerShutdownExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/ServerShutdownExampleTest.java
index 8acdc9496..81e2b37b4 100644
--- a/docs/src/test/java/docs/http/javadsl/server/ServerShutdownExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/ServerShutdownExampleTest.java
@@ -4,12 +4,12 @@
 
 package docs.http.javadsl.server;
 
-import akka.actor.CoordinatedShutdown;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Behaviors;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.actor.CoordinatedShutdown;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Behaviors;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.server.Route;
 
 import java.time.Duration;
 import java.util.concurrent.CompletionStage;
diff --git a/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java b/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
index 7fa03fe4c..211a947a3 100644
--- a/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/WebSocketCoreExample.java
@@ -13,33 +13,33 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import akka.NotUsed;
-import akka.http.impl.util.JavaMapping;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.ConnectionContext;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.ws.WebSocketRequest;
-import akka.http.javadsl.settings.ClientConnectionSettings;
-import akka.http.javadsl.settings.ServerSettings;
-import akka.http.javadsl.settings.WebSocketSettings;
-import akka.http.scaladsl.model.AttributeKeys;
-import akka.japi.JavaPartialFunction;
-import akka.japi.function.Function;
-
-import akka.stream.ActorMaterializer;
-import akka.stream.Materializer;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
-
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.ws.Message;
-import akka.http.javadsl.model.ws.TextMessage;
-import akka.http.javadsl.model.ws.WebSocket;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.http.impl.util.JavaMapping;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.ConnectionContext;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.ws.WebSocketRequest;
+import org.apache.pekko.http.javadsl.settings.ClientConnectionSettings;
+import org.apache.pekko.http.javadsl.settings.ServerSettings;
+import org.apache.pekko.http.javadsl.settings.WebSocketSettings;
+import org.apache.pekko.http.scaladsl.model.AttributeKeys;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.japi.function.Function;
+
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
+
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.ws.Message;
+import org.apache.pekko.http.javadsl.model.ws.TextMessage;
+import org.apache.pekko.http.javadsl.model.ws.WebSocket;
+import org.apache.pekko.util.ByteString;
 
 @SuppressWarnings({"Convert2MethodRef", "ConstantConditions"})
 public class WebSocketCoreExample {
diff --git a/docs/src/test/java/docs/http/javadsl/server/WebSocketRoutingExample.java b/docs/src/test/java/docs/http/javadsl/server/WebSocketRoutingExample.java
index ae68b4b77..90ea73942 100644
--- a/docs/src/test/java/docs/http/javadsl/server/WebSocketRoutingExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/WebSocketRoutingExample.java
@@ -4,14 +4,14 @@
 
 package docs.http.javadsl.server;
 
-import akka.NotUsed;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.japi.JavaPartialFunction;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Source;
-import akka.http.javadsl.model.ws.Message;
-import akka.http.javadsl.model.ws.TextMessage;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.http.javadsl.model.ws.Message;
+import org.apache.pekko.http.javadsl.model.ws.TextMessage;
 
 public class WebSocketRoutingExample extends AllDirectives {
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
index 37c03bdec..3f4b4a005 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/AttributeDirectivesExamplesTest.java
@@ -4,11 +4,11 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.AttributeKey;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.AttributeKey;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 public class AttributeDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
index 96690f25a..7625a7fbe 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/BasicDirectivesExamplesTest.java
@@ -4,32 +4,32 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.dispatch.ExecutionContexts;
-import akka.event.Logging;
-import akka.event.LoggingAdapter;
-import akka.http.javadsl.model.ContentTypes;
-import akka.http.javadsl.model.HttpEntities;
-import akka.http.javadsl.model.HttpEntity;
-import akka.http.javadsl.model.HttpMethods;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.ResponseEntity;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.model.headers.Server;
-import akka.http.javadsl.model.headers.ProductVersion;
-import akka.http.javadsl.settings.RoutingSettings;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.server.*;
-import akka.japi.pf.PFBuilder;
-import akka.stream.ActorMaterializer;
-import akka.stream.ActorMaterializerSettings;
-import akka.stream.javadsl.FileIO;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.dispatch.ExecutionContexts;
+import org.apache.pekko.event.Logging;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.http.javadsl.model.ContentTypes;
+import org.apache.pekko.http.javadsl.model.HttpEntities;
+import org.apache.pekko.http.javadsl.model.HttpEntity;
+import org.apache.pekko.http.javadsl.model.HttpMethods;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.ResponseEntity;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.model.headers.Server;
+import org.apache.pekko.http.javadsl.model.headers.ProductVersion;
+import org.apache.pekko.http.javadsl.settings.RoutingSettings;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.server.*;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.stream.ActorMaterializer;
+import org.apache.pekko.stream.ActorMaterializerSettings;
+import org.apache.pekko.stream.javadsl.FileIO;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import org.junit.Ignore;
 import org.junit.Test;
 import scala.concurrent.ExecutionContextExecutor;
@@ -49,211 +49,211 @@ import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.StreamSupport;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.onSuccess;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 //#extract
-import static akka.http.javadsl.server.Directives.extract;
+import static org.apache.pekko.http.javadsl.server.Directives.extract;
 
 //#extract
 //#extractLog
-import static akka.http.javadsl.server.Directives.extractLog;
+import static org.apache.pekko.http.javadsl.server.Directives.extractLog;
 
 //#extractLog
 //#withMaterializer
-import static akka.http.javadsl.server.Directives.withMaterializer;
+import static org.apache.pekko.http.javadsl.server.Directives.withMaterializer;
 
 //#withMaterializer
 //#extractMaterializer
-import static akka.http.javadsl.server.Directives.extractMaterializer;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMaterializer;
 
 //#extractMaterializer
 //#provide
-import static akka.http.javadsl.server.Directives.provide;
+import static org.apache.pekko.http.javadsl.server.Directives.provide;
 
 //#provide
 //#extractExecutionContext
-import static akka.http.javadsl.server.Directives.extractExecutionContext;
+import static org.apache.pekko.http.javadsl.server.Directives.extractExecutionContext;
 
 //#extractExecutionContext
 //#withExecutionContext
-import static akka.http.javadsl.server.Directives.withExecutionContext;
+import static org.apache.pekko.http.javadsl.server.Directives.withExecutionContext;
 
 //#withExecutionContext
 //#withLog
-import static akka.http.javadsl.server.Directives.withLog;
+import static org.apache.pekko.http.javadsl.server.Directives.withLog;
 
 //#withLog
 //#withSettings
-import static akka.http.javadsl.server.Directives.withSettings;
+import static org.apache.pekko.http.javadsl.server.Directives.withSettings;
 
 //#withSettings
 //#mapResponse
-import static akka.http.javadsl.server.Directives.mapResponse;
+import static org.apache.pekko.http.javadsl.server.Directives.mapResponse;
 
 //#mapResponse
 //#mapRouteResult
-import static akka.http.javadsl.server.Directives.mapRouteResult;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResult;
 
 //#mapRouteResult
 //#mapRequest
-import static akka.http.javadsl.server.Directives.mapRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRequest;
 
 //#mapRequest
 //#mapRouteResultPF
-import static akka.http.javadsl.server.Directives.mapRouteResultPF;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultPF;
 
 //#mapRouteResultPF
 //#mapRouteResultWithPF
-import static akka.http.javadsl.server.Directives.mapRouteResultWithPF;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultWithPF;
 
 //#mapRouteResultWithPF
 //#mapRouteResultWith
-import static akka.http.javadsl.server.Directives.mapRouteResultWith;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultWith;
 
 //#mapRouteResultWith
 //#pass
-import static akka.http.javadsl.server.Directives.pass;
+import static org.apache.pekko.http.javadsl.server.Directives.pass;
 
 //#pass
 //#cancelRejections
-import static akka.http.javadsl.server.Directives.cancelRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.cancelRejections;
 
 //#cancelRejections
 //#cancelRejection
-import static akka.http.javadsl.server.Directives.cancelRejection;
+import static org.apache.pekko.http.javadsl.server.Directives.cancelRejection;
 
 //#cancelRejection
 //#extractRequest
-import static akka.http.javadsl.server.Directives.extractRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
 
 //#extractRequest
 //#mapSettings
-import static akka.http.javadsl.server.Directives.mapSettings;
+import static org.apache.pekko.http.javadsl.server.Directives.mapSettings;
 
 //#mapSettings
 //#extractSettings
-import static akka.http.javadsl.server.Directives.extractSettings;
+import static org.apache.pekko.http.javadsl.server.Directives.extractSettings;
 
 //#extractSettings
 //#extractRequestContext
-import static akka.http.javadsl.server.Directives.extractRequestContext;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequestContext;
 
 //#extractRequestContext
 //#extractParserSettings
-import static akka.http.javadsl.server.Directives.extractParserSettings;
+import static org.apache.pekko.http.javadsl.server.Directives.extractParserSettings;
 
 //#extractParserSettings
 //#extractMatchedPath
-import static akka.http.javadsl.server.Directives.extractMatchedPath;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMatchedPath;
 
 //#extractMatchedPath
 //#extractUri
-import static akka.http.javadsl.server.Directives.extractUri;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUri;
 
 //#extractUri
 //#mapUnmatchedPath
-import static akka.http.javadsl.server.Directives.mapUnmatchedPath;
+import static org.apache.pekko.http.javadsl.server.Directives.mapUnmatchedPath;
 
 //#mapUnmatchedPath
 //#extractDataBytes
-import static akka.http.javadsl.server.Directives.extractDataBytes;
+import static org.apache.pekko.http.javadsl.server.Directives.extractDataBytes;
 
 //#extractDataBytes
 //#extractStrictEntity
-import static akka.http.javadsl.server.Directives.extractStrictEntity;
+import static org.apache.pekko.http.javadsl.server.Directives.extractStrictEntity;
 
 //#extractStrictEntity
 //#toStrictEntity
-import static akka.http.javadsl.server.Directives.toStrictEntity;
+import static org.apache.pekko.http.javadsl.server.Directives.toStrictEntity;
 
 //#toStrictEntity
 //#mapRouteResultFuture
-import static akka.http.javadsl.server.Directives.mapRouteResultFuture;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultFuture;
 
 //#mapRouteResultFuture
 //#mapResponseEntity
-import static akka.http.javadsl.server.Directives.mapResponseEntity;
+import static org.apache.pekko.http.javadsl.server.Directives.mapResponseEntity;
 
 //#mapResponseEntity
 //#mapResponseHeaders
-import static akka.http.javadsl.server.Directives.mapResponseHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.mapResponseHeaders;
 
 //#mapResponseHeaders
 //#mapInnerRoute
-import static akka.http.javadsl.server.Directives.mapInnerRoute;
+import static org.apache.pekko.http.javadsl.server.Directives.mapInnerRoute;
 
 //#mapInnerRoute
 //#mapRejections
-import static akka.http.javadsl.server.Directives.mapRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRejections;
 
 //#mapRejections
 //#recoverRejections
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasic;
-import static akka.http.javadsl.server.Directives.recoverRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasic;
+import static org.apache.pekko.http.javadsl.server.Directives.recoverRejections;
 
 //#recoverRejections
 //#recoverRejectionsWith
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasic;
-import static akka.http.javadsl.server.Directives.recoverRejectionsWith;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasic;
+import static org.apache.pekko.http.javadsl.server.Directives.recoverRejectionsWith;
 
 //#recoverRejectionsWith
 //#mapRequest
-import static akka.http.javadsl.server.Directives.extractRequest;
-import static akka.http.javadsl.server.Directives.mapRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRequest;
 
 //#mapRequest
 //#mapRequestContext
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractRequest;
-import static akka.http.javadsl.server.Directives.mapRequestContext;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRequestContext;
 
 //#mapRequestContext
 //#mapRouteResult
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.mapRouteResult;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResult;
 
 //#mapRouteResult
 //#mapRouteResultPF
-import static akka.http.javadsl.server.Directives.mapRouteResultPF;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultPF;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 //#mapRouteResultPF
 //#mapRouteResultWithPF
-import static akka.http.javadsl.server.Directives.mapRouteResultWithPF;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultWithPF;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 //#mapRouteResultWithPF
 //#mapRouteResultWith
-import static akka.http.javadsl.server.Directives.mapRouteResultWith;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.mapRouteResultWith;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 //#mapRouteResultWith
 //#mapResponseHeaders
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.respondWithHeaders;
-import static akka.http.javadsl.server.Directives.mapResponseHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.mapResponseHeaders;
 
 //#mapResponseHeaders
 //#extractUnmatchedPath
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractUnmatchedPath;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUnmatchedPath;
 
 //#extractUnmatchedPath
 //#extractRequestEntity
-import static akka.http.javadsl.server.Directives.extractRequestEntity;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequestEntity;
 
 //#extractRequestEntity
 //#extractActorSystem
-import static akka.http.javadsl.server.Directives.extractActorSystem;
+import static org.apache.pekko.http.javadsl.server.Directives.extractActorSystem;
 
 //#extractActorSystem
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
index 02c54144c..36b77279a 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CachingDirectivesExamplesTest.java
@@ -5,39 +5,39 @@
 package docs.http.javadsl.server.directives;
 
 import java.util.concurrent.atomic.AtomicInteger;
-import akka.japi.JavaPartialFunction;
-import akka.http.javadsl.model.Uri;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpMethods;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.*;
-import akka.http.javadsl.model.headers.CacheDirectives.*;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.RequestContext;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.http.javadsl.model.Uri;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpMethods;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.*;
+import org.apache.pekko.http.javadsl.model.headers.CacheDirectives.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.RequestContext;
 //#caching-directives-import
-import static akka.http.javadsl.server.directives.CachingDirectives.*;
+import static org.apache.pekko.http.javadsl.server.directives.CachingDirectives.*;
 //#caching-directives-import
 import scala.concurrent.duration.Duration;
 //#time-unit-import
 import java.util.concurrent.TimeUnit;
 //#time-unit-import
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
-import akka.http.javadsl.server.RouteResult;
+import org.apache.pekko.http.javadsl.server.RouteResult;
 //#create-cache-imports
-import akka.http.caching.javadsl.Cache;
-import akka.http.caching.javadsl.CachingSettings;
-import akka.http.caching.javadsl.LfuCacheSettings;
-import akka.http.caching.LfuCache;
+import org.apache.pekko.http.caching.javadsl.Cache;
+import org.apache.pekko.http.caching.javadsl.CachingSettings;
+import org.apache.pekko.http.caching.javadsl.LfuCacheSettings;
+import org.apache.pekko.http.caching.LfuCache;
 //#create-cache-imports
 
 //#cache
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractUri;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUri;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 //#cache
 
 public class CachingDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
index 546a5ec1f..f57f4e75c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CodingDirectivesExamplesTest.java
@@ -4,54 +4,54 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpEntities;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.MediaTypes;
-import akka.http.javadsl.model.headers.AcceptEncoding;
-import akka.http.javadsl.model.headers.ContentEncoding;
-import akka.http.javadsl.model.headers.HttpEncodings;
-import akka.http.javadsl.coding.Coder;
-import akka.http.javadsl.server.Rejections;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.util.ByteString;
+import org.apache.pekko.http.javadsl.model.HttpEntities;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.MediaTypes;
+import org.apache.pekko.http.javadsl.model.headers.AcceptEncoding;
+import org.apache.pekko.http.javadsl.model.headers.ContentEncoding;
+import org.apache.pekko.http.javadsl.model.headers.HttpEncodings;
+import org.apache.pekko.http.javadsl.coding.Coder;
+import org.apache.pekko.http.javadsl.server.Rejections;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.util.ByteString;
 import org.junit.Test;
 
 import java.util.Collections;
 
-import static akka.http.javadsl.unmarshalling.Unmarshaller.entityToString;
+import static org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller.entityToString;
 
 //#responseEncodingAccepted
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.responseEncodingAccepted;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.responseEncodingAccepted;
 
 //#responseEncodingAccepted
 //#encodeResponse
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.encodeResponse;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.encodeResponse;
 
 //#encodeResponse
 //#encodeResponseWith
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.encodeResponseWith;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.encodeResponseWith;
 
 //#encodeResponseWith
 //#decodeRequest
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.decodeRequest;
-import static akka.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.decodeRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
 
 //#decodeRequest
 //#decodeRequestWith
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.decodeRequestWith;
-import static akka.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.decodeRequestWith;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
 
 //#decodeRequestWith
 //#withPrecompressedMediaTypeSupport
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.withPrecompressedMediaTypeSupport;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.withPrecompressedMediaTypeSupport;
 
 //#withPrecompressedMediaTypeSupport
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
index 72923ffd6..b66dada42 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CookieDirectivesExamplesTest.java
@@ -4,38 +4,38 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpHeader;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.headers.Cookie;
-import akka.http.javadsl.model.headers.HttpCookie;
-import akka.http.javadsl.model.headers.SetCookie;
-import akka.http.javadsl.server.Rejections;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.scaladsl.model.DateTime;
+import org.apache.pekko.http.javadsl.model.HttpHeader;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.Cookie;
+import org.apache.pekko.http.javadsl.model.headers.HttpCookie;
+import org.apache.pekko.http.javadsl.model.headers.SetCookie;
+import org.apache.pekko.http.javadsl.server.Rejections;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.scaladsl.model.DateTime;
 import org.junit.Test;
 
 import java.util.Optional;
 import java.util.OptionalLong;
 
 //#cookie
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.cookie;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.cookie;
 
 //#cookie
 //#optionalCookie
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.optionalCookie;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.optionalCookie;
 
 //#optionalCookie
 //#deleteCookie
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.deleteCookie;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.deleteCookie;
 
 //#deleteCookie
 //#setCookie
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.setCookie;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.setCookie;
 
 //#setCookie
 public class CookieDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
index abcb7bb63..e18d43577 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CustomDirectivesExamplesTest.java
@@ -4,11 +4,11 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -19,17 +19,17 @@ import java.util.function.Supplier;
 import java.util.function.Function;
 
 //#labeling-1
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.put;
-import static akka.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
 
 //#labeling-1
 //#composition-1
-import static akka.http.javadsl.server.Directives.headerValueByName;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValueByName;
 
 //#composition-1
 //#composition-2
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#composition-2
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
index 5d46803ba..fb662cd3f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/CustomHttpMethodExamplesTest.java
@@ -4,19 +4,19 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.event.LoggingAdapter;
-import akka.event.NoLogging;
-import akka.http.javadsl.ConnectHttp;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.settings.ParserSettings;
-import akka.http.javadsl.settings.ServerSettings;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.stream.javadsl.Flow;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.event.LoggingAdapter;
+import org.apache.pekko.event.NoLogging;
+import org.apache.pekko.http.javadsl.ConnectHttp;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.settings.ParserSettings;
+import org.apache.pekko.http.javadsl.settings.ServerSettings;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.stream.javadsl.Flow;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
 
@@ -25,12 +25,12 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static akka.http.javadsl.model.HttpProtocols.HTTP_1_1;
-import static akka.http.javadsl.model.RequestEntityAcceptances.Expected;
+import static org.apache.pekko.http.javadsl.model.HttpProtocols.HTTP_1_1;
+import static org.apache.pekko.http.javadsl.model.RequestEntityAcceptances.Expected;
 
 //#customHttpMethod
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractMethod;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMethod;
 
 //#customHttpMethod
 public class CustomHttpMethodExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
index b884f4465..a5ec832b7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/DebuggingDirectivesExamplesTest.java
@@ -6,37 +6,37 @@ package docs.http.javadsl.server.directives;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
 import java.util.function.Function;
 import java.util.function.BiFunction;
 
-import akka.http.javadsl.server.directives.LogEntry;
+import org.apache.pekko.http.javadsl.server.directives.LogEntry;
 
 import java.util.List;
 
-import akka.http.javadsl.server.Rejection;
+import org.apache.pekko.http.javadsl.server.Rejection;
 
-import static akka.event.Logging.InfoLevel;
+import static org.apache.pekko.event.Logging.InfoLevel;
 
 import java.util.stream.Collectors;
 import java.util.Optional;
 
 //#logRequest
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.logRequest;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.logRequest;
 
 //#logRequest
 //#logRequestResult
-import static akka.http.javadsl.server.Directives.logRequestResultOptional;
+import static org.apache.pekko.http.javadsl.server.Directives.logRequestResultOptional;
 
 //#logRequestResult
 //#logResult
-import static akka.http.javadsl.server.Directives.logResult;
+import static org.apache.pekko.http.javadsl.server.Directives.logResult;
 
 //#logResult
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
index 920a25da5..2fa00f89c 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/ExecutionDirectivesExamplesTest.java
@@ -4,41 +4,41 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.ExceptionHandler;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.server.RejectionHandler;
-import akka.http.javadsl.server.Rejections;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.ValidationRejection;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.ExceptionHandler;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.RejectionHandler;
+import org.apache.pekko.http.javadsl.server.Rejections;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.ValidationRejection;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
 
 //#handleExceptions
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.handleExceptions;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.handleExceptions;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#handleExceptions
 //#handleRejections
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.handleRejections;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.handleRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 //#handleRejections
 //#handleNotFoundWithDefails
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractUnmatchedPath;
-import static akka.http.javadsl.server.Directives.handleRejections;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUnmatchedPath;
+import static org.apache.pekko.http.javadsl.server.Directives.handleRejections;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 
 //#handleNotFoundWithDefails
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
index f9e2e4089..2e8341cd0 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FileAndResourceDirectivesExamplesTest.java
@@ -4,53 +4,53 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.directives.DirectoryRenderer;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.directives.DirectoryRenderer;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import scala.NotImplementedError;
 
-import static akka.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 
 //#getFromFile
-import static akka.http.javadsl.server.Directives.getFromFile;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromFile;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#getFromFile
 //#getFromResource
-import static akka.http.javadsl.server.Directives.getFromResource;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromResource;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#getFromResource
 //#listDirectoryContents
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.listDirectoryContents;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.listDirectoryContents;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#listDirectoryContents
 //#getFromBrowseableDirectory
-import static akka.http.javadsl.server.Directives.getFromBrowseableDirectory;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromBrowseableDirectory;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#getFromBrowseableDirectory
 //#getFromBrowseableDirectories
-import static akka.http.javadsl.server.Directives.getFromBrowseableDirectories;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromBrowseableDirectories;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#getFromBrowseableDirectories
 //#getFromDirectory
-import static akka.http.javadsl.server.Directives.getFromDirectory;
-import static akka.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromDirectory;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
 
 //#getFromDirectory
 //#getFromResourceDirectory
-import static akka.http.javadsl.server.Directives.getFromResourceDirectory;
-import static akka.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.getFromResourceDirectory;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
 
 //#getFromResourceDirectory
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
index df8f7b9d8..61786c97f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FileUploadDirectivesExamplesTest.java
@@ -4,15 +4,15 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.impl.engine.rendering.BodyPartRenderer;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.http.javadsl.server.directives.FileInfo;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.stream.javadsl.Framing;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.http.impl.engine.rendering.BodyPartRenderer;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.server.directives.FileInfo;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.stream.javadsl.Framing;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import org.junit.Ignore;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
@@ -33,25 +33,25 @@ import java.util.function.Function;
 import static scala.compat.java8.JFunction.func;
 
 //#storeUploadedFile
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.storeUploadedFile;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.storeUploadedFile;
 
 //#storeUploadedFile
 //#storeUploadedFiles
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.storeUploadedFiles;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.storeUploadedFiles;
 
 //#storeUploadedFiles
 //#fileUpload
-import static akka.http.javadsl.server.Directives.extractRequestContext;
-import static akka.http.javadsl.server.Directives.fileUpload;
-import static akka.http.javadsl.server.Directives.onSuccess;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequestContext;
+import static org.apache.pekko.http.javadsl.server.Directives.fileUpload;
+import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
 
 //#fileUpload
 //#fileUploadAll
-import static akka.http.javadsl.server.Directives.extractRequestContext;
-import static akka.http.javadsl.server.Directives.fileUploadAll;
-import static akka.http.javadsl.server.Directives.onSuccess;
+import static org.apache.pekko.http.javadsl.server.Directives.extractRequestContext;
+import static org.apache.pekko.http.javadsl.server.Directives.fileUploadAll;
+import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
 
 //#fileUploadAll
 
@@ -82,7 +82,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     Map<String, String> filenameMapping = new HashMap<>();
     filenameMapping.put("filename", "primes.csv");
 
-    akka.http.javadsl.model.Multipart.FormData multipartForm =
+    org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
       Multiparts.createStrictFormDataFromParts(Multiparts.createFormDataBodyPartStrict("csv",
         HttpEntities.create(ContentTypes.TEXT_PLAIN_UTF8,
           "2,3,5\n7,11,13,17,23\n29,31,37\n"), filenameMapping));
@@ -122,7 +122,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     filenameMappingA.put("filename", "primesA.csv");
     filenameMappingB.put("filename", "primesB.csv");
 
-    akka.http.javadsl.model.Multipart.FormData multipartForm =
+    org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
       Multiparts.createStrictFormDataFromParts(
         Multiparts.createFormDataBodyPartStrict("csv",
           HttpEntities.create(ContentTypes.TEXT_PLAIN_UTF8,
@@ -158,7 +158,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     Map<String, String> filenameMapping = new HashMap<>();
     filenameMapping.put("filename", "primes.csv");
 
-    akka.http.javadsl.model.Multipart.FormData multipartForm =
+    org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
       Multiparts.createStrictFormDataFromParts(
         Multiparts.createFormDataBodyPartStrict("csv",
           HttpEntities.create(ContentTypes.TEXT_PLAIN_UTF8,
@@ -200,7 +200,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     filenameMappingA.put("filename", "primesA.csv");
     filenameMappingB.put("filename", "primesB.csv");
 
-    akka.http.javadsl.model.Multipart.FormData multipartForm =
+    org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
       Multiparts.createStrictFormDataFromParts(
         Multiparts.createFormDataBodyPartStrict("csv",
           HttpEntities.create(ContentTypes.TEXT_PLAIN_UTF8,
@@ -251,7 +251,7 @@ public class FileUploadDirectivesExamplesTest extends JUnitRouteTest {
     }
 
 
-    akka.http.javadsl.model.Multipart.FormData multipartForm =
+    org.apache.pekko.http.javadsl.model.Multipart.FormData multipartForm =
       Multiparts.createFormDataFromPath("csv", ContentTypes.TEXT_PLAIN_UTF8, tempFile.toPath());
 
     // test:
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
index 7fd43fb45..25952b0e5 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FormFieldDirectivesExamplesTest.java
@@ -4,13 +4,13 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.FormData;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.japi.Pair;
+import org.apache.pekko.http.javadsl.model.FormData;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.japi.Pair;
 import org.junit.Test;
 
 import java.util.List;
@@ -20,26 +20,26 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 //#formField
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formField;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formField;
 
 //#formField
 
 //#formFieldMap
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formFieldMap;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formFieldMap;
 
 //#formFieldMap
 //#formFieldList
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formFieldList;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formFieldList;
 
 //#formFieldList
 //#formFieldMultiMap
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.formFieldMultiMap;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.formFieldMultiMap;
 
 //#formFieldMultiMap
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
index 00460fc38..ec3e859f9 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/FutureDirectivesExamplesTest.java
@@ -8,41 +8,41 @@ import java.time.Duration;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.marshalling.Marshaller;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.scaladsl.model.StatusCodes;
-import akka.japi.pf.PFBuilder;
-import akka.pattern.CircuitBreaker;
-import akka.testkit.javadsl.TestKit;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.marshalling.Marshaller;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.scaladsl.model.StatusCodes;
+import org.apache.pekko.japi.pf.PFBuilder;
+import org.apache.pekko.pattern.CircuitBreaker;
+import org.apache.pekko.testkit.javadsl.TestKit;
 import org.junit.Ignore;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
 
-import static akka.http.javadsl.server.PathMatchers.*;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
 import static scala.compat.java8.JFunction.func;
 
 //#onComplete
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.onComplete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.onComplete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#onComplete
 //#onSuccess
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.onSuccess;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.onSuccess;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#onSuccess
 //#completeOrRecoverWith
-import static akka.http.javadsl.server.Directives.completeOrRecoverWith;
-import static akka.http.javadsl.server.Directives.failWith;
+import static org.apache.pekko.http.javadsl.server.Directives.completeOrRecoverWith;
+import static org.apache.pekko.http.javadsl.server.Directives.failWith;
 
 //#completeOrRecoverWith
 //#onCompleteWithBreaker
-import static akka.http.javadsl.server.Directives.onCompleteWithBreaker;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.onCompleteWithBreaker;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#onCompleteWithBreaker
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
index 097c1e626..01de6cf8e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/HeaderDirectivesExamplesTest.java
@@ -9,72 +9,72 @@ import java.util.function.Function;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpHeader;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.Host;
-import akka.http.javadsl.model.headers.HttpOrigin;
-import akka.http.javadsl.model.headers.HttpOriginRange;
-import akka.http.javadsl.model.headers.Origin;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.japi.JavaPartialFunction;
-import akka.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.model.HttpHeader;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.Host;
+import org.apache.pekko.http.javadsl.model.headers.HttpOrigin;
+import org.apache.pekko.http.javadsl.model.headers.HttpOriginRange;
+import org.apache.pekko.http.javadsl.model.headers.Origin;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.japi.JavaPartialFunction;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import scala.PartialFunction;
 
 
-import static akka.http.javadsl.common.PartialApplication.*;
+import static org.apache.pekko.http.javadsl.common.PartialApplication.*;
 
 //#headerValue
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.headerValue;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValue;
 
 //#headerValue
 //#headerValue-with-default
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.anyOf;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.anyOf;
 //#headerValue-with-default
 //#headerValueByName
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.headerValueByName;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValueByName;
 
 //#headerValueByName
 //#headerValueByType
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.headerValueByType;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValueByType;
 
 //#headerValueByType
 //#headerValuePF
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.headerValuePF;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.headerValuePF;
 
 //#headerValuePF
 //#optionalHeaderValue
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.optionalHeaderValue;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.optionalHeaderValue;
 
 //#optionalHeaderValue
 //#optionalHeaderValueByName
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.optionalHeaderValueByName;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.optionalHeaderValueByName;
 
 //#optionalHeaderValueByName
 //#optionalHeaderValueByType
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.optionalHeaderValueByType;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.optionalHeaderValueByType;
 
 //#optionalHeaderValueByType
 //#optionalHeaderValuePF
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.optionalHeaderValuePF;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.optionalHeaderValuePF;
 
 //#optionalHeaderValuePF
 //#checkSameOrigin
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.checkSameOrigin;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.checkSameOrigin;
 
 //#checkSameOrigin
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
index 77c02ca03..326c1eac7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/HostDirectivesExamplesTest.java
@@ -9,31 +9,31 @@ import java.util.regex.Pattern;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.Host;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.Host;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
 //#host1
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.host;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.host;
 
 //#host1
 //#host2
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.host;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.host;
 
 //#host2
 //#extractHostname
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractHost;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractHost;
 
 //#extractHostname
 //#matchAndExtractHost
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.host;
+import static org.apache.pekko.http.javadsl.server.Directives.host;
 
 //#matchAndExtractHost
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/JsonStreamingFullExample.java b/docs/src/test/java/docs/http/javadsl/server/directives/JsonStreamingFullExample.java
index c8b91c927..75ead5305 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/JsonStreamingFullExample.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/JsonStreamingFullExample.java
@@ -5,15 +5,15 @@
 package docs.http.javadsl.server.directives;
 
 //#custom-content-type
-import akka.NotUsed;
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.common.EntityStreamingSupport;
-import akka.http.javadsl.marshalling.Marshaller;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.stream.javadsl.Source;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.common.EntityStreamingSupport;
+import org.apache.pekko.http.javadsl.marshalling.Marshaller;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.stream.javadsl.Source;
 
 import java.util.Random;
 import java.util.stream.Stream;
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
index 9aec29a3c..1a101ab74 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MarshallingDirectivesExamplesTest.java
@@ -4,29 +4,29 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.marshallers.jackson.Jackson;
-import akka.http.javadsl.marshalling.Marshaller;
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRouteResult;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.marshallers.jackson.Jackson;
+import org.apache.pekko.http.javadsl.marshalling.Marshaller;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.junit.Test;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
 
 //#example-entity-with-json
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
 
 //#example-entity-with-json
 //#example-completeWith-with-json
-import static akka.http.javadsl.server.Directives.completeWith;
+import static org.apache.pekko.http.javadsl.server.Directives.completeWith;
 
 //#example-completeWith-with-json
 //#example-handleWith-with-json
-import static akka.http.javadsl.server.Directives.handleWith;
+import static org.apache.pekko.http.javadsl.server.Directives.handleWith;
 
 //#example-handleWith-with-json
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
index 9179a6fd8..c7b904a50 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MethodDirectivesExamplesTest.java
@@ -6,58 +6,58 @@ package docs.http.javadsl.server.directives;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpMethods;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpMethods;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
 //#delete
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.delete;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.delete;
 
 //#delete
 //#head
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.head;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.head;
 
 //#head
 //#options
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.options;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.options;
 
 //#options
 //#patch
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.patch;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.patch;
 
 //#patch
 //#post
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
 
 //#post
 //#put
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.put;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.put;
 
 //#put
 //#method-example
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.method;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.method;
 
 //#method-example
 //#extractMethod
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.extractMethod;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.extractMethod;
 
 //#extractMethod
 //#overrideMethodWithParameter
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.get;
-import static akka.http.javadsl.server.Directives.post;
-import static akka.http.javadsl.server.Directives.overrideMethodWithParameter;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.get;
+import static org.apache.pekko.http.javadsl.server.Directives.post;
+import static org.apache.pekko.http.javadsl.server.Directives.overrideMethodWithParameter;
 
 //#overrideMethodWithParameter
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
index 450bbb1cf..c3fced90e 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/MiscDirectivesExamplesTest.java
@@ -4,13 +4,13 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.*;
-import akka.http.javadsl.server.PathMatchers;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.*;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
 import org.junit.Test;
 
 import java.net.InetAddress;
@@ -19,48 +19,48 @@ import java.util.Arrays;
 import java.util.function.Function;
 
 //#withSizeLimitExample
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
-import static akka.http.javadsl.server.Directives.withSizeLimit;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.withSizeLimit;
 
 //#withSizeLimitExample
 //#withSizeLimitExampleNested
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
-import static akka.http.javadsl.server.Directives.withSizeLimit;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.withSizeLimit;
 
 //#withSizeLimitExampleNested
 //#withoutSizeLimitExample
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.entity;
-import static akka.http.javadsl.server.Directives.withoutSizeLimit;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.entity;
+import static org.apache.pekko.http.javadsl.server.Directives.withoutSizeLimit;
 
 //#withoutSizeLimitExample
 //#extractClientIP
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractClientIP;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractClientIP;
 
 //#extractClientIP
 //#requestEntity-empty-present-example
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.requestEntityEmpty;
-import static akka.http.javadsl.server.Directives.requestEntityPresent;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.requestEntityEmpty;
+import static org.apache.pekko.http.javadsl.server.Directives.requestEntityPresent;
 
 //#requestEntity-empty-present-example
 //#selectPreferredLanguage
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.selectPreferredLanguage;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.selectPreferredLanguage;
 
 //#selectPreferredLanguage
 //#validate-example
-import static akka.http.javadsl.server.Directives.extractUri;
-import static akka.http.javadsl.server.Directives.validate;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUri;
+import static org.apache.pekko.http.javadsl.server.Directives.validate;
 
 //#validate-example
 //#rejectEmptyResponse-example
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.rejectEmptyResponse;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.rejectEmptyResponse;
 
 //#rejectEmptyResponse-example
 
@@ -147,8 +147,8 @@ public class MiscDirectivesExamplesTest extends JUnitRouteTest {
 
     // tests:
     final String ip = "192.168.1.2";
-    final akka.http.javadsl.model.RemoteAddress remoteAddress =
-      akka.http.javadsl.model.RemoteAddress.create(InetAddress.getByName(ip));
+    final org.apache.pekko.http.javadsl.model.RemoteAddress remoteAddress =
+      org.apache.pekko.http.javadsl.model.RemoteAddress.create(InetAddress.getByName(ip));
     
     final HttpRequest request = HttpRequest.GET("/")
       .addHeader(XForwardedFor.create(remoteAddress)); //
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
index 48a486ef0..b1842e626 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/ParameterDirectivesExamplesTest.java
@@ -4,11 +4,11 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 import org.junit.Test;
 
 import java.util.Map.Entry;
@@ -16,44 +16,44 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 //#parameter
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameter;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameter;
 
 //#parameter
 //#parameters
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameter;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameter;
 
 //#parameters
 //#optional
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameter;
-import static akka.http.javadsl.server.Directives.parameterOptional;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameter;
+import static org.apache.pekko.http.javadsl.server.Directives.parameterOptional;
 
 //#optional
 //#required-value
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameterRequiredValue;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameterRequiredValue;
 
 //#required-value
 //#mapped-value
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameter;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameter;
 
 //#mapped-value
 //#parameterMap
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameterMap;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameterMap;
 
 //#parameterMap
 //#parameterMultiMap
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameterMultiMap;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameterMultiMap;
 
 //#parameterMultiMap
 //#parameterSeq
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.parameterList;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.parameterList;
 
 //#parameterSeq
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
index dd57663ee..7945ba92b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/PathDirectivesExamplesTest.java
@@ -7,28 +7,28 @@ package docs.http.javadsl.server.directives;
 import java.util.Arrays;
 import java.util.regex.Pattern;
 
-import akka.http.javadsl.server.PathMatchers;
+import org.apache.pekko.http.javadsl.server.PathMatchers;
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 //#path-matcher
-import akka.http.javadsl.server.PathMatcher1;
-import static akka.http.javadsl.server.PathMatchers.segment;
+import org.apache.pekko.http.javadsl.server.PathMatcher1;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
 //#path-matcher
-import static akka.http.javadsl.server.PathMatchers.segments;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segments;
 //#path-matcher
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
 //#path-matcher
-import static akka.http.javadsl.server.PathMatchers.neutral;
-import static akka.http.javadsl.server.PathMatchers.slash;
-import akka.http.javadsl.server.directives.RouteAdapter;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.neutral;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.slash;
+import org.apache.pekko.http.javadsl.server.directives.RouteAdapter;
 import static java.util.regex.Pattern.compile;
-import static akka.http.javadsl.server.PathMatchers.segment;
-import static akka.http.javadsl.server.PathMatchers.integerSegment;
-import static akka.http.javadsl.server.PathMatchers.separateOnSlashes;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.segment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.integerSegment;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.separateOnSlashes;
 
 //#path-matcher
 
@@ -37,73 +37,73 @@ import static akka.http.javadsl.server.PathMatchers.separateOnSlashes;
 //#path-prefix-test, path-suffix, raw-path-prefix, raw-path-prefix-test
 import java.util.function.Supplier;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractUnmatchedPath;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUnmatchedPath;
 
 //#path-prefix-test, path-suffix, raw-path-prefix, raw-path-prefix-test
 
 //#path-dsl
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#path-dsl
 //#pathPrefix
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathEnd;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEnd;
 //#pathPrefix
 
 //#path-end-or-single-slash
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathEndOrSingleSlash;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEndOrSingleSlash;
 //#path-end-or-single-slash
 //#path-prefix
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathEnd;
-import static akka.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEnd;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
 //#path-prefix
 //#path-prefix-test
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathEnd;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathPrefixTest;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEnd;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefixTest;
 //#path-prefix-test
 //#path-single-slash
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathSingleSlash;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathSingleSlash;
 //#path-single-slash
 //#path-suffix
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathSuffix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathSuffix;
 //#path-suffix
 //#path-suffix-test
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.pathSuffixTest;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.pathSuffixTest;
 //#path-suffix-test
 //#raw-path-prefix
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.rawPathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.rawPathPrefix;
 //#raw-path-prefix
 //#raw-path-prefix-test
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.rawPathPrefixTest;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.rawPathPrefixTest;
 //#raw-path-prefix-test
 //#redirect-notrailing-slash-missing
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.redirectToTrailingSlashIfMissing;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.redirectToTrailingSlashIfMissing;
 //#redirect-notrailing-slash-missing
 //#redirect-notrailing-slash-present
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.redirectToNoTrailingSlashIfPresent;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.redirectToNoTrailingSlashIfPresent;
 //#redirect-notrailing-slash-present
 //#ignoreTrailingSlash
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.ignoreTrailingSlash;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.ignoreTrailingSlash;
 //#ignoreTrailingSlash
 
 public class PathDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
index d26428f42..226703287 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RangeDirectivesExamplesTest.java
@@ -4,19 +4,19 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.Multipart;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.ByteRange;
-import akka.http.javadsl.model.headers.ContentRange;
-import akka.http.javadsl.model.headers.Range;
-import akka.http.javadsl.model.headers.RangeUnits;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.unmarshalling.Unmarshaller;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRouteResult;
-import akka.stream.Materializer;
-import akka.util.ByteString;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.Multipart;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.ByteRange;
+import org.apache.pekko.http.javadsl.model.headers.ContentRange;
+import org.apache.pekko.http.javadsl.model.headers.Range;
+import org.apache.pekko.http.javadsl.model.headers.RangeUnits;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.unmarshalling.Unmarshaller;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
+import org.apache.pekko.stream.Materializer;
+import org.apache.pekko.util.ByteString;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.Test;
@@ -28,8 +28,8 @@ import java.util.concurrent.CompletionStage;
 import java.util.concurrent.TimeUnit;
 
 //#withRangeSupport
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.withRangeSupport;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.withRangeSupport;
 
 //#withRangeSupport
 
@@ -46,11 +46,11 @@ public class RangeDirectivesExamplesTest extends JUnitRouteTest {
 
         // test:
         final String bytes348Range = ContentRange.create(RangeUnits.BYTES,
-                akka.http.javadsl.model.ContentRange.create(3, 4, 8)).value();
-        final akka.http.javadsl.model.ContentRange bytes028Range =
-                akka.http.javadsl.model.ContentRange.create(0, 2, 8);
-        final akka.http.javadsl.model.ContentRange bytes678Range =
-                akka.http.javadsl.model.ContentRange.create(6, 7, 8);
+                org.apache.pekko.http.javadsl.model.ContentRange.create(3, 4, 8)).value();
+        final org.apache.pekko.http.javadsl.model.ContentRange bytes028Range =
+                org.apache.pekko.http.javadsl.model.ContentRange.create(0, 2, 8);
+        final org.apache.pekko.http.javadsl.model.ContentRange bytes678Range =
+                org.apache.pekko.http.javadsl.model.ContentRange.create(6, 7, 8);
         final Materializer materializer = systemResource().materializer();
 
         testRoute(route).run(HttpRequest.GET("/")
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
index 31e6adfed..ed75997f5 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RespondWithDirectivesExamplesTest.java
@@ -4,48 +4,48 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpHeader;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.headers.HttpOrigin;
-import akka.http.javadsl.model.headers.Origin;
-import akka.http.javadsl.model.headers.RawHeader;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.HttpHeader;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.headers.HttpOrigin;
+import org.apache.pekko.http.javadsl.model.headers.Origin;
+import org.apache.pekko.http.javadsl.model.headers.RawHeader;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
 //#multiple-headers
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.respondWithDefaultHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefaultHeaders;
 
 //#multiple-headers
 //#respondWithHeader
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.respondWithDefaultHeader;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefaultHeader;
 
 //#respondWithHeader
 //#respondWithDefaultHeader
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.respondWithDefaultHeader;
-import static akka.http.javadsl.server.Directives.respondWithHeader;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefaultHeader;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithHeader;
 
 //#respondWithDefaultHeader
 //#respondWithHeaders
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.respondWithDefaultHeaders;
-import static akka.http.javadsl.server.Directives.respondWithHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefaultHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithHeaders;
 
 //#respondWithHeaders
 //#respondWithDefaultHeaders
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.respondWithDefaultHeaders;
-import static akka.http.javadsl.server.Directives.respondWithHeader;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithDefaultHeaders;
+import static org.apache.pekko.http.javadsl.server.Directives.respondWithHeader;
 
 //#respondWithDefaultHeaders
 public class RespondWithDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
index 7839f5281..cf2496c08 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/RouteDirectivesExamplesTest.java
@@ -4,14 +4,14 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.*;
-import akka.http.javadsl.model.headers.ContentType;
-import akka.http.javadsl.model.headers.Location;
-import akka.http.javadsl.server.Rejections;
-import akka.http.javadsl.server.RequestContext;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.RouteResult;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.*;
+import org.apache.pekko.http.javadsl.model.headers.ContentType;
+import org.apache.pekko.http.javadsl.model.headers.Location;
+import org.apache.pekko.http.javadsl.server.Rejections;
+import org.apache.pekko.http.javadsl.server.RequestContext;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.RouteResult;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -19,28 +19,28 @@ import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 
 //#complete
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#complete
 
 //#reject
-import akka.http.javadsl.server.Directives;
+import org.apache.pekko.http.javadsl.server.Directives;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.reject;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.reject;
 //#reject
 //#redirect
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.pathEnd;
-import static akka.http.javadsl.server.Directives.pathPrefix;
-import static akka.http.javadsl.server.Directives.pathSingleSlash;
-import static akka.http.javadsl.server.Directives.redirect;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.pathEnd;
+import static org.apache.pekko.http.javadsl.server.Directives.pathPrefix;
+import static org.apache.pekko.http.javadsl.server.Directives.pathSingleSlash;
+import static org.apache.pekko.http.javadsl.server.Directives.redirect;
 //#redirect
 //#failWith
-import static akka.http.javadsl.server.Directives.failWith;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.failWith;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#failWith
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
index 9549719fb..c8d5ad793 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/SchemeDirectivesExamplesTest.java
@@ -6,22 +6,22 @@ package docs.http.javadsl.server.directives;
 
 import org.junit.Test;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.model.headers.Location;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.model.headers.Location;
 
 //#extractScheme
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractScheme;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractScheme;
 
 //#extractScheme
 //#scheme
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extract;
-import static akka.http.javadsl.server.Directives.redirect;
-import static akka.http.javadsl.server.Directives.scheme;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extract;
+import static org.apache.pekko.http.javadsl.server.Directives.redirect;
+import static org.apache.pekko.http.javadsl.server.Directives.scheme;
 
 //#scheme
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
index 04458a955..bf6666e74 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/SecurityDirectivesExamplesTest.java
@@ -4,12 +4,12 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.headers.BasicHttpCredentials;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.japi.JavaPartialFunction;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.headers.BasicHttpCredentials;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.japi.JavaPartialFunction;
 import org.junit.Test;
 import scala.PartialFunction;
 import scala.util.Either;
@@ -23,68 +23,68 @@ import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 import java.util.Optional;
-import akka.japi.Option;
+import org.apache.pekko.japi.Option;
 
 //#authenticateBasic
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasic;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasic;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#authenticateBasic
 //#authenticateBasicPF
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasicPF;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasicPF;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#authenticateBasicPF
 //#authenticateBasicPFAsync
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasicPFAsync;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasicPFAsync;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#authenticateBasicPFAsync
 //#authenticateBasicAsync
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateBasicAsync;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateBasicAsync;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#authenticateBasicAsync
 //#authenticateOrRejectWithChallenge
-import akka.http.javadsl.model.headers.HttpChallenge;
-import akka.http.javadsl.model.headers.HttpCredentials;
+import org.apache.pekko.http.javadsl.model.headers.HttpChallenge;
+import org.apache.pekko.http.javadsl.model.headers.HttpCredentials;
 
-import static akka.http.javadsl.server.Directives.authenticateOrRejectWithChallenge;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authenticateOrRejectWithChallenge;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 
 //#authenticateOrRejectWithChallenge
 //#authorize
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authorize;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authorize;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 //#authorize
 //#authorizeAsync
-import akka.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
+import org.apache.pekko.http.javadsl.server.directives.SecurityDirectives.ProvidedCredentials;
 
-import static akka.http.javadsl.server.Directives.authorizeAsync;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.authorizeAsync;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
 //#authorizeAsync
 //#extractCredentials
-import akka.http.javadsl.model.headers.HttpCredentials;
+import org.apache.pekko.http.javadsl.model.headers.HttpCredentials;
 
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractCredentials;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractCredentials;
 
 //#extractCredentials
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/StyleGuideExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/StyleGuideExamplesTest.java
index ff5c55bc7..c56a757da 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/StyleGuideExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/StyleGuideExamplesTest.java
@@ -5,10 +5,10 @@
 package docs.http.javadsl.server.directives;
 
 // #imports
-import static akka.http.javadsl.server.PathMatchers.*;
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.Route;
 
 // #imports
 
@@ -16,7 +16,7 @@ import akka.http.javadsl.server.Route;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 
 // #imports-directives
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
index da4c1ee66..c0ee9d907 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/TimeoutDirectivesExamplesTest.java
@@ -4,16 +4,16 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.ServerBinding;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.HttpResponse;
-import akka.http.javadsl.model.StatusCode;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.testkit.TestKit;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.ServerBinding;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.HttpResponse;
+import org.apache.pekko.http.javadsl.model.StatusCode;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.testkit.TestKit;
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import org.junit.After;
@@ -28,11 +28,11 @@ import java.util.concurrent.TimeUnit;
 
 public class TimeoutDirectivesExamplesTest extends AllDirectives {
     //#testSetup
-    private final Config testConf = ConfigFactory.parseString("akka.loggers = [\"akka.testkit.TestEventListener\"]\n"
-            + "akka.loglevel = ERROR\n"
-            + "akka.stdout-loglevel = ERROR\n"
+    private final Config testConf = ConfigFactory.parseString("pekko.loggers = [\"org.apache.pekko.testkit.TestEventListener\"]\n"
+            + "pekko.loglevel = ERROR\n"
+            + "pekko.stdout-loglevel = ERROR\n"
             + "windows-connection-abort-workaround-enabled = auto\n"
-            + "akka.log-dead-letters = OFF\n"
+            + "pekko.log-dead-letters = OFF\n"
             + "akka.http.server.request-timeout = 1000s");
     // large timeout - 1000s (please note - setting to infinite will disable Timeout-Access header
     // and withRequestTimeout will not work)
diff --git a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
index f50994895..913bef2b2 100644
--- a/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/directives/WebSocketDirectivesExamplesTest.java
@@ -4,22 +4,22 @@
 
 package docs.http.javadsl.server.directives;
 
-import akka.NotUsed;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.model.Uri;
-import akka.http.javadsl.model.headers.SecWebSocketProtocol;
-import akka.http.javadsl.model.ws.BinaryMessage;
-import akka.http.javadsl.model.ws.Message;
-import akka.http.javadsl.model.ws.TextMessage;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.WSProbe;
-import akka.stream.OverflowStrategy;
-import akka.stream.javadsl.Flow;
-import akka.stream.javadsl.Sink;
-import akka.stream.javadsl.Source;
-import akka.util.ByteString;
+import org.apache.pekko.NotUsed;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.model.Uri;
+import org.apache.pekko.http.javadsl.model.headers.SecWebSocketProtocol;
+import org.apache.pekko.http.javadsl.model.ws.BinaryMessage;
+import org.apache.pekko.http.javadsl.model.ws.Message;
+import org.apache.pekko.http.javadsl.model.ws.TextMessage;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.WSProbe;
+import org.apache.pekko.stream.OverflowStrategy;
+import org.apache.pekko.stream.javadsl.Flow;
+import org.apache.pekko.stream.javadsl.Sink;
+import org.apache.pekko.stream.javadsl.Source;
+import org.apache.pekko.util.ByteString;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
 
@@ -28,23 +28,23 @@ import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 //#handleWebSocketMessages
-import static akka.http.javadsl.server.Directives.path;
-import static akka.http.javadsl.server.Directives.handleWebSocketMessages;
+import static org.apache.pekko.http.javadsl.server.Directives.path;
+import static org.apache.pekko.http.javadsl.server.Directives.handleWebSocketMessages;
 
 //#handleWebSocketMessages
 //#handleWebSocketMessagesForProtocol
-import static akka.http.javadsl.server.Directives.handleWebSocketMessagesForProtocol;
+import static org.apache.pekko.http.javadsl.server.Directives.handleWebSocketMessagesForProtocol;
 
 //#handleWebSocketMessagesForProtocol
 //#extractUpgradeToWebSocket
-import akka.http.javadsl.model.AttributeKeys;
-import static akka.http.javadsl.server.Directives.complete;
-import static akka.http.javadsl.server.Directives.extractUpgradeToWebSocket;
+import org.apache.pekko.http.javadsl.model.AttributeKeys;
+import static org.apache.pekko.http.javadsl.server.Directives.complete;
+import static org.apache.pekko.http.javadsl.server.Directives.extractUpgradeToWebSocket;
 
 //#extractUpgradeToWebSocket
 //#extractOfferedWsProtocols
-import static akka.http.javadsl.server.Directives.extractOfferedWsProtocols;
-import static akka.http.javadsl.server.Directives.handleWebSocketMessagesForOptionalProtocol;
+import static org.apache.pekko.http.javadsl.server.Directives.extractOfferedWsProtocols;
+import static org.apache.pekko.http.javadsl.server.Directives.handleWebSocketMessagesForOptionalProtocol;
 
 //#extractOfferedWsProtocols
 public class WebSocketDirectivesExamplesTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppFragment.java b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppFragment.java
index 49926fe3d..e9ddc0ded 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppFragment.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppFragment.java
@@ -4,8 +4,8 @@
 
 package docs.http.javadsl.server.testkit;
 //#source-quote
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
 
 public class MyAppFragment extends AllDirectives {
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppService.java b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppService.java
index b2f0bf9d8..6e2ef9431 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppService.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppService.java
@@ -6,12 +6,12 @@ package docs.http.javadsl.server.testkit;
 
 //#simple-app
 
-import akka.actor.ActorSystem;
-import akka.http.javadsl.Http;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.server.examples.simple.SimpleServerApp;
-import akka.http.javadsl.unmarshalling.StringUnmarshallers;
+import org.apache.pekko.actor.ActorSystem;
+import org.apache.pekko.http.javadsl.Http;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.server.examples.simple.SimpleServerApp;
+import org.apache.pekko.http.javadsl.unmarshalling.StringUnmarshallers;
 
 import java.io.IOException;
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppWithActor.java b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppWithActor.java
index caf0a132a..c92ccc9a1 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppWithActor.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/MyAppWithActor.java
@@ -4,13 +4,13 @@
 
 package docs.http.javadsl.server.testkit;
 
-import akka.actor.typed.ActorRef;
-import akka.actor.typed.Scheduler;
-import akka.actor.typed.javadsl.AskPattern;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.http.scaladsl.model.StatusCodes;
-import akka.japi.pf.PFBuilder;
+import org.apache.pekko.actor.typed.ActorRef;
+import org.apache.pekko.actor.typed.Scheduler;
+import org.apache.pekko.actor.typed.javadsl.AskPattern;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.scaladsl.model.StatusCodes;
+import org.apache.pekko.japi.pf.PFBuilder;
 
 import java.time.Duration;
 
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
index c7b2d178a..3822a48f7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/PlayRoutesComparisonTest.java
@@ -4,20 +4,20 @@
 
 package docs.http.javadsl.server.testkit;
 
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.junit.Test;
 
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static akka.http.javadsl.server.PathMatchers.*;
-import static akka.http.javadsl.server.Directives.*;
+import static org.apache.pekko.http.javadsl.server.PathMatchers.*;
+import static org.apache.pekko.http.javadsl.server.Directives.*;
 
 
 public class PlayRoutesComparisonTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
index f1af1b1c1..adae2350f 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitFragmentTest.java
@@ -5,12 +5,12 @@
 package docs.http.javadsl.server.testkit;
 
 //#source-quote
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.server.AllDirectives;
-import akka.http.javadsl.server.Route;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.server.AllDirectives;
+import org.apache.pekko.http.javadsl.server.Route;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.junit.Test;
 
 public class TestKitFragmentTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
index b46afe52f..44714dca7 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestKitWithActorTest.java
@@ -5,14 +5,14 @@
 package docs.http.javadsl.server.testkit;
 
 //#testkit-actor-integration
-import akka.actor.testkit.typed.javadsl.TestProbe;
-import akka.actor.typed.ActorSystem;
-import akka.actor.typed.javadsl.Adapter;
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.actor.testkit.typed.javadsl.TestProbe;
+import org.apache.pekko.actor.typed.ActorSystem;
+import org.apache.pekko.actor.typed.javadsl.Adapter;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 
-import akka.http.javadsl.testkit.TestRoute;
-import akka.http.javadsl.testkit.TestRouteResult;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.testkit.TestRouteResult;
 import org.junit.Test;
 
 public class TestKitWithActorTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
index 280a35428..6cf11c50b 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/TestkitExampleTest.java
@@ -5,10 +5,10 @@
 package docs.http.javadsl.server.testkit;
 
 //#simple-app-testing
-import akka.http.javadsl.model.HttpRequest;
-import akka.http.javadsl.model.StatusCodes;
-import akka.http.javadsl.testkit.JUnitRouteTest;
-import akka.http.javadsl.testkit.TestRoute;
+import org.apache.pekko.http.javadsl.model.HttpRequest;
+import org.apache.pekko.http.javadsl.model.StatusCodes;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.TestRoute;
 import org.junit.Test;
 
 public class TestkitExampleTest extends JUnitRouteTest {
diff --git a/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java b/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
index 5aa20e63f..f47f695cc 100644
--- a/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
+++ b/docs/src/test/java/docs/http/javadsl/server/testkit/WithTimeoutTest.java
@@ -4,7 +4,7 @@
 
 package docs.http.javadsl.server.testkit;
 
-import akka.http.javadsl.testkit.JUnitRouteTest;
+import org.apache.pekko.http.javadsl.testkit.JUnitRouteTest;
 import org.junit.Test;
 import scala.concurrent.duration.FiniteDuration;
 
diff --git a/docs/src/test/resources/application.conf b/docs/src/test/resources/application.conf
index cdd69dd37..a89d4bf2b 100644
--- a/docs/src/test/resources/application.conf
+++ b/docs/src/test/resources/application.conf
@@ -1,4 +1,4 @@
-akka {
+pekko {
   # needed because we add pekko-actor-typed here but don't include an slf4j implementation
   use-slf4j = off
 }
diff --git a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
index e4bb73f83..4a943ded9 100644
--- a/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
+++ b/docs/src/test/scala/docs/ApiMayChangeDocCheckerSpec.scala
@@ -6,7 +6,7 @@ package docs
 
 import java.lang.reflect.Method
 
-import akka.annotation.ApiMayChange
+import org.apache.pekko.annotation.ApiMayChange
 import org.reflections.Reflections
 import org.reflections.scanners.{ MethodAnnotationsScanner, Scanners, TypeAnnotationsScanner }
 import org.reflections.util.{ ClasspathHelper, ConfigurationBuilder }
@@ -48,7 +48,7 @@ class ApiMayChangeDocCheckerSpec extends AnyWordSpec with Matchers {
 
   "compatibility-guidelines.md doc page" should {
     val reflections = new Reflections(new ConfigurationBuilder()
-      .setUrls(ClasspathHelper.forPackage("akka.http"))
+      .setUrls(ClasspathHelper.forPackage("org.apache.pekko.http"))
       .setScanners(
         Scanners.TypesAnnotated,
         Scanners.MethodsAnnotated))
diff --git a/docs/src/test/scala/docs/http/scaladsl/Http2ClientApp.scala b/docs/src/test/scala/docs/http/scaladsl/Http2ClientApp.scala
index 691ce8a83..b481f38dd 100644
--- a/docs/src/test/scala/docs/http/scaladsl/Http2ClientApp.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/Http2ClientApp.scala
@@ -4,17 +4,18 @@
 
 package docs.http.scaladsl
 
-import akka.actor.ActorSystem
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.ResponsePromise
-import akka.http.scaladsl.model.headers.HttpEncodings
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.headers
-import akka.stream.OverflowStrategy
-import akka.stream.scaladsl.Flow
-import akka.stream.scaladsl.Sink
-import akka.stream.scaladsl.Source
+import org.apache.pekko
+import pekko.actor.ActorSystem
+import pekko.http.scaladsl.Http
+import pekko.http.scaladsl.model.ResponsePromise
+import pekko.http.scaladsl.model.headers.HttpEncodings
+import pekko.http.scaladsl.model.HttpRequest
+import pekko.http.scaladsl.model.HttpResponse
+import pekko.http.scaladsl.model.headers
+import pekko.stream.OverflowStrategy
+import pekko.stream.scaladsl.Flow
+import pekko.stream.scaladsl.Sink
+import pekko.stream.scaladsl.Source
 import com.typesafe.config.ConfigFactory
 
 import scala.annotation.nowarn
@@ -27,7 +28,7 @@ object Http2ClientApp extends App {
   val config =
     ConfigFactory.parseString(
       """
-         # akka.loglevel = debug
+         # pekko.loglevel = debug
          akka.http.client.http2.log-frames = true
          akka.http.client.parsing.max-content-length = 20m
       """).withFallback(ConfigFactory.defaultApplication())
diff --git a/docs/src/test/scala/docs/http/scaladsl/Http2Spec.scala b/docs/src/test/scala/docs/http/scaladsl/Http2Spec.scala
index a9a4ddce2..bbbc2129c 100644
--- a/docs/src/test/scala/docs/http/scaladsl/Http2Spec.scala
+++ b/docs/src/test/scala/docs/http/scaladsl/Http2Spec.scala
@@ -4,31 +4,39 @@
 
 package docs.http.scaladsl
 
-import akka.http.impl.util.ExampleHttpContexts
-import akka.http.scaladsl.model.{ HttpRequest, HttpResponse, StatusCodes }
+import org.apache.pekko
+import pekko.http.impl.util.ExampleHttpContexts
+import pekko.http.scaladsl.model.{ HttpRequest, HttpResponse, StatusCodes }
 
 //#bindAndHandleSecure
 import scala.concurrent.Future
 
-import akka.http.scaladsl.HttpsConnectionContext
 //#bindAndHandleSecure
 
-//#http2ClientWithPriorKnowledge
-//#http2Client
 //#bindAndHandleSecure
 //#bindAndHandlePlain
-import akka.http.scaladsl.Http
+import org.apache.pekko
+import pekko.http.scaladsl.Http
 //#bindAndHandlePlain
 //#bindAndHandleSecure
-//#http2Client
-//#http2ClientWithPriorKnowledge
+
+//#bindAndHandleSecure
+import pekko.http.scaladsl.HttpsConnectionContext
+//#bindAndHandleSecure
+
+// #http2ClientWithPriorKnowledge
+// #http2Client
+import org.apache.pekko.http.scaladsl.Http
+
+// #http2Client
+// #http2ClientWithPriorKnowledge
 
 //#bindAndHandlePlain
-import akka.http.scaladsl.HttpConnectionContext
+import pekko.http.scaladsl.HttpConnectionContext
 
 //#bindAndHandlePlain
 
-import akka.actor.ActorSystem
+import pekko.actor.ActorSystem
 
 object Http2Spec {
   implicit val system: ActorSystem = ActorSystem()
@@ -44,8 +52,8 @@ object Http2Spec {
   }
 
   {
-    import akka.http.scaladsl.server.Route
-    import akka.http.scaladsl.server.directives.RouteDirectives.complete
+    import pekko.http.scaladsl.server.Route
+    import pekko.http.scaladsl.server.directives.RouteDirectives.complete
 
     val handler: HttpRequest => Future[HttpResponse] =
       Route.toFunction(complete(StatusCodes.ImATeapot))
@@ -65,12 +73,13 @@ object Http2Spec {
 
   {
     // #trailingHeaders
-    import akka.http.scaladsl.model.ContentTypes
-    import akka.http.scaladsl.model.HttpEntity
-    import akka.http.scaladsl.model.Trailer
-    import akka.http.scaladsl.model.AttributeKeys.trailer
-    import akka.http.scaladsl.model.headers.RawHeader
-    import akka.util.ByteString
+    import org.apache.pekko
+    import pekko.http.scaladsl.model.ContentTypes
+    import pekko.http.scaladsl.model.HttpEntity
+    import pekko.http.scaladsl.model.Trailer
+    import pekko.http.scaladsl.model.AttributeKeys.trailer
+    import pekko.http.scaladsl.model.headers.RawHeader
+    import pekko.util.ByteString
 
     HttpResponse(StatusCodes.OK, entity = HttpEntity.Strict(ContentTypes.`text/plain(UTF-8)`, ByteString("Tralala")))
       .addAttribute(trailer, Trailer(RawHeader("name", "value")))
diff --git a/docs/src/test/scala/docs/http/scaladsl/HttpClientCollectingHeaders.scala b/docs/src/test/scala/docs/http/scaladsl/HttpClientCollectingHeaders.scala
index 95cf0e09a..68436da6b 100644
... 242226 lines suppressed ...


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