3 files changed, 13 insertions, 13 deletions
diff --git a/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h b/UefiCpuPkg/Library/CpuCacheInfoLib/InternalCpuCacheInfoLib.h
index 953b3d6..d5aa396 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 ea262d8..936dd11 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 c643fc8..a0b2942 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