diff --git a/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.c b/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.c
index 6056530f6f8..1b03f7a5703 100644
--- a/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.c
+++ b/DeviceSecurityTestPkg/SpdmDeviceSecurityDxe/SpdmDeviceSecurityDxe.c
@@ -453,7 +453,7 @@ CreateSpdmDriverContext (
   Data16 = SPDM_ALGORITHMS_DHE_NAMED_GROUP_SECP_256_R1 |
            SPDM_ALGORITHMS_DHE_NAMED_GROUP_SECP_384_R1 |
            SPDM_ALGORITHMS_DHE_NAMED_GROUP_SECP_521_R1;
-  SpdmSetData (SpdmContext, SpdmDataDHENamedGroup, &Parameter, &Data16, sizeof (Data16));
+  SpdmSetData (SpdmContext, SpdmDataDHENameGroup, &Parameter, &Data16, sizeof (Data16));
   Data16 = SPDM_ALGORITHMS_AEAD_CIPHER_SUITE_AES_128_GCM |
            SPDM_ALGORITHMS_AEAD_CIPHER_SUITE_AES_256_GCM |
            SPDM_ALGORITHMS_AEAD_CIPHER_SUITE_CHACHA20_POLY1305;
diff --git a/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.c b/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.c
index b759da1b82e..d382f263195 100644
--- a/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.c
+++ b/DeviceSecurityTestPkg/SpdmDeviceSecurityPei/SpdmDeviceSecurityPei.c
@@ -367,7 +367,7 @@ CreateSpdmDriverContext (
   Data32 = SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_256;
   SpdmSetData (SpdmContext, SpdmDataBaseHashAlgo, &Parameter, &Data32, sizeof(Data32));
   Data16 = SPDM_ALGORITHMS_DHE_NAMED_GROUP_FFDHE_2048;
-  SpdmSetData (SpdmContext, SpdmDataDHENamedGroup, &Parameter, &Data16, sizeof(Data16));
+  SpdmSetData (SpdmContext, SpdmDataDHENameGroup, &Parameter, &Data16, sizeof(Data16));
   Data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_HMAC_HASH;
   SpdmSetData (SpdmContext, SpdmDataAEADCipherSuite, &Parameter, &Data16, sizeof(Data16));
   Data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_HMAC_HASH;
diff --git a/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.c b/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.c
index 28d6c62a1fc..1bc38a20075 100644
--- a/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.c
+++ b/DeviceSecurityTestPkg/Test/PciIoPciDoeStub/PciIoPciDoeStub.c
@@ -1126,7 +1126,7 @@ MainEntryPoint (
   } else {
     Data16 = SPDM_ALGORITHMS_DHE_NAMED_GROUP_SECP_384_R1;
   }
-  SpdmSetData (SpdmContext, SpdmDataDHENamedGroup, &Parameter, &Data16, sizeof (Data16));
+  SpdmSetData (SpdmContext, SpdmDataDHENameGroup, &Parameter, &Data16, sizeof (Data16));
   if (TestConfig == TEST_CONFIG_SECP_256_R1_AES_256_GCM) {
     Data16 = SPDM_ALGORITHMS_AEAD_CIPHER_SUITE_AES_256_GCM;
   } else if (TestConfig == TEST_CONFIG_SECP_521_R1_CHACHA20_POLY1305) {
diff --git a/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.c b/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.c
index fe8c71e48eb..59f7dbbff49 100644
--- a/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.c
+++ b/DeviceSecurityTestPkg/Test/SpdmStub/SpdmStub.c
@@ -389,7 +389,7 @@ MainEntryPoint (
     Data16 = SPDM_ALGORITHMS_DHE_NAMED_GROUP_SECP_384_R1;
   }
 
-  SpdmSetData (SpdmContext, SpdmDataDHENamedGroup, &Parameter, &Data16, sizeof (Data16));
+  SpdmSetData (SpdmContext, SpdmDataDHENameGroup, &Parameter, &Data16, sizeof (Data16));
   if (TestConfig == TEST_CONFIG_SECP_256_R1_AES_256_GCM) {
     Data16 = SPDM_ALGORITHMS_AEAD_CIPHER_SUITE_AES_256_GCM;
   } else if (TestConfig == TEST_CONFIG_SECP_521_R1_CHACHA20_POLY1305) {
diff --git a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c
index 4ed8e478f81..0326cd21d8b 100644
--- a/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c
+++ b/DeviceSecurityTestPkg/TestPei/SpdmStubPei/SpdmStubPei.c
@@ -200,7 +200,7 @@ MainEntryPoint (
   Data32 = SPDM_ALGORITHMS_BASE_HASH_ALGO_TPM_ALG_SHA_256;
   SpdmSetData (SpdmContext, SpdmDataBaseHashAlgo, &Parameter, &Data32, sizeof(Data32));
   Data16 = SPDM_ALGORITHMS_DHE_NAMED_GROUP_FFDHE_2048;
-  SpdmSetData (SpdmContext, SpdmDataDHENamedGroup, &Parameter, &Data16, sizeof(Data16));
+  SpdmSetData (SpdmContext, SpdmDataDHENameGroup, &Parameter, &Data16, sizeof(Data16));
   Data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_HMAC_HASH;
   SpdmSetData (SpdmContext, SpdmDataAEADCipherSuite, &Parameter, &Data16, sizeof(Data16));
   Data16 = SPDM_ALGORITHMS_KEY_SCHEDULE_HMAC_HASH;
diff --git a/SecurityPkg/DeviceSecurity/SpdmLib/Include/Stub/SpdmLibStub.h b/SecurityPkg/DeviceSecurity/SpdmLib/Include/Stub/SpdmLibStub.h
index c18b126a028..d895f90b23c 100644
--- a/SecurityPkg/DeviceSecurity/SpdmLib/Include/Stub/SpdmLibStub.h
+++ b/SecurityPkg/DeviceSecurity/SpdmLib/Include/Stub/SpdmLibStub.h
@@ -107,7 +107,7 @@ typedef enum {
   SpdmDataMeasurementHashAlgo,
   SpdmDataBaseAsymAlgo,
   SpdmDataBaseHashAlgo,
-  SpdmDataDHENamedGroup,
+  SpdmDataDHENameGroup,
   SpdmDataAEADCipherSuite,
   SpdmDataReqBaseAsymAlg,
   SpdmDataKeySchedule,