diff --git a/compiler/aarch64/codegen/OMRSnippetDelegate.cpp b/compiler/aarch64/codegen/OMRSnippetDelegate.cpp
index a6139bbf7a..d7f1256d85 100644
--- a/compiler/aarch64/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/aarch64/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #include "codegen/SnippetDelegate.hpp"
diff --git a/compiler/aarch64/codegen/OMRSnippetDelegate.hpp b/compiler/aarch64/codegen/OMRSnippetDelegate.hpp
index 7b61c1a527..397eff8e03 100644
--- a/compiler/aarch64/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/aarch64/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_ARM64_SNIPPETDELEGATE_INCL
diff --git a/compiler/arm/codegen/OMRSnippetDelegate.cpp b/compiler/arm/codegen/OMRSnippetDelegate.cpp
index a6139bbf7a..d7f1256d85 100644
--- a/compiler/arm/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/arm/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #include "codegen/SnippetDelegate.hpp"
diff --git a/compiler/arm/codegen/OMRSnippetDelegate.hpp b/compiler/arm/codegen/OMRSnippetDelegate.hpp
index 68192745e0..414740c2e7 100644
--- a/compiler/arm/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/arm/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_ARM_SNIPPETDELEGATE_INCL
diff --git a/compiler/codegen/OMRSnippetDelegate.hpp b/compiler/codegen/OMRSnippetDelegate.hpp
index d139fcfd33..1166f8b624 100644
--- a/compiler/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_SNIPPETDELEGATE_INCL
diff --git a/compiler/codegen/SnippetDelegate.hpp b/compiler/codegen/SnippetDelegate.hpp
index 468ea4a474..5017b78b90 100644
--- a/compiler/codegen/SnippetDelegate.hpp
+++ b/compiler/codegen/SnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef TR_SNIPPETDELEGATE_INCL
diff --git a/compiler/p/codegen/OMRSnippetDelegate.cpp b/compiler/p/codegen/OMRSnippetDelegate.cpp
index a6139bbf7a..d7f1256d85 100644
--- a/compiler/p/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/p/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #include "codegen/SnippetDelegate.hpp"
diff --git a/compiler/p/codegen/OMRSnippetDelegate.hpp b/compiler/p/codegen/OMRSnippetDelegate.hpp
index 89a1428160..11d6af32db 100644
--- a/compiler/p/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/p/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_POWER_SNIPPETDELEGATE_INCL
diff --git a/compiler/riscv/codegen/OMRSnippetDelegate.cpp b/compiler/riscv/codegen/OMRSnippetDelegate.cpp
index a6139bbf7a..d7f1256d85 100644
--- a/compiler/riscv/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/riscv/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #include "codegen/SnippetDelegate.hpp"
diff --git a/compiler/riscv/codegen/OMRSnippetDelegate.hpp b/compiler/riscv/codegen/OMRSnippetDelegate.hpp
index f4238687b1..d63996e8d8 100644
--- a/compiler/riscv/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/riscv/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_RV_SNIPPETDELEGATE_INCL
diff --git a/compiler/x/codegen/OMRSnippetDelegate.cpp b/compiler/x/codegen/OMRSnippetDelegate.cpp
index a6139bbf7a..d7f1256d85 100644
--- a/compiler/x/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/x/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #include "codegen/SnippetDelegate.hpp"
diff --git a/compiler/x/codegen/OMRSnippetDelegate.hpp b/compiler/x/codegen/OMRSnippetDelegate.hpp
index d3a5045070..9b14284f8b 100644
--- a/compiler/x/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/x/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_X86_SNIPPETDELEGATE_INCL
diff --git a/compiler/z/codegen/OMRSnippetDelegate.cpp b/compiler/z/codegen/OMRSnippetDelegate.cpp
index d37364d157..6ec8d24ed1 100644
--- a/compiler/z/codegen/OMRSnippetDelegate.cpp
+++ b/compiler/z/codegen/OMRSnippetDelegate.cpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 // On zOS, the XLC linker can't handle files with the same name at link
diff --git a/compiler/z/codegen/OMRSnippetDelegate.hpp b/compiler/z/codegen/OMRSnippetDelegate.hpp
index e1c0b29583..701427d600 100644
--- a/compiler/z/codegen/OMRSnippetDelegate.hpp
+++ b/compiler/z/codegen/OMRSnippetDelegate.hpp
@@ -16,7 +16,7 @@
  * [1] https://www.gnu.org/software/classpath/license.html
  * [2] https://openjdk.org/legal/assembly-exception.html
  *
- * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
  *******************************************************************************/
 
 #ifndef OMR_Z_SNIPPETDELEGATE_INCL