diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
index abedb4ba5..0fcb42392 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/BenchRunner.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
index 122f4b7d1..4babe8e02 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/CommonBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
index 9100cf5ba..c666f8246 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/GrpcMarshallingBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
index 924b6b7ba..0e8ed5294 100644
--- a/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
+++ b/benchmarks/src/main/scala/org/apache/pekko/grpc/HandlerProcessingBenchmark.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/build.sbt b/build.sbt
index c9639e0cf..14d19a6f2 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
 import org.apache.pekko.grpc.Dependencies
 import org.apache.pekko.grpc.Dependencies.Versions.{ scala212, scala213 }
 import org.apache.pekko.grpc.ProjectExtensions._
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
index 683457d1d..5e758e4df 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/CodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
index 3eb2b3e39..051dc1894 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Constants.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
index 3506f510f..76d6ec755 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Logging.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
index 8f97954fe..bfe29ea81 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/Main.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
index 84c76ab3e..45d39fe71 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/MethodType.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
index 703e16420..00f7dad84 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/ProtocSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
index d1ea149bd..2fe48f5b1 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaClientCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
index 43730d158..02f10f9a9 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
index 08e8e0052..ca731979f 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaInterfaceCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
index 91ca91cee..bb0f95a8b 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/JavaServerCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
index e068cb6b3..e8ef2e8e5 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Method.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
index c484032e8..4db13e1f7 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Serializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
index f77098629..b3603f314 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/javadsl/Service.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
index 93ba82194..96dda0809 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Method.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
index 844c5a41f..678bb3672 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaClientCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
index 9c67b38af..65a61c0a2 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
index a9f59d1b1..57442e18d 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaMarshallersCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
index 7600d59da..be053dc30 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaServerCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
index 488a45bb6..9513e4eaa 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/ScalaTraitCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
index 9bfcef2b6..3d5040b87 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Serializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
index eaae97a27..949618075 100644
--- a/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
+++ b/codegen/src/main/scala/org/apache/pekko/grpc/gen/scaladsl/Service.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
index 48bdb17d5..4ac7787c1 100644
--- a/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/Client.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
index 8756bc7b9..82dba0a63 100644
--- a/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/ClientPowerApi.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
index 068943401..b570aab0e 100644
--- a/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaClient/GenMethodImports.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
index 1e8d8f16c..6f65307ae 100644
--- a/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaCommon/ApiInterface.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
index 517e4d1df..de2467014 100644
--- a/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/Handler.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
index 3f3aba8dc..4fb1cb6ea 100644
--- a/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
+++ b/codegen/src/main/twirl/templates/JavaServer/PowerApiInterface.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
index b4fd53b63..c59c55916 100644
--- a/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaClient/Client.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
index e06c0982d..7de502e15 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/ApiTrait.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
index 167c4e89e..b531649e7 100644
--- a/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaCommon/Marshallers.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
index 55ce73e1e..a5ce73938 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/Handler.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
index 631e5e3f5..962edee02 100644
--- a/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
+++ b/codegen/src/main/twirl/templates/ScalaServer/PowerApiTrait.scala.txt
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  *@
 
 @*
diff --git a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
index 11f1722de..0064f433f 100644
--- a/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
+++ b/codegen/src/test/scala/org/apache/pekko/grpc/gen/javadsl/ServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
index 4e2a70d2f..9673fed80 100644
--- a/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
+++ b/interop-tests/src/main/java/io/grpc/testing/integration2/ClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
index 012fd91ce..f88d339c4 100644
--- a/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
+++ b/interop-tests/src/main/java/io/grpc/testing/integration2/GrpcJavaClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
index d98b945d5..816d6ac78 100644
--- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcClientJava.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
index 5d55e06bc..795dfe22c 100644
--- a/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
+++ b/interop-tests/src/main/java/org/apache/pekko/grpc/interop/PekkoGrpcServerJava.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
index 7a6a46b9c..95f0cfa1e 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/ChannelBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
index 18864dfc9..dca3f4797 100644
--- a/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
+++ b/interop-tests/src/main/scala/io/grpc/testing/integration2/Settings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
index 9c6e8454e..c0e3af204 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
index 68c631c9e..b1e4dd629 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcInteropTests.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
index c0f393651..809d87e76 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/GrpcServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
index 9e324bb46..89d335811 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
index 521d8e7cf..e2d5e5f75 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/IoGrpcServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
index 10e545f35..b7dde754e 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcClientScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
index 4593963ac..8896e1ec5 100644
--- a/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
+++ b/interop-tests/src/main/scala/org/apache/pekko/grpc/interop/PekkoGrpcServerScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
index 538575afe..b2f75369e 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/ExceptionGreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
index 87d98f862..a5324dd9c 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
index 6c2ada2cf..db859ba87 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorModelTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
index 1741ac5f4..a5ef34b61 100644
--- a/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
+++ b/interop-tests/src/test/java/example/myapp/helloworld/grpc/RichErrorNativeImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
index 1815b50b0..efa13fb9b 100644
--- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/JavaTestServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
index 244cd234f..f27b98043 100644
--- a/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
+++ b/interop-tests/src/test/java/org/apache/pekko/grpc/interop/PekkoGrpcJavaClientTester.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
index 488760cdf..c056fba80 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/GrpcInteropSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
index dc64c4ae8..fb7d23aca 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoGrpcScalaClientTester.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
index 7a05fd48c..af3b32219 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/PekkoHttpServerProviderScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
index 4be73bd1e..dd48cd9dc 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/TestServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
index 694c44b32..0901c6983 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/interop/app/PekkoHttpServerAppScala.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
index b3356457c..9c016ca7e 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/CountingGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
index 6765463f4..a7d81465c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcChannelSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 76228adc4..3741768a5 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
index 9bbbe92cf..c32ac83f6 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshallingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
index a7dda5cc3..408a56f84 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/LoadBalancingIntegrationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
index cfe734357..7d1a46c2c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/NonBalancingIntegrationSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
index 9fb4bfcc5..9a38b1bf8 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerApiSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
index 327e8bf4d..a555d9171 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/PowerGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
index 74bdd683d..4013ab7a9 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/RichErrorModelSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
index 21c8e4a0b..b784e698c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/TelemetrySpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
index 702ab9152..1f088de6c 100644
--- a/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
+++ b/interop-tests/src/test/scala/org/apache/pekko/grpc/scaladsl/tools/MutableServiceDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
index 3e32b1f8b..947bf1787 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/AbstractGenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
index 32838a04b..50d4d8218 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/GenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
index 827f378fe..2312c6ed7 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/ProtocBridgeCodeGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
index d50db2864..def4848cb 100644
--- a/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
+++ b/maven-plugin/src/main/scala/org/apache/pekko/grpc/maven/TestGenerateMojo.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
index accbb8398..0eaabc705 100644
--- a/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
+++ b/maven-plugin/src/test/scala/org/apache/pekko/grpc/maven/ProtocSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
index 6463c7a06..04b38df07 100644
--- a/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/CombinedServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
index 21dcc7f1c..4e82da2c1 100644
--- a/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/echo/EchoServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
index b92d3503a..11fbdbaaf 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/AuthenticatedGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
index 9f19ce558..b82d3acde 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterClient.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
index 666653f2a..bfe3bcfbb 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
index f49e2c8c7..002c3fb07 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
index be19e8502..be6792e59 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/GreeterServicePowerApiImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
index 7a554dffd..f599e0ba0 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LiftedGreeterClient.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
index 8c0d9b5c8..5f975f078 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
index 10d2d32d1..ebd8c51b8 100644
--- a/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
+++ b/plugin-tester-java/src/main/java/example/myapp/helloworld/PowerGreeterServer.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
index 8aa82c5ab..11274b29a 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterActor.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
index a8f50f869..c941910d3 100644
--- a/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
+++ b/plugin-tester-java/src/main/java/example/myapp/statefulhelloworld/GreeterServiceImpl.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index 553b3276d..83fc07b84 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
index 3fb9496aa..087fc7891 100644
--- a/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
+++ b/plugin-tester-java/src/test/scala/example/myapp/helloworld/JGreeterServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
index 339449d8c..e17d02f04 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/CombinedServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
index fd9e6701b..5ea85446b 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/echo/EchoServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
index 77331d260..5156238f4 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
index d76436810..4d022d906 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/AuthenticatedGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
index 28a2e30ff..38f2321f8 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
index bbf2e8bc6..ebf272987 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
index 010a63cf5..b80de2feb 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/GreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
index 401e08ab3..70bc15e48 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LiftedGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
index 4a549a8b9..18b2a6e3e 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
index 3769f916e..d99a7fc2b 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/LoggingErrorHandlingGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
index 339305d42..bf093c787 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
index d3cf9e931..3c33c2370 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/helloworld/PowerGreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
index 07a8660b5..5ce53fed3 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterActor.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
index e29304ead..21d16d03a 100644
--- a/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
+++ b/plugin-tester-scala/src/main/scala/example/myapp/statefulhelloworld/GreeterServiceImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
index 7d4bdc639..ae43a08d8 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/ErrorReportingSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
index 0b642d279..3cdc4af4d 100644
--- a/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
+++ b/plugin-tester-scala/src/test/scala/example/myapp/helloworld/GreeterServiceSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/project/Assemblies.scala b/project/Assemblies.scala
index 12d881ba8..ab57bdab1 100644
--- a/project/Assemblies.scala
+++ b/project/Assemblies.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import java.io.{ File, FileInputStream, FileOutputStream }
diff --git a/project/AutomaticModuleName.scala b/project/AutomaticModuleName.scala
index 77c266caf..19caf808f 100644
--- a/project/AutomaticModuleName.scala
+++ b/project/AutomaticModuleName.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /**
diff --git a/project/Common.scala b/project/Common.scala
index 780413fad..844090120 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/CopyrightHeader.scala b/project/CopyrightHeader.scala
index d17b58c26..30c654993 100644
--- a/project/CopyrightHeader.scala
+++ b/project/CopyrightHeader.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
@@ -43,7 +43,7 @@ object CopyrightHeader extends AutoPlugin {
       |
       |  https://www.apache.org/licenses/LICENSE-2.0
       |
-      |This file is part of the Apache Pekko project, derived from Akka.
+      |This file is part of the Apache Pekko project, which was derived from Akka.
       |""".stripMargin
 
   val apacheSpdxHeader: String = "SPDX-License-Identifier: Apache-2.0"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 163d89709..71133a20e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/NoPublish.scala b/project/NoPublish.scala
index db3a554dd..cb128013f 100644
--- a/project/NoPublish.scala
+++ b/project/NoPublish.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/ProjectExtensions.scala b/project/ProjectExtensions.scala
index 83ea6aecc..4b702c551 100644
--- a/project/ProjectExtensions.scala
+++ b/project/ProjectExtensions.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/ReflectiveCodeGen.scala b/project/ReflectiveCodeGen.scala
index eabf4ffb5..b6bb22cdc 100644
--- a/project/ReflectiveCodeGen.scala
+++ b/project/ReflectiveCodeGen.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc.build
diff --git a/project/SbtMavenPlugin.scala b/project/SbtMavenPlugin.scala
index 27379589c..36214f445 100644
--- a/project/SbtMavenPlugin.scala
+++ b/project/SbtMavenPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/VersionGenerator.scala b/project/VersionGenerator.scala
index 524084cc7..7954131f3 100644
--- a/project/VersionGenerator.scala
+++ b/project/VersionGenerator.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 import sbt.Keys._
diff --git a/project/VersionSyncCheckPlugin.scala b/project/VersionSyncCheckPlugin.scala
index 444438808..4c5c0fa46 100644
--- a/project/VersionSyncCheckPlugin.scala
+++ b/project/VersionSyncCheckPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 package org.apache.pekko.grpc
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 1780ec6c4..5059c3d22 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,3 +1,12 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, derived from Akka.
+ */
+
 enablePlugins(BuildInfoPlugin)
 
 val sbtProtocV = "1.0.6"
@@ -6,7 +15,7 @@ buildInfoKeys := Seq[BuildInfoKey]("sbtProtocVersion" -> sbtProtocV)
 
 addSbtPlugin("lt.dvim.authors" % "sbt-authors" % "1.3")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
-addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.9.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % sbtProtocV)
 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.1")
@@ -17,7 +26,7 @@ addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
 addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
-addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.5")
+addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.6")
 
 // allow access to snapshots for pekko-sbt-paradox
 resolvers += Resolver.ApacheMavenSnapshotsRepo
diff --git a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
index 375b7b822..da1a272b2 100644
--- a/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
+++ b/runtime/src/main/java/org/apache/pekko/grpc/PekkoGrpcGenerated.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
index f78b0c102..f9b94f2c2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcChannel.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
index 62482b0b0..e665b1934 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientCloseException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
index b762d8616..f603d9b4a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientResponse.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
index 87f3adb96..1ef050147 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcClientSettings.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
index 9c63b8102..1d8e2f042 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcProtocol.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
index 2b1903e70..f0440a2b9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/GrpcServiceException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
index d836ef450..64538749f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
index 13e93e8a8..78961019f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/SSLContextUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
index 179fc4912..0105d22cc 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/ServiceDescription.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
index a28b544ea..2c757e684 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/Trailers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
index 994720708..d1d6379d2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/AbstractGrpcProtocol.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
index 49cd4bb21..40e835b00 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ByteStringUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
index 0f6cb125e..a6cc72821 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/CancellationBarrierGraphStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
index 5fbd99286..f823e9a1e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ChannelUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
index fddd4a3ca..75b3632e0 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ClientState.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
index 3e4aaf6bc..24b31a8f8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
index 3c7822981..4d369184a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Codecs.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
index f704d4e34..1ecdf3ada 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/DecodeBase64.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
index 7f7e8c6b8..75a7da03d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcEntityHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
index a5ca903dd..b5c34865e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolNative.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
index 62125743c..9519e1d56 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcProtocolWeb.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
index 184597f9d..0fc12b44c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcRequestHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
index 04717ceec..bb41a680d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/GrpcResponseHelpers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
index 8f9da9326..ce9aea0c6 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Gzip.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
index 36156d1c0..4054faa6d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/HardcodedServiceDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
index 8552611cf..281f5b6be 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Identity.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
index 99c1c907b..5c22c5f41 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/InternalChannel.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
index 6ea8e58e6..dcc0bd04a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/Marshallers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
index 61a7a84be..bccee659a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MetadataImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
index 767bd889c..87dc1b00a 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/MissingParameterException.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
index bebf8eebb..7d27799a9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/NettyClientUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
index 5fa978620..e8821305c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolver.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
index c5257a788..66b5735ad 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProvider.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
index 840f51567..01215c2b1 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtils.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
index bdde0b5b5..e129b5b35 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/PekkoNettyGrpcClientGraphStage.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
index d2def1094..0d51615f0 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/RequestBuilderImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
index f56eee2ed..c5a311316 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServerReflectionImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
index 4f6f8ffcb..63a6a32d1 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/ServiceDescriptionImpl.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
index 6b3de6017..3123c2239 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/SingleParameterSink.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
index d35ade431..67d5fa150 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/TelemetrySpi.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
index 018fd1472..1a491ccb8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/UnaryCallAdapter.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
index b58479109..43966e113 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/internal/WithProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
index 795299e14..054f5aa14 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
index 65aeb1674..76ec34c30 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcExceptionHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
index 8fc5868d2..9711ac304 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/GrpcMarshalling.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
index e69212056..4dc69c83f 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/Metadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
index 7adaf9a6c..5148d9459 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
index bd281c85f..e504f3910 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/MetadataEntry.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
index 695f1b69d..ad6e64a03 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/PekkoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
index 06567e5c9..860fb227e 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/RequestBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
index 9004849cd..d81d3521d 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServerReflection.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
index 6ed3c39b6..a01303daf 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/ServiceHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
index ea178fa63..2669f4362 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/WebHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
index dd53f4246..4c3b4aa18 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/javadsl/package.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
index 05bb1e7fa..69326e5c4 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Grpc.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
index bb4076643..157e21ee9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
index ec5ff3d25..e99285e30 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/GrpcMarshalling.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
index 743e02e13..d8ce6056c 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/Metadata.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
index 7b5b76f99..1a20fc8a8 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
index f85aa719a..14d937f1b 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/MetadataEntry.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
index e86709c60..2d1f530a2 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/PekkoGrpcClient.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
index 2002e7fef..89e09f5a5 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/RequestBuilder.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
index 3f6c2d211..1e997c662 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializer.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
index 9752f69ec..3510f29fe 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServerReflection.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
index 7d1aba5c8..c816321a3 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/ServiceHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
index 0beb80d06..d16f247b9 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/WebHandler.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
index e903d0da3..86c097411 100644
--- a/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
+++ b/runtime/src/main/scala/org/apache/pekko/grpc/scaladsl/headers/headers.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
index c6729af37..376dcd21b 100644
--- a/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
+++ b/runtime/src/test/java/jdocs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
index e1b1885db..6f24a8346 100644
--- a/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
+++ b/runtime/src/test/java/org/apache/pekko/grpc/javadsl/ConcatOrNotFoundTest.java
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
index 7135d3dda..ce91806f6 100644
--- a/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
+++ b/runtime/src/test/scala/docs/org/apache/pekko/grpc/client/GrpcClientSettingsCompileOnly.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
index e2281d004..c57559134 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/CodecsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
index 0a0801773..22f87a7b6 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/GrpcClientSettingsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
index 0fab1b1ae..c2975219b 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/AlwaysTimingOutDiscovery.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
index 271bcd19a..649107fad 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ChannelUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
index c6ea585d4..59118383d 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/DecodeBase64Spec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
index d050a8d87..1c326b6e0 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/GrpcProtocolWebTextSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
index be933c36f..7aa38a2ec 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/MetadataImplSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
index b95df78e8..cd4079e66 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NameResolverListenerProbe.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
index c6fe2a276..55101a9b2 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/NettyClientUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
index 80750b587..ba19adbd0 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverProviderSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
index dffed6562..d1c1f04b3 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoDiscoveryNameResolverSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
index 9bcc37680..389b9d82f 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/PekkoHttpClientUtilsSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
index 699a57194..d1f70434f 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/internal/ServerReflectionImplSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
index 88d47e803..212c08248 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/javadsl/GoogleProtobufSerializerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
index 83e5d335e..7da9d95e6 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/GrpcExceptionHandlerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
index 6e8b49746..b5aef8a60 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/MetadataBuilderSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
index 5f73005d0..951503402 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/ScalapbProtobufSerializerSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
index 4d7e51466..e5fe5e0cd 100644
--- a/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
+++ b/runtime/src/test/scala/org/apache/pekko/grpc/scaladsl/headers/HeadersSpec.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
index 80123347c..13da7e158 100644
--- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
+++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/GeneratorBridge.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
index 0a4738137..4a8eeb9b3 100644
--- a/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
+++ b/sbt-plugin/src/main/scala/org/apache/pekko/grpc/sbt/PekkoGrpcPlugin.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*
diff --git a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
index fabba65b9..fcbf6132b 100644
--- a/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
+++ b/scalapb-protoc-plugin/src/main/scala/org/apache/pekko/grpc/scalapb/Main.scala
@@ -4,7 +4,7 @@
  *
  *   https://www.apache.org/licenses/LICENSE-2.0
  *
- * This file is part of the Apache Pekko project, derived from Akka.
+ * This file is part of the Apache Pekko project, which was derived from Akka.
  */
 
 /*