diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e54fd9e4..6884e88f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,5 +65,6 @@ jobs:
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
+    - uses: sbt/setup-sbt@v1
     - name: ci
       run: sbt ci
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d69ab720..3fcc40d3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,7 @@ jobs:
         with:
           distribution: temurin
           java-version: 8
+      - uses: sbt/setup-sbt@v1
       - run: sbt versionCheck ci-release
         env:
           PGP_PASSPHRASE: ${{secrets.PGP_PASSPHRASE}}
diff --git a/NOTICE b/NOTICE
index a4330bc5..2aa9fb0f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,10 +1,10 @@
 scala-collection-compat
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
+Copyright (c) 2002-2024 EPFL
+Copyright (c) 2011-2024 Lightbend, Inc. dba Akka
 
 Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
-Lightbend, Inc. (https://www.lightbend.com/).
+Akka (https://akka.io/)
 
 Licensed under the Apache License, Version 2.0 (the "License").
 Unless required by applicable law or agreed to in writing, software
diff --git a/binary-compat/new/src/main/scala/org.example/Lib.scala b/binary-compat/new/src/main/scala/org.example/Lib.scala
index f353d9d4..d9a465ee 100644
--- a/binary-compat/new/src/main/scala/org.example/Lib.scala
+++ b/binary-compat/new/src/main/scala/org.example/Lib.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/binary-compat/old/src/main/scala/org.example/Lib.scala b/binary-compat/old/src/main/scala/org.example/Lib.scala
index 25857a6c..fab53f46 100644
--- a/binary-compat/old/src/main/scala/org.example/Lib.scala
+++ b/binary-compat/old/src/main/scala/org.example/Lib.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/binary-compat/test/src/test/scala/BinaryCompaTest.scala b/binary-compat/test/src/test/scala/BinaryCompaTest.scala
index c8915e6a..a2a2e9d5 100644
--- a/binary-compat/test/src/test/scala/BinaryCompaTest.scala
+++ b/binary-compat/test/src/test/scala/BinaryCompaTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/build.sbt b/build.sbt
index 3a5cba4e..9bde30bc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@ import _root_.scalafix.sbt.BuildInfo.{scalafixVersion, scala212 => scalafixScala
 lazy val commonSettings = Seq(
   headerLicense := Some(HeaderLicense.Custom(s"""|Scala (https://www.scala-lang.org)
                                                  |
-                                                 |Copyright EPFL and Lightbend, Inc.
+                                                 |Copyright EPFL and Lightbend, Inc. dba Akka
                                                  |
                                                  |Licensed under Apache License 2.0
                                                  |(http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala b/compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
index 9a179fc1..aed433d6 100644
--- a/compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+++ b/compat/jsNative/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala b/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
index b85e43b8..5e103bc8 100644
--- a/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
+++ b/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionConverters.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala b/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
index c1124271..4b2d4ea4 100644
--- a/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
+++ b/compat/jvm/src/main/scala-2.11_2.12/scala/jdk/OptionShape.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11/scala/annotation/nowarn.scala b/compat/src/main/scala-2.11/scala/annotation/nowarn.scala
index 3312a82e..b4b0edb5 100644
--- a/compat/src/main/scala-2.11/scala/annotation/nowarn.scala
+++ b/compat/src/main/scala-2.11/scala/annotation/nowarn.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11/scala/collection/compat/package.scala b/compat/src/main/scala-2.11/scala/collection/compat/package.scala
index 117df132..26f66260 100644
--- a/compat/src/main/scala-2.11/scala/collection/compat/package.scala
+++ b/compat/src/main/scala-2.11/scala/collection/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala b/compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
index af0b911b..dd4b329a 100644
--- a/compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
+++ b/compat/src/main/scala-2.11/scala/jdk/javaapi/CollectionConverters.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11/scala/util/Using.scala b/compat/src/main/scala-2.11/scala/util/Using.scala
index c54d78a1..26cbd01f 100644
--- a/compat/src/main/scala-2.11/scala/util/Using.scala
+++ b/compat/src/main/scala-2.11/scala/util/Using.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala b/compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala
index af53118e..bbe9e1e5 100644
--- a/compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/annotation/unused.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
index be5fda06..c6090837 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/BuildFrom.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
index 24d45465..bbcf96e0 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
index a5511615..74df7b29 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
index 1cb82f21..e68a0458 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/RandomExtensions.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
index 9b5936aa..4ca7af71 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/StringParsers.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
index 28ceaa82..1715dcad 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/ArraySeq.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
index ad438049..88959bab 100644
--- a/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/collection/compat/immutable/LazyList.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala b/compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala
index 3cefffdc..dce52b25 100644
--- a/compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/jdk/CollectionConverters.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala b/compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala
index 56025061..4bf7c098 100644
--- a/compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/util/ChainingOps.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala b/compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
index 6f1c4c66..c0fe9d43 100644
--- a/compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/util/control/compat/ControlThrowable.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala b/compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
index 9f0bf8f2..66139d06 100644
--- a/compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
+++ b/compat/src/main/scala-2.11_2.12/scala/util/matching/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.12/scala/collection/compat/package.scala b/compat/src/main/scala-2.12/scala/collection/compat/package.scala
index e1e07238..3ed7bad4 100644
--- a/compat/src/main/scala-2.12/scala/collection/compat/package.scala
+++ b/compat/src/main/scala-2.12/scala/collection/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala b/compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
index 1266d8b2..03f24efe 100644
--- a/compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
+++ b/compat/src/main/scala-2.12/scala/jdk/javaapi/CollectionConverters.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.12/scala/util/Using.scala b/compat/src/main/scala-2.12/scala/util/Using.scala
index dfb45b86..b59c007d 100644
--- a/compat/src/main/scala-2.12/scala/util/Using.scala
+++ b/compat/src/main/scala-2.12/scala/util/Using.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala b/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala
index 4985a9b8..41c7d8c9 100644
--- a/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala
+++ b/compat/src/main/scala-2.13/scala/collection/compat/immutable/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.13/scala/collection/compat/package.scala b/compat/src/main/scala-2.13/scala/collection/compat/package.scala
index 3a575d21..c4092962 100644
--- a/compat/src/main/scala-2.13/scala/collection/compat/package.scala
+++ b/compat/src/main/scala-2.13/scala/collection/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.13/scala/util/control/compat/package.scala b/compat/src/main/scala-2.13/scala/util/control/compat/package.scala
index 41866d1a..346a2ef1 100644
--- a/compat/src/main/scala-2.13/scala/util/control/compat/package.scala
+++ b/compat/src/main/scala-2.13/scala/util/control/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/main/scala-2.13/scala/util/matching/compat/package.scala b/compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
index 7d0454c5..c60678a4 100644
--- a/compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
+++ b/compat/src/main/scala-2.13/scala/util/matching/compat/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala b/compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala
index 2e8bdb95..a296b722 100644
--- a/compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala
+++ b/compat/src/test/scala-2.11_2.12/test/scala/collection/ToConserveTest.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.collection
 
 import org.junit.Assert.{assertSame, assertNotSame}
diff --git a/compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala b/compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
index 21db92f7..7774b8ea 100644
--- a/compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
+++ b/compat/src/test/scala-js/test/scala/jdk/OptionConvertersTest.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.jdk
 
 import org.junit.Assert.assertEquals
diff --git a/compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala b/compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
index 61ebf1a3..696200fe 100644
--- a/compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
+++ b/compat/src/test/scala-jvm/test/scala/collection/LazyListGCTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala b/compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
index afe5d714..ef496bc0 100644
--- a/compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
+++ b/compat/src/test/scala-jvm/test/scala/collection/StringParsersJVMTest.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.collection
 
 import org.junit.Test
diff --git a/compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala b/compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
index f93d737b..4381530c 100644
--- a/compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
+++ b/compat/src/test/scala-jvm/test/scala/jdk/OptionConvertersJVMTest.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.jdk
 
 import org.junit.Assert.assertEquals
diff --git a/compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java b/compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
index 6567fe97..1484a819 100644
--- a/compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
+++ b/compat/src/test/scala-jvm/test/scala/jdk/javaapi/CollectionConvertersTest.java
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.jdk.javaapi;
 
 import org.junit.Assert;
diff --git a/compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala b/compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
index fd160be7..b72f87c8 100644
--- a/compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
+++ b/compat/src/test/scala-jvm/test/scala/jdk/javaapi/TestObjects.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.jdk.javaapi
 
 import scala.collection.concurrent.TrieMap
diff --git a/compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala b/compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
index 46adb959..d89917de 100644
--- a/compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
+++ b/compat/src/test/scala/scala/jdk/CollectionConvertersTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/scala/util/ChainingOpsTest.scala b/compat/src/test/scala/scala/util/ChainingOpsTest.scala
index 94e95304..2055f66d 100644
--- a/compat/src/test/scala/scala/util/ChainingOpsTest.scala
+++ b/compat/src/test/scala/scala/util/ChainingOpsTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/scala/util/UsingTest.scala b/compat/src/test/scala/scala/util/UsingTest.scala
index 4329cf7f..32f3a028 100644
--- a/compat/src/test/scala/scala/util/UsingTest.scala
+++ b/compat/src/test/scala/scala/util/UsingTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala b/compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala
index f7e7cb49..cb3dfa19 100644
--- a/compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala
+++ b/compat/src/test/scala/scala/util/control/compat/ControlThrowableTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala b/compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
index 212c2699..fe9ebd97 100644
--- a/compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
+++ b/compat/src/test/scala/scala/util/matching/compat/RegexOpsTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala b/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
index 07eba55d..683732ee 100644
--- a/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
+++ b/compat/src/test/scala/test/scala/collection/ArraySeqTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/AssertThrown.scala b/compat/src/test/scala/test/scala/collection/AssertThrown.scala
index 04a66fd2..47015aa8 100644
--- a/compat/src/test/scala/test/scala/collection/AssertThrown.scala
+++ b/compat/src/test/scala/test/scala/collection/AssertThrown.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/BuildFromTest.scala b/compat/src/test/scala/test/scala/collection/BuildFromTest.scala
index 332ef57c..81953c78 100644
--- a/compat/src/test/scala/test/scala/collection/BuildFromTest.scala
+++ b/compat/src/test/scala/test/scala/collection/BuildFromTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/CollectionTest.scala b/compat/src/test/scala/test/scala/collection/CollectionTest.scala
index 2902db91..2437fbad 100644
--- a/compat/src/test/scala/test/scala/collection/CollectionTest.scala
+++ b/compat/src/test/scala/test/scala/collection/CollectionTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/FactoryTest.scala b/compat/src/test/scala/test/scala/collection/FactoryTest.scala
index 3da74b29..2e502d99 100644
--- a/compat/src/test/scala/test/scala/collection/FactoryTest.scala
+++ b/compat/src/test/scala/test/scala/collection/FactoryTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala b/compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
index b4ae13e8..7ddb90b8 100644
--- a/compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
+++ b/compat/src/test/scala/test/scala/collection/LazyListLazinessTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/LazyListTest.scala b/compat/src/test/scala/test/scala/collection/LazyListTest.scala
index c13e4da4..5dac634d 100644
--- a/compat/src/test/scala/test/scala/collection/LazyListTest.scala
+++ b/compat/src/test/scala/test/scala/collection/LazyListTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/LazyZipTest.scala b/compat/src/test/scala/test/scala/collection/LazyZipTest.scala
index 38e2d61e..087b3b6c 100644
--- a/compat/src/test/scala/test/scala/collection/LazyZipTest.scala
+++ b/compat/src/test/scala/test/scala/collection/LazyZipTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/MapTest.scala b/compat/src/test/scala/test/scala/collection/MapTest.scala
index 67ed803a..5a580672 100644
--- a/compat/src/test/scala/test/scala/collection/MapTest.scala
+++ b/compat/src/test/scala/test/scala/collection/MapTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala b/compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
index 383cb8e9..db427a6f 100644
--- a/compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
+++ b/compat/src/test/scala/test/scala/collection/MinMaxOptionTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/NoImportTest.scala b/compat/src/test/scala/test/scala/collection/NoImportTest.scala
index d52de72c..9ca03eaa 100644
--- a/compat/src/test/scala/test/scala/collection/NoImportTest.scala
+++ b/compat/src/test/scala/test/scala/collection/NoImportTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/OptionTest.scala b/compat/src/test/scala/test/scala/collection/OptionTest.scala
index 3f8da23d..9ccc5d03 100644
--- a/compat/src/test/scala/test/scala/collection/OptionTest.scala
+++ b/compat/src/test/scala/test/scala/collection/OptionTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/QueueTest.scala b/compat/src/test/scala/test/scala/collection/QueueTest.scala
index d1128c4b..2c9bead6 100644
--- a/compat/src/test/scala/test/scala/collection/QueueTest.scala
+++ b/compat/src/test/scala/test/scala/collection/QueueTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/SortedTest.scala b/compat/src/test/scala/test/scala/collection/SortedTest.scala
index 93a7a07c..b4cb5820 100644
--- a/compat/src/test/scala/test/scala/collection/SortedTest.scala
+++ b/compat/src/test/scala/test/scala/collection/SortedTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/StreamTest.scala b/compat/src/test/scala/test/scala/collection/StreamTest.scala
index 74c11610..89b9b80b 100644
--- a/compat/src/test/scala/test/scala/collection/StreamTest.scala
+++ b/compat/src/test/scala/test/scala/collection/StreamTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/collection/StringParsersTest.scala b/compat/src/test/scala/test/scala/collection/StringParsersTest.scala
index 535fa72e..fc0c5c63 100644
--- a/compat/src/test/scala/test/scala/collection/StringParsersTest.scala
+++ b/compat/src/test/scala/test/scala/collection/StringParsersTest.scala
@@ -1,3 +1,15 @@
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc. dba Akka
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package test.scala.collection
 
 import org.junit.Test
diff --git a/compat/src/test/scala/test/scala/collection/ViewTest.scala b/compat/src/test/scala/test/scala/collection/ViewTest.scala
index be25c67b..289345b4 100644
--- a/compat/src/test/scala/test/scala/collection/ViewTest.scala
+++ b/compat/src/test/scala/test/scala/collection/ViewTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/compat/src/test/scala/test/scala/util/RandomTest.scala b/compat/src/test/scala/test/scala/util/RandomTest.scala
index 21468721..08670c76 100644
--- a/compat/src/test/scala/test/scala/util/RandomTest.scala
+++ b/compat/src/test/scala/test/scala/util/RandomTest.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala b/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
index 085ca8c6..ff097c6b 100644
--- a/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
+++ b/scalafix/data/src/main/scala/fix/conversions/JavaConversionsDataSrc.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala b/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala
index dbdd221b..efb29007 100644
--- a/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala
+++ b/scalafix/output213-failure/src/main/scala/fix/CanBuildFromNegSrc213Failure.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
index 753a9fd1..a1f84cf4 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Breakout.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala b/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
index 0b86bfdf..829e3b82 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/CanBuildFrom.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
index 9168835c..bfa2875e 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213CrossCompat.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
index 468b3d9c..0ba31c75 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Experimental.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
index eee6b50d..bf45c095 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Roughly.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
index 833176ea..6abf925b 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Collection213Upgrade.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala b/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala
index 95165310..e18f6d9f 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/PlaygroundRule.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala b/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
index c8682e1b..6a045df6 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/Stable212Base.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala b/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala
index 1414deba..b7bbafab 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/TypeMatcher.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/rules/src/main/scala/scala/fix/collection/package.scala b/scalafix/rules/src/main/scala/scala/fix/collection/package.scala
index b8013120..dff3b7d2 100644
--- a/scalafix/rules/src/main/scala/scala/fix/collection/package.scala
+++ b/scalafix/rules/src/main/scala/scala/fix/collection/package.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).
diff --git a/scalafix/tests/src/test/scala/fix/ScalafixTests.scala b/scalafix/tests/src/test/scala/fix/ScalafixTests.scala
index 674cee35..e814d84b 100644
--- a/scalafix/tests/src/test/scala/fix/ScalafixTests.scala
+++ b/scalafix/tests/src/test/scala/fix/ScalafixTests.scala
@@ -1,7 +1,7 @@
 /*
  * Scala (https://www.scala-lang.org)
  *
- * Copyright EPFL and Lightbend, Inc.
+ * Copyright EPFL and Lightbend, Inc. dba Akka
  *
  * Licensed under Apache License 2.0
  * (http://www.apache.org/licenses/LICENSE-2.0).