diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96b99d952c..34a2a9f925 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,7 +59,7 @@ jobs:
       if: ${{ matrix.jobtype == 3 }}
       shell: bash
       run: |
-        sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck generateContrabands
+        sbt -v -Dfile.encoding=UTF-8 scalafmtCheckAll scalafmtSbtCheck headerCheck "Test/headerCheck" generateContrabands
         git diff --exit-code
     - name: Benchmark (Scalac) (4)
       if: ${{ matrix.jobtype == 4 }}
diff --git a/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala b/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala
index bdf8f342e3..30de6319eb 100644
--- a/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala
+++ b/internal/compiler-bridge/src/main/scala/scala/reflect/ReflectAccess.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package scala.reflect
 
 import scala.tools.nsc.Global
diff --git a/internal/compiler-bridge/src/main/scala/xsbt/trace.scala b/internal/compiler-bridge/src/main/scala/xsbt/trace.scala
index c219b1a444..d71fe4b2f1 100644
--- a/internal/compiler-bridge/src/main/scala/xsbt/trace.scala
+++ b/internal/compiler-bridge/src/main/scala/xsbt/trace.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package xsbt
 
 object trace extends TraceSyntax {
diff --git a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala
index a33250cca9..fa155f6894 100644
--- a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala
+++ b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassCanonicalNameSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala
index 5cacd1fdeb..73f91f779d 100644
--- a/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala
+++ b/internal/zinc-apiinfo/src/test/scala/sbt/internal/inc/ClassToAPISpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala
index cfd3a2f588..38347bc6b4 100644
--- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala
+++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/ClassLikeHelpers.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala
index 507d7e7a6a..ed2cf24c59 100644
--- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala
+++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/HashAPISpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala b/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala
index 9c010e2f0b..7542839088 100644
--- a/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala
+++ b/internal/zinc-apiinfo/src/test/scala/xsbt/api/NameHashingSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala
index 2c219c79ce..53f768423b 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/AnalysisFormatBenchmark.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package xsbt
 
 import java.io.File
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala
index 7acf62ea75..fda6b06f3a 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkBase.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
index 3ad7e0fa4c..dd39f883b5 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/BenchmarkProjects.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala
index 59eecf109b..e7dfd8401a 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/GlobalBenchmarkSetup.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala
index 0b85d31bb3..4ffd685d97 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ScalacBenchmark.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala
index cd1028281f..45e90fb06e 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ShapelessBenchmark.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala
index 72e6dfeb30..3d63d60470 100644
--- a/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala
+++ b/internal/zinc-benchmarks/src/test/scala/xsbt/ZincBenchmark.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala
index dd116930b8..9386d8f783 100644
--- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala
+++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/AnalyzeSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala
index 3402d18715..7080ba7e89 100644
--- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala
+++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/IndexBasedZipFsOpsSpec.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.internal.inc
 package classfile
 
diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala
index 591e239df7..08ca817704 100644
--- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala
+++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/JavaCompilerForUnitTesting.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala
index 4305846706..9ac6dff080 100644
--- a/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala
+++ b/internal/zinc-classfile/src/test/scala/sbt/internal/inc/classfile/ParserSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java
index 401fe111d5..72b0ed06d7 100644
--- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java
+++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/bad.java
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java
index 8a1ca52360..e3b2107f5b 100644
--- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java
+++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/good.java
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java
index 8b00b1eedf..a8f480fdc5 100644
--- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java
+++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/hasstaticfinal.java
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java
index 9c31e8d21a..ba68925f70 100644
--- a/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java
+++ b/internal/zinc-compile-core/src/test/resources/sbt/internal/inc/javac/test1.java
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala
index 610a9184f5..afc40cdda6 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/ClassFileManagerDefaultsSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala
index 17eb20adc3..fb4ecbc81f 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/TestClassFileManager.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala
index 867bed4319..fe3effa917 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/VirtualDirectoryTest.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala
index 837e771e2e..952c52eb8b 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingLogger.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala
index b71efa7bc4..8d29b3c17b 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/CollectingReporter.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala
index b320c8a5d0..63eefd4bd6 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaCompilerSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala
index b092adfff8..15c8bd23d5 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorParserSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala
index f56d6aa8ec..e7adbddfd4 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavaErrorPositionTranslator.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala
index e0ab4ab8f9..6e8841663f 100644
--- a/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala
+++ b/internal/zinc-compile-core/src/test/scala/sbt/internal/inc/javac/JavacProcessLoggerSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala b/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala
index 5b5920195b..b5c371c01b 100644
--- a/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala
+++ b/internal/zinc-core/src/test/scala/sbt/internal/inc/HashSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala b/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala
index 7ae876500b..f4368d7794 100644
--- a/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala
+++ b/internal/zinc-core/src/test/scala/sbt/internal/inc/MiniSetupUtilSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala b/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala
index 22a8fbf8ed..7e3d6af4d2 100644
--- a/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala
+++ b/internal/zinc-persist/src/main/scala-2.12/sbt/internal/inc/consistent/Compat.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.internal.inc.consistent
 
 import java.util.Arrays
diff --git a/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala b/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala
index 8fa9219345..aea1a9950b 100644
--- a/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala
+++ b/internal/zinc-persist/src/main/scala-2.13/sbt/internal/inc/consistent/Compat.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.internal.inc.consistent
 
 object Compat {
diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala
index 2a2cc46fcc..78aea1106c 100644
--- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala
+++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentAnalysisFormat.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.internal.inc.consistent
 
 import java.nio.file.Paths
diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala
index 418eae932b..2cec0baa3a 100644
--- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala
+++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ConsistentFileAnalysisStore.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 // Based on zinc's FileAnalysisStore:
 package sbt.internal.inc.consistent
 
diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala
index 0419abf820..39be1419c2 100644
--- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala
+++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/ParallelGzipOutputStream.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 // Original code by Stefan Zeiger (see https://github.com/szeiger/zinc/blob/1d296b2fbeaae1cf14e4c00db0bbc2203f9783a4/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/NewParallelGzipOutputStream.scala)
 // Modified by Rex Kerr to use Java threads directly rather than Future
 package sbt.internal.inc.consistent
diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala
index 8f111a9b6f..709d53380e 100644
--- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala
+++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/consistent/Serializer.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.internal.inc.consistent
 
 import java.io.{
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala
index e4d1e23f9d..fd9a37bcb8 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisFormatHelpers.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala
index 9ce08dfedc..bcd6b83330 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/AnalysisGenerators.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala
index 66aa679236..5b88ee2ce1 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryAnalysisFormatSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala
index 1e63afb3fb..b586e7651a 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/BinaryMappersSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala
index b7e776b49b..161a734d39 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/binary/converter/InternalApiProxySpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala
index 4317db3556..efb1e61597 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatIntegrationSuite.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.inc.consistent
 
 import java.io.{ File, FileInputStream }
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala
index 00a604cb01..be417c4fc0 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ConsistentAnalysisFormatSuite.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.inc.consistent
 
 import org.scalatest.funsuite.AnyFunSuite
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala
index b2bbe89135..5330115d00 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/consistent/ParallelGzipOutputStreamSpecification.scala
@@ -1,3 +1,14 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package sbt.inc.consistent
 
 import org.scalatest.flatspec.AnyFlatSpec
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala
index 9073b31591..2753b3e9a1 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/Base64Specification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala
index aedd0ab6fd..220672a49f 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatHelpers.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala
index 16d3d237e5..4e3cea4c10 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextAnalysisFormatSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala
index d286b73f5e..fea4f2b95b 100644
--- a/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala
+++ b/internal/zinc-persist/src/test/scala/sbt/inc/text/TextMappersSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc-compile/src/test/scala/inc/DocSpec.scala b/zinc-compile/src/test/scala/inc/DocSpec.scala
index 16704e2f7a..8d244e690d 100644
--- a/zinc-compile/src/test/scala/inc/DocSpec.scala
+++ b/zinc-compile/src/test/scala/inc/DocSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sbt/inc/Depender.scala b/zinc/src/test/resources/sbt/inc/Depender.scala
index 814c2dcd2a..6f0229005c 100644
--- a/zinc/src/test/resources/sbt/inc/Depender.scala
+++ b/zinc/src/test/resources/sbt/inc/Depender.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sbt/inc/Ext1.scala b/zinc/src/test/resources/sbt/inc/Ext1.scala
index 7835ce4938..cd61d82026 100644
--- a/zinc/src/test/resources/sbt/inc/Ext1.scala
+++ b/zinc/src/test/resources/sbt/inc/Ext1.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sbt/inc/Ext2.scala b/zinc/src/test/resources/sbt/inc/Ext2.scala
index 921443e808..f423ece5a9 100644
--- a/zinc/src/test/resources/sbt/inc/Ext2.scala
+++ b/zinc/src/test/resources/sbt/inc/Ext2.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/Foo.scala b/zinc/src/test/resources/sources/Foo.scala
index 5b547c9af0..7162c0dca2 100644
--- a/zinc/src/test/resources/sources/Foo.scala
+++ b/zinc/src/test/resources/sources/Foo.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/Good.scala b/zinc/src/test/resources/sources/Good.scala
index 76cdc9667a..d59346a265 100644
--- a/zinc/src/test/resources/sources/Good.scala
+++ b/zinc/src/test/resources/sources/Good.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/NestedJavaClasses.java b/zinc/src/test/resources/sources/NestedJavaClasses.java
index 13f58336c0..f155f24da8 100644
--- a/zinc/src/test/resources/sources/NestedJavaClasses.java
+++ b/zinc/src/test/resources/sources/NestedJavaClasses.java
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/NoopMacroUsed.scala b/zinc/src/test/resources/sources/NoopMacroUsed.scala
index 09f1fe3d09..900ae01378 100644
--- a/zinc/src/test/resources/sources/NoopMacroUsed.scala
+++ b/zinc/src/test/resources/sources/NoopMacroUsed.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/a/A.scala b/zinc/src/test/resources/sources/a/A.scala
index 5a8d6e9ce3..23733eed14 100644
--- a/zinc/src/test/resources/sources/a/A.scala
+++ b/zinc/src/test/resources/sources/a/A.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/a/AA.scala b/zinc/src/test/resources/sources/a/AA.scala
index 4c04258cb9..e2ad13f6f4 100644
--- a/zinc/src/test/resources/sources/a/AA.scala
+++ b/zinc/src/test/resources/sources/a/AA.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/b/B.scala b/zinc/src/test/resources/sources/b/B.scala
index 20cfe2148b..767a53dafb 100644
--- a/zinc/src/test/resources/sources/b/B.scala
+++ b/zinc/src/test/resources/sources/b/B.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/b/c/C.scala b/zinc/src/test/resources/sources/b/c/C.scala
index 1832934d5c..81e8837a4e 100644
--- a/zinc/src/test/resources/sources/b/c/C.scala
+++ b/zinc/src/test/resources/sources/b/c/C.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/foo/NoopMacro.scala b/zinc/src/test/resources/sources/foo/NoopMacro.scala
index 3fd9e8f467..106bee2b46 100644
--- a/zinc/src/test/resources/sources/foo/NoopMacro.scala
+++ b/zinc/src/test/resources/sources/foo/NoopMacro.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala
index 75303301ad..f3c66062aa 100644
--- a/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala
+++ b/zinc/src/test/resources/sources/naha/ClientWithImplicitNotUsed.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala
index 2a6f4eabad..7030c523f9 100644
--- a/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala
+++ b/zinc/src/test/resources/sources/naha/ClientWithImplicitUsed.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala b/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala
index 317d5c70b9..d44f837e5a 100644
--- a/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala
+++ b/zinc/src/test/resources/sources/naha/ClientWithoutAnythingUsed.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala b/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala
index 813a5be282..326dde8b4b 100644
--- a/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala
+++ b/zinc/src/test/resources/sources/naha/ClientWithoutImplicit.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/NormalDependecy.scala b/zinc/src/test/resources/sources/naha/NormalDependecy.scala
index ec596886d6..f37f65a2fc 100644
--- a/zinc/src/test/resources/sources/naha/NormalDependecy.scala
+++ b/zinc/src/test/resources/sources/naha/NormalDependecy.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/Other.scala b/zinc/src/test/resources/sources/naha/Other.scala
index de0e5cc495..bfc79b2ce0 100644
--- a/zinc/src/test/resources/sources/naha/Other.scala
+++ b/zinc/src/test/resources/sources/naha/Other.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/Other2.scala b/zinc/src/test/resources/sources/naha/Other2.scala
index d09f2f6567..7e8f820881 100644
--- a/zinc/src/test/resources/sources/naha/Other2.scala
+++ b/zinc/src/test/resources/sources/naha/Other2.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/Other3.scala b/zinc/src/test/resources/sources/naha/Other3.scala
index 3818ef95e8..b4aabffa40 100644
--- a/zinc/src/test/resources/sources/naha/Other3.scala
+++ b/zinc/src/test/resources/sources/naha/Other3.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/resources/sources/naha/WithImplicits.scala b/zinc/src/test/resources/sources/naha/WithImplicits.scala
index 0b50c077cb..df8ca90850 100644
--- a/zinc/src/test/resources/sources/naha/WithImplicits.scala
+++ b/zinc/src/test/resources/sources/naha/WithImplicits.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala b/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala
index 96079a9795..96ce9d6460 100644
--- a/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/AuxiliaryClassFilesSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala
index 01619430fa..7597740103 100644
--- a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala b/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala
index 4038d495b7..1a79e1db5d 100644
--- a/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/BinaryDepSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala b/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala
index 9947ea66c0..e2c0a9d1e4 100644
--- a/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/ClassFileManagerHookSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala b/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala
index bc749adfaa..5063c11a9d 100644
--- a/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/ClasspathHashingHookSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala b/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala
index e9bb086214..8bcc528fc3 100644
--- a/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala
+++ b/zinc/src/test/scala/sbt/inc/ConstantBridgeProvider.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala
index ff1a4c7b31..1ca060a877 100644
--- a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala b/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala
index 5b611f35e5..8f369ce29d 100644
--- a/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/MultiProjectIncrementalSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala
index fafada071e..19e37b8fff 100644
--- a/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/NameHashingCompilerSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala b/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala
index 8b4f9c2f92..d859f62ccf 100644
--- a/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/NestedJavaClassSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/OutputSpec.scala b/zinc/src/test/scala/sbt/inc/OutputSpec.scala
index cddfb568e5..3f299595dc 100644
--- a/zinc/src/test/scala/sbt/inc/OutputSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/OutputSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/SourceFiles.scala b/zinc/src/test/scala/sbt/inc/SourceFiles.scala
index 183fdec71d..28200d4e7f 100644
--- a/zinc/src/test/scala/sbt/inc/SourceFiles.scala
+++ b/zinc/src/test/scala/sbt/inc/SourceFiles.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala b/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala
index 667bf26fab..8eb3a143d8 100644
--- a/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala
+++ b/zinc/src/test/scala/sbt/inc/TestProjectSetup.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/TestResource.scala b/zinc/src/test/scala/sbt/inc/TestResource.scala
index 71060e3037..feaa162ba7 100644
--- a/zinc/src/test/scala/sbt/inc/TestResource.scala
+++ b/zinc/src/test/scala/sbt/inc/TestResource.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala
index 58107ab9ec..abe63a3138 100644
--- a/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala
+++ b/zinc/src/test/scala/sbt/inc/cached/CachedHashingSpec.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.
diff --git a/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
index c47834896b..b0762b48e4 100644
--- a/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
+++ b/zinc/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
@@ -1,9 +1,9 @@
 /*
  * Zinc - The incremental compiler for Scala.
- * Copyright Lightbend, Inc. and Mark Harrah
+ * Copyright Scala Center, Lightbend, and Mark Harrah
  *
  * Licensed under Apache License 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0).
+ * SPDX-License-Identifier: Apache-2.0
  *
  * See the NOTICE file distributed with this work for
  * additional information regarding copyright ownership.