diff --git a/libspdm.cdx.json b/libspdm.cdx.json
index 51dad9c..f4f22e4 100644
--- a/libspdm.cdx.json
+++ b/libspdm.cdx.json
@@ -13,7 +13,7 @@
     {
       "type": "library",
       "bom-ref": "pkg:github/DMTF/libspdm@@VCS_TAG@",
-      "cpe": "cpe:2.3:a:DMTF:libspdm:@VCS_TAG@:*:*:*:*:*:*:*",
+      "cpe": "cpe:2.3:a:dmtf:libspdm:@VCS_TAG@:*:*:*:*:*:*:*",
       "name": "libspdm",
       "version": "@VCS_VERSION@",
       "description": "Sample implementation of DMTF SPDM",
diff --git a/mbedtls.cdx.json b/mbedtls.cdx.json
index c8d3675..a1a50b1 100644
--- a/mbedtls.cdx.json
+++ b/mbedtls.cdx.json
@@ -13,7 +13,7 @@
     {
       "type": "library",
       "bom-ref": "pkg:github/Mbed-TLS/mbedtls@@VCS_TAG@",
-      "cpe": "cpe:2.3:a:Mbed-TLS:mbedtls:@VCS_TAG@:*:*:*:*:*:*:*",
+      "cpe": "cpe:2.3:a:mbed:mbedtls:@VCS_TAG@:*:*:*:*:*:*:*",
       "name": "mbedtls",
       "version": "@VCS_VERSION@",
       "description": "Implements cryptographic primitives, X.509 certificate manipulation and SSL/TLS and DTLS protocols",