diff --git a/include/tss2/tss2_tcti_pcap.h b/include/tss2/tss2_tcti_pcap.h
index 7086a825f7..ed813638cd 100644
--- a/include/tss2/tss2_tcti_pcap.h
+++ b/include/tss2/tss2_tcti_pcap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.
diff --git a/src/tss2-fapi/ifapi_get_intl_cert.h b/src/tss2-fapi/ifapi_get_intl_cert.h
index 45f3406d8c..10ee8e501c 100644
--- a/src/tss2-fapi/ifapi_get_intl_cert.h
+++ b/src/tss2-fapi/ifapi_get_intl_cert.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*******************************************************************************
  * Copyright 2018-2019, Fraunhofer SIT sponsored by Infineon Technologies AG
  * All rights reserved.
diff --git a/src/tss2-fapi/ifapi_policyutil_execute.h b/src/tss2-fapi/ifapi_policyutil_execute.h
index c219fb507c..6a95167e81 100644
--- a/src/tss2-fapi/ifapi_policyutil_execute.h
+++ b/src/tss2-fapi/ifapi_policyutil_execute.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*******************************************************************************
  * Copyright 2018-2019, Fraunhofer SIT sponsored by Infineon Technologies AG
  * All rights reserved.
diff --git a/src/tss2-tcti/tcti-pcap-builder.c b/src/tss2-tcti/tcti-pcap-builder.c
index 5f1a63697c..6aa2dec5d8 100644
--- a/src/tss2-tcti/tcti-pcap-builder.c
+++ b/src/tss2-tcti/tcti-pcap-builder.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.
diff --git a/src/tss2-tcti/tcti-pcap-builder.h b/src/tss2-tcti/tcti-pcap-builder.h
index 8cf496cfcd..c90eefab18 100644
--- a/src/tss2-tcti/tcti-pcap-builder.h
+++ b/src/tss2-tcti/tcti-pcap-builder.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.
@@ -33,4 +33,4 @@ pcap_print (
 void
 pcap_deinit (pcap_buider_ctx *ctx);
 
-#endif /* TCTI_PCAP_BUILDER_H */
\ No newline at end of file
+#endif /* TCTI_PCAP_BUILDER_H */
diff --git a/src/tss2-tcti/tcti-pcap.c b/src/tss2-tcti/tcti-pcap.c
index 86c85c4b79..fbb0cd7e6b 100644
--- a/src/tss2-tcti/tcti-pcap.c
+++ b/src/tss2-tcti/tcti-pcap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.
diff --git a/src/tss2-tcti/tcti-pcap.h b/src/tss2-tcti/tcti-pcap.h
index a37f1ba430..54e1d07c49 100644
--- a/src/tss2-tcti/tcti-pcap.h
+++ b/src/tss2-tcti/tcti-pcap.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.
diff --git a/src/util/log.c b/src/util/log.c
index d2781f4893..0853185520 100644
--- a/src/util/log.c
+++ b/src/util/log.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/src/util/log.h b/src/util/log.h
index 2d24330f3f..ee7f114aeb 100644
--- a/src/util/log.h
+++ b/src/util/log.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifndef LOG_H
 #define LOG_H
 
diff --git a/test/helper/tpm_dumpstate.c b/test/helper/tpm_dumpstate.c
index d4a4e49b1a..ad7e760b9d 100644
--- a/test/helper/tpm_dumpstate.c
+++ b/test/helper/tpm_dumpstate.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/helper/tpm_getek.c b/test/helper/tpm_getek.c
index 899b940c94..c5c5493053 100644
--- a/test/helper/tpm_getek.c
+++ b/test/helper/tpm_getek.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/helper/tpm_getek_ecc.c b/test/helper/tpm_getek_ecc.c
index bbe5246185..5a0e2522da 100644
--- a/test/helper/tpm_getek_ecc.c
+++ b/test/helper/tpm_getek_ecc.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/helper/tpm_startup.c b/test/helper/tpm_startup.c
index 4b88b746e9..126024d36c 100644
--- a/test/helper/tpm_startup.c
+++ b/test/helper/tpm_startup.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/helper/tpm_transientempty.c b/test/helper/tpm_transientempty.c
index b2fbbd0f81..fb7830f611 100644
--- a/test/helper/tpm_transientempty.c
+++ b/test/helper/tpm_transientempty.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/helper/tpm_writeekcert.c b/test/helper/tpm_writeekcert.c
index 5e0955ae1f..1089884cb4 100644
--- a/test/helper/tpm_writeekcert.c
+++ b/test/helper/tpm_writeekcert.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/integration/esys-get-capability-act.int.c b/test/integration/esys-get-capability-act.int.c
index b30d140c7f..d1f9d2600d 100644
--- a/test/integration/esys-get-capability-act.int.c
+++ b/test/integration/esys-get-capability-act.int.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/test/unit/tcti-pcap.c b/test/unit/tcti-pcap.c
index 6fdc353ef2..bfc527bb2b 100644
--- a/test/unit/tcti-pcap.c
+++ b/test/unit/tcti-pcap.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: BSD-2 */
+/* SPDX-License-Identifier: BSD-2-Clause */
 /*
  * Copyright (c) 2020 Infineon Technologies AG
  * All rights reserved.