diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ConnectionPoolBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ConnectionPoolBenchmark.scala
index e663be8f8..5e4e147b9 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ConnectionPoolBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ConnectionPoolBenchmark.scala
@@ -76,7 +76,7 @@ class ConnectionPoolBenchmark extends CommonBenchmark {
            pekko.http.client.user-agent = pekko-http-bench
         """)
         .withFallback(ConfigFactory.load())
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
 
     val responseBytes = ByteString(
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/HttpEntityBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/HttpEntityBenchmark.scala
index 2d645a7f1..632048b0a 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/HttpEntityBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/HttpEntityBenchmark.scala
@@ -53,7 +53,7 @@ class HttpEntityBenchmark extends CommonBenchmark {
            pekko.actor.default-dispatcher.fork-join-executor.parallelism-max = 1
         """)
         .withFallback(ConfigFactory.load())
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
 
     entity = entityType match {
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ServerProcessingBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ServerProcessingBenchmark.scala
index b73939dba..537ee7861 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ServerProcessingBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/ServerProcessingBenchmark.scala
@@ -61,7 +61,7 @@ class ServerProcessingBenchmark extends CommonBenchmark {
            pekko.http.server.server-header = "pekko-http-bench"
         """)
         .withFallback(ConfigFactory.load())
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
     httpFlow =
       Flow[HttpRequest].map(_ => response).join(
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/StreamServerProcessingBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/StreamServerProcessingBenchmark.scala
index a5f9ab7da..64a23b5df 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/StreamServerProcessingBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/StreamServerProcessingBenchmark.scala
@@ -83,7 +83,7 @@ class StreamServerProcessingBenchmark extends CommonBenchmark {
            pekko.actor.default-dispatcher.fork-join-executor.parallelism-max = 1
         """)
         .withFallback(ConfigFactory.load())
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
 
     val bytesPerChunk = totalBytes.toInt / numChunks.toInt
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ClientServerBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ClientServerBenchmark.scala
index a4ec4798d..fd1afd074 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ClientServerBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ClientServerBenchmark.scala
@@ -71,7 +71,7 @@ class H2ClientServerBenchmark extends CommonBenchmark with H2RequestResponseBenc
   def setup(): Unit = {
     initRequestResponse()
 
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
     val settings = implicitly[ServerSettings]
     val log = system.log
diff --git a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ServerProcessingBenchmark.scala b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ServerProcessingBenchmark.scala
index d03c3c22d..d24e5b7fc 100644
--- a/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ServerProcessingBenchmark.scala
+++ b/http-bench-jmh/src/main/scala/org/apache/pekko/http/impl/engine/http2/H2ServerProcessingBenchmark.scala
@@ -70,7 +70,7 @@ class H2ServerProcessingBenchmark extends CommonBenchmark with H2RequestResponse
   def setup(): Unit = {
     initRequestResponse()
 
-    system = ActorSystem("AkkaHttpBenchmarkSystem", config)
+    system = ActorSystem("PekkoHttpBenchmarkSystem", config)
     mat = ActorMaterializer()
     val settings = implicitly[ServerSettings]
     val log = system.log
diff --git a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HostConnectionPoolSpec.scala b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HostConnectionPoolSpec.scala
index 39dd9df6f..4f2342c57 100644
--- a/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HostConnectionPoolSpec.scala
+++ b/http-core/src/test/scala/org/apache/pekko/http/impl/engine/client/HostConnectionPoolSpec.scala
@@ -83,7 +83,7 @@ class HostConnectionPoolSpec extends PekkoSpecWithMaterializer(
   testSet(clientServerImplementation = PassThrough)
   testSet(clientServerImplementation = PekkoHttpEngineNoNetwork)
   testSet(clientServerImplementation = PekkoHttpEngineTCP)
-  // testSet(poolImplementation = NewPoolImplementation, clientServerImplementation = AkkaHttpEngineTLS)
+  // testSet(poolImplementation = NewPoolImplementation, clientServerImplementation = PekkoHttpEngineTLS)
 
   def testSet(clientServerImplementation: ClientServerImplementation) =
     s"NewPoolImplementation on $clientServerImplementation" should {
diff --git a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
index e6d83ef88..0f1af3271 100644
--- a/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
+++ b/http/src/main/java/org/apache/pekko/http/javadsl/server/HttpApp.java
@@ -16,7 +16,6 @@
 import org.apache.pekko.Done;
 import org.apache.pekko.actor.ActorSystem;
 import org.apache.pekko.event.Logging;
-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.settings.ServerSettings;
@@ -33,7 +32,7 @@
 /**
  * DEPRECATED, consider https://github.com/theiterators/pekko-http-quickstart-java.g8 instead
  *
- * <p>Bootstrap trait for Http Server. It helps booting up an pekko-http server by only defining the
+ * <p>Bootstrap trait for Http Server. It helps booting up a pekko-http server by only defining the
  * desired routes. It offers additional hooks to modify the default behavior.
  *
  * @deprecated HttpApp this doesn't reflect the latest APIs, since Akka HTTP 10.2.0
diff --git a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
index 1123fd37e..a55895df8 100644
--- a/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
+++ b/http/src/main/scala/org/apache/pekko/http/scaladsl/server/HttpApp.scala
@@ -32,7 +32,7 @@ import scala.util.{ Failure, Success, Try }
 /**
  * DEPRECATED, consider https://github.com/theiterators/pekko-http-quickstart-scala.g8 instead
  *
- * Bootstrap trait for Http Server. It helps booting up an pekko-http server by only defining the desired routes.
+ * Bootstrap trait for Http Server. It helps booting up a pekko-http server by only defining the desired routes.
  * It offers additional hooks to modify the default behavior.
  */
 @deprecated("HttpApp this doesn't reflect the latest APIs", "Akka HTTP 10.2.0")