diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h b/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h
index 953b3d66b1..d5aa396547 100644
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h
@@ -104,8 +104,8 @@ typedef struct {
 } CPUID_CACHE_DATA;
 
 typedef union {
-  EDKII_PEI_MP_SERVICES2_PPI    *Ppi;
-  EFI_MP_SERVICES_PROTOCOL      *Protocol;
+  EFI_PEI_MP_SERVICES2_PPI    *Ppi;
+  EFI_MP_SERVICES_PROTOCOL    *Protocol;
 } MP_SERVICES;
 
 typedef struct {
@@ -128,13 +128,13 @@ typedef struct {
 #define MAX_NUM_OF_PACKAGE  100
 
 /**
-  Get EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL pointer.
+  Get EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL pointer.
 
-  @param[out] MpServices    A pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI or
+  @param[out] MpServices    A pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI or
                             EFI_MP_SERVICES_PROTOCOL is stored
 
-  @retval EFI_SUCCESS       EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is returned
-  @retval EFI_NOT_FOUND     EDKII_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is not found
+  @retval EFI_SUCCESS       EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is returned
+  @retval EFI_NOT_FOUND     EFI_PEI_MP_SERVICES2_PPI or EFI_MP_SERVICES_PROTOCOL interface is not found
 **/
 EFI_STATUS
 CpuCacheInfoGetMpServices (
diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.c b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.c
index ea262d8f02..936dd1158e 100644
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.c
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.c
@@ -15,12 +15,12 @@
 #include <InternalCpuCacheInfoLib.h>
 
 /**
-  Get EDKII_PEI_MP_SERVICES2_PPI pointer.
+  Get EFI_PEI_MP_SERVICES2_PPI pointer.
 
-  @param[out] MpServices    A pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI is stored
+  @param[out] MpServices    A pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI is stored
 
-  @retval EFI_SUCCESS       EDKII_PEI_MP_SERVICES2_PPI interface is returned
-  @retval EFI_NOT_FOUND     EDKII_PEI_MP_SERVICES2_PPI interface is not found
+  @retval EFI_SUCCESS       EFI_PEI_MP_SERVICES2_PPI interface is returned
+  @retval EFI_NOT_FOUND     EFI_PEI_MP_SERVICES2_PPI interface is not found
 **/
 EFI_STATUS
 CpuCacheInfoGetMpServices (
@@ -29,7 +29,7 @@ CpuCacheInfoGetMpServices (
 {
   EFI_STATUS  Status;
 
-  Status = PeiServicesLocatePpi (&gEdkiiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
+  Status = PeiServicesLocatePpi (&gEfiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
   ASSERT_EFI_ERROR (Status);
 
   return Status;
diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
index c643fc89be..a0b2942682 100644
--- a/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
+++ b/UefiCpuPkg/Library/CpuCacheInfoLib/PeiCpuCacheInfoLib.inf
@@ -35,9 +35,9 @@
   PeiServicesTablePointerLib
 
 [Ppis]
-  gEdkiiPeiMpServices2PpiGuid
+  gEfiPeiMpServices2PpiGuid
 
 [Pcd]
 
 [Depex]
-  gEdkiiPeiMpServices2PpiGuid
+  gEfiPeiMpServices2PpiGuid
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTest.h b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTest.h
index bad3387db5..292ee50a71 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTest.h
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/CpuExceptionHandlerTest.h
@@ -66,8 +66,8 @@ typedef struct {
 } CPU_REGISTER_BUFFER;
 
 typedef union {
-  EDKII_PEI_MP_SERVICES2_PPI    *Ppi;
-  EFI_MP_SERVICES_PROTOCOL      *Protocol;
+  EFI_PEI_MP_SERVICES2_PPI    *Ppi;
+  EFI_MP_SERVICES_PROTOCOL    *Protocol;
 } MP_SERVICES;
 
 typedef struct {
@@ -212,7 +212,7 @@ CompareCpuContext (
   );
 
 /**
-  Get EFI_MP_SERVICES_PROTOCOL/EDKII_PEI_MP_SERVICES2_PPI pointer.
+  Get EFI_MP_SERVICES_PROTOCOL/EFI_PEI_MP_SERVICES2_PPI pointer.
 
   @param[out] MpServices    Pointer to the MP_SERVICES buffer
 
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf
index 25f8f8dbe0..fb56b90bd3 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerLibUnitTest.inf
@@ -54,8 +54,8 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize       ## CONSUMES
 
 [Ppis]
-  gEdkiiPeiMpServices2PpiGuid                       ## CONSUMES
+  gEfiPeiMpServices2PpiGuid                         ## CONSUMES
 
 [Depex]
-  gEdkiiPeiMpServices2PpiGuid AND
+  gEfiPeiMpServices2PpiGuid AND
   gEfiPeiMemoryDiscoveredPpiGuid
diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerUnitTest.c b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerUnitTest.c
index d9408d2f5e..c471238222 100644
--- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerUnitTest.c
+++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/UnitTest/PeiCpuExceptionHandlerUnitTest.c
@@ -137,19 +137,19 @@ MpServicesUnitTestWhoAmI (
 }
 
 /**
-  Get EDKII_PEI_MP_SERVICES2_PPI pointer.
+  Get EFI_PEI_MP_SERVICES2_PPI pointer.
 
-  @param[out] MpServices    Pointer to the buffer where EDKII_PEI_MP_SERVICES2_PPI is stored
+  @param[out] MpServices    Pointer to the buffer where EFI_PEI_MP_SERVICES2_PPI is stored
 
-  @retval EFI_SUCCESS       EDKII_PEI_MP_SERVICES2_PPI interface is returned
-  @retval EFI_NOT_FOUND     EDKII_PEI_MP_SERVICES2_PPI interface is not found
+  @retval EFI_SUCCESS       EFI_PEI_MP_SERVICES2_PPI interface is returned
+  @retval EFI_NOT_FOUND     EFI_PEI_MP_SERVICES2_PPI interface is not found
 **/
 EFI_STATUS
 GetMpServices (
   OUT MP_SERVICES  *MpServices
   )
 {
-  return PeiServicesLocatePpi (&gEdkiiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
+  return PeiServicesLocatePpi (&gEfiPeiMpServices2PpiGuid, 0, NULL, (VOID **)&MpServices->Ppi);
 }
 
 /**
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
index 1db6adc280..c77a616c95 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.c
@@ -77,7 +77,7 @@ GetMpService (
   // Get MP Services2 Ppi
   //
   Status = PeiServicesLocatePpi (
-             &gEdkiiPeiMpServices2PpiGuid,
+             &gEfiPeiMpServices2PpiGuid,
              0,
              NULL,
              (VOID **)&MpService.Ppi
@@ -98,9 +98,9 @@ GetProcessorIndex (
   IN CPU_FEATURES_DATA  *CpuFeaturesData
   )
 {
-  EFI_STATUS                  Status;
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  UINTN                       ProcessorIndex;
+  EFI_STATUS                Status;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  UINTN                     ProcessorIndex;
 
   CpuMp2Ppi = CpuFeaturesData->MpService.Ppi;
 
@@ -130,9 +130,9 @@ GetProcessorInformation (
   OUT EFI_PROCESSOR_INFORMATION  *ProcessorInfoBuffer
   )
 {
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  EFI_STATUS                  Status;
-  CPU_FEATURES_DATA           *CpuFeaturesData;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  EFI_STATUS                Status;
+  CPU_FEATURES_DATA         *CpuFeaturesData;
 
   CpuFeaturesData = GetCpuFeaturesData ();
   CpuMp2Ppi       = CpuFeaturesData->MpService.Ppi;
@@ -159,9 +159,9 @@ StartupAllAPsWorker (
   IN  EFI_EVENT         MpEvent
   )
 {
-  EFI_STATUS                  Status;
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  CPU_FEATURES_DATA           *CpuFeaturesData;
+  EFI_STATUS                Status;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  CPU_FEATURES_DATA         *CpuFeaturesData;
 
   CpuFeaturesData = GetCpuFeaturesData ();
   CpuMp2Ppi       = CpuFeaturesData->MpService.Ppi;
@@ -191,9 +191,9 @@ StartupAllCPUsWorker (
   IN  EFI_AP_PROCEDURE  Procedure
   )
 {
-  EFI_STATUS                  Status;
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  CPU_FEATURES_DATA           *CpuFeaturesData;
+  EFI_STATUS                Status;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  CPU_FEATURES_DATA         *CpuFeaturesData;
 
   CpuFeaturesData = GetCpuFeaturesData ();
 
@@ -220,9 +220,9 @@ SwitchNewBsp (
   IN  UINTN  ProcessorNumber
   )
 {
-  EFI_STATUS                  Status;
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  CPU_FEATURES_DATA           *CpuFeaturesData;
+  EFI_STATUS                Status;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  CPU_FEATURES_DATA         *CpuFeaturesData;
 
   CpuFeaturesData = GetCpuFeaturesData ();
   CpuMp2Ppi       = CpuFeaturesData->MpService.Ppi;
@@ -254,9 +254,9 @@ GetNumberOfProcessor (
   OUT UINTN  *NumberOfEnabledProcessors
   )
 {
-  EFI_STATUS                  Status;
-  EDKII_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
-  CPU_FEATURES_DATA           *CpuFeaturesData;
+  EFI_STATUS                Status;
+  EFI_PEI_MP_SERVICES2_PPI  *CpuMp2Ppi;
+  CPU_FEATURES_DATA         *CpuFeaturesData;
 
   CpuFeaturesData = GetCpuFeaturesData ();
   CpuMp2Ppi       = CpuFeaturesData->MpService.Ppi;
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
index 196c72eb85..7464d1f7b0 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/PeiRegisterCpuFeaturesLib.inf
@@ -45,7 +45,7 @@
   IoLib
 
 [Ppis]
-  gEdkiiPeiMpServices2PpiGuid                                          ## CONSUMES
+  gEfiPeiMpServices2PpiGuid                                            ## CONSUMES
 
 [Pcd]
   gUefiCpuPkgTokenSpaceGuid.PcdCpuS3DataAddress                        ## CONSUMES
@@ -54,4 +54,4 @@
   gUefiCpuPkgTokenSpaceGuid.PcdCpuFeaturesSetting                      ## CONSUMES ## PRODUCES
 
 [Depex]
-  gEdkiiPeiMpServices2PpiGuid AND gEdkiiCpuFeaturesSetDoneGuid
+  gEfiPeiMpServices2PpiGuid AND gEdkiiCpuFeaturesSetDoneGuid
diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
index 4a84954cac..5e6e46b8a3 100644
--- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
+++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeatures.h
@@ -64,8 +64,8 @@ typedef struct {
 } PROGRAM_CPU_REGISTER_FLAGS;
 
 typedef union {
-  EFI_MP_SERVICES_PROTOCOL      *Protocol;
-  EDKII_PEI_MP_SERVICES2_PPI    *Ppi;
+  EFI_MP_SERVICES_PROTOCOL    *Protocol;
+  EFI_PEI_MP_SERVICES2_PPI    *Ppi;
 } MP_SERVICES;
 
 typedef struct {
diff --git a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
index 7e65bbf929..4f6b513c72 100644
--- a/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
+++ b/UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.c
@@ -166,9 +166,9 @@ SmmInitHandler (
 **/
 VOID
 SmmRelocateBases (
-  IN EDKII_PEI_MP_SERVICES2_PPI  *MpServices2,
-  IN EFI_PHYSICAL_ADDRESS        SmmRelocationStart,
-  IN UINTN                       TileSize
+  IN EFI_PEI_MP_SERVICES2_PPI  *MpServices2,
+  IN EFI_PHYSICAL_ADDRESS      SmmRelocationStart,
+  IN UINTN                     TileSize
   )
 {
   EFI_STATUS                 Status;
@@ -424,7 +424,7 @@ SplitSmramHobForSmmRelocation (
 EFI_STATUS
 EFIAPI
 SmmRelocationInit (
-  IN EDKII_PEI_MP_SERVICES2_PPI  *MpServices2
+  IN EFI_PEI_MP_SERVICES2_PPI  *MpServices2
   )
 {
   EFI_STATUS            Status;