diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
index 3f14cfb958..2dc1edb310 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c
@@ -1017,7 +1017,7 @@ S3RestoreConfig2 (
   BOOLEAN                        Build4GPageTableOnly;
   BOOLEAN                        InterruptStatus;
   IA32_CR0                       Cr0;
-  EDKII_PEI_MP_SERVICES2_PPI     *MpService2Ppi;
+  EFI_PEI_MP_SERVICES2_PPI       *MpService2Ppi;
   MTRR_SETTINGS                  MtrrTable;
 
   TempAcpiS3Context                 = 0;
@@ -1115,7 +1115,7 @@ S3RestoreConfig2 (
     // Get MP Services2 Ppi to pass it to Smm S3.
     //
     Status = PeiServicesLocatePpi (
-               &gEdkiiPeiMpServices2PpiGuid,
+               &gEfiPeiMpServices2PpiGuid,
                0,
                NULL,
                (VOID **)&MpService2Ppi
diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
index 54de8bc91f..7e1a418476 100644
--- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
+++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf
@@ -88,7 +88,7 @@
   gPeiPostScriptTablePpiGuid                    ## SOMETIMES_PRODUCES
   gEfiEndOfPeiSignalPpiGuid                     ## SOMETIMES_PRODUCES
   gEfiPeiSmmCommunicationPpiGuid                ## SOMETIMES_CONSUMES
-  gEdkiiPeiMpServices2PpiGuid                   ## SOMETIMES_CONSUMES
+  gEfiPeiMpServices2PpiGuid                     ## SOMETIMES_CONSUMES
 
 [FeaturePcd]
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode         ## CONSUMES