diff --git a/CHANGELOG.md b/CHANGELOG.md
index 527dfd7b..4e7ec175 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,18 +14,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 - Faster buffer conversion jobs due to batching via [`IJobParallelForBatch`](https://docs.unity3d.com/Packages/com.unity.collections@2.4/api/Unity.Jobs.IJobParallelForBatch.html).
+- (Export) Material exporter implementation is chosen based on used shader by default.
 - (Export) Vertex attributes are discarded if they are not used/referenced.
 
 ### Fixed
 - (Export) Discrepancy in color due to export of unused vertex colors.
 
+### Fixed
+- Incorrect copyright text in some SPDX headers.
+
 ### Removed
 - Soft dependency on deprecated [Unity Jobs package][JobsPkg].
 - Legacy code for Unity versions older than the minimum required 2020 LTS.
 
-### Changed
-- Material exporter implementation is chosen based on used shader by default.
-
 ## [6.4.0] - 2024-04-17
 
 ### Added
diff --git a/Tests/Editor/PreprocessBuild.cs b/Tests/Editor/PreprocessBuild.cs
index 1c7308bc..f1ef76f4 100644
--- a/Tests/Editor/PreprocessBuild.cs
+++ b/Tests/Editor/PreprocessBuild.cs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Unity Technologies and the Draco for Unity authors
+// SPDX-FileCopyrightText: 2023 Unity Technologies and the glTFast authors
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
diff --git a/Tests/Runtime/Scripts/Export/SceneRootObjectTestCaseAttribute.cs b/Tests/Runtime/Scripts/Export/SceneRootObjectTestCaseAttribute.cs
index 5db50905..a9842c68 100644
--- a/Tests/Runtime/Scripts/Export/SceneRootObjectTestCaseAttribute.cs
+++ b/Tests/Runtime/Scripts/Export/SceneRootObjectTestCaseAttribute.cs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Unity Technologies and the Draco for Unity authors
+// SPDX-FileCopyrightText: 2024 Unity Technologies and the glTFast authors
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
diff --git a/Tests/Runtime/Scripts/Import/GltfTestCaseAttribute.cs b/Tests/Runtime/Scripts/Import/GltfTestCaseAttribute.cs
index 684eaac4..5edfb89e 100644
--- a/Tests/Runtime/Scripts/Import/GltfTestCaseAttribute.cs
+++ b/Tests/Runtime/Scripts/Import/GltfTestCaseAttribute.cs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2023 Unity Technologies and the Draco for Unity authors
+// SPDX-FileCopyrightText: 2023 Unity Technologies and the glTFast authors
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
diff --git a/Tests/Runtime/Scripts/Import/GltfTestCaseFilter.cs b/Tests/Runtime/Scripts/Import/GltfTestCaseFilter.cs
index 88ca80c9..a489e1ee 100644
--- a/Tests/Runtime/Scripts/Import/GltfTestCaseFilter.cs
+++ b/Tests/Runtime/Scripts/Import/GltfTestCaseFilter.cs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Unity Technologies and the Draco for Unity authors
+// SPDX-FileCopyrightText: 2024 Unity Technologies and the glTFast authors
 // SPDX-License-Identifier: Apache-2.0
 
 using System;
diff --git a/Tests/Runtime/Scripts/Import/LoadGltfTestCaseSet.cs b/Tests/Runtime/Scripts/Import/LoadGltfTestCaseSet.cs
index 32a1b1bb..130844e4 100644
--- a/Tests/Runtime/Scripts/Import/LoadGltfTestCaseSet.cs
+++ b/Tests/Runtime/Scripts/Import/LoadGltfTestCaseSet.cs
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 Unity Technologies and the Draco for Unity authors
+// SPDX-FileCopyrightText: 2024 Unity Technologies and the glTFast authors
 // SPDX-License-Identifier: Apache-2.0
 
 #if !(UNITY_ANDROID || UNITY_WEBGL) || UNITY_EDITOR