5 files changed, 6 insertions, 6 deletions
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 52390e404c..b41d3ed09b 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -76,7 +76,7 @@ PcdPeimInit (
 
   BuildPcdDatabase ();
   
-  Status = PeiCoreInstallPpi (&mPpiPCD);
+  Status = PeiServicesInstallPpi (&mPpiPCD);
 
   ASSERT_EFI_ERROR (Status);
   
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
index 5defea7d7d..8509b16d73 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>
     <Library>PeimEntryPoint</Library>
     <Library>BaseLib</Library>
-    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesLib</Library>
     <Library OverrideID="4444">PeiServicesTablePointerLib</Library>
     <Library>PeiHobLib</Library>
     <Library>BaseDebugLibReportStatusCode</Library>
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
index 60cd6449e7..f08a2fa072 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">BaseLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">PcdLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">MemoryAllocationLib</LibraryClass>
diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 247ebadcd7..2de061bdb0 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -144,7 +144,7 @@ GetHiiVariable (
   VOID       *Buffer;
   EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;
 
-  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);
+  Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);
   ASSERT_EFI_ERROR (Status);
 
   Size = 0;
@@ -159,7 +159,7 @@ GetHiiVariable (
                             );
   ASSERT (Status == EFI_BUFFER_TOO_SMALL);
 
-  Status = PeiCoreAllocatePool (Size, &Buffer);
+  Status = PeiServicesAllocatePool (Size, &Buffer);
   ASSERT_EFI_ERROR (Status);
 
   Status = VariablePpi->PeiGetVariable (
diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
index e601061991..3265c3db60 100644
--- a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
+++ b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>
     <Library>PeimEntryPoint</Library>
     <Library>BaseLib</Library>
-    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesLib</Library>
     <Library>PeiServicesTablePointerLib</Library>
     <Library>BaseDebugLibReportStatusCode</Library>
     <Library>PeiMemoryLib</Library>