3 files changed, 5 insertions, 5 deletions
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
index a8f7ba06ad..b459257285 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.c
@@ -136,14 +136,14 @@ Returns:
   //
   // Install FlashMap PPI
   //
-  Status = PeiCoreInstallPpi (&mPpiListFlashMap);
+  Status = PeiServicesInstallPpi (&mPpiListFlashMap);
   ASSERT_EFI_ERROR (Status);
 
 
   //
   // Get the Fwh Information PPI
   //
-  Status = PeiCoreLocatePpi (
+  Status = PeiServicesLocatePpi (
             &gNtFwhPpiGuid, // GUID
             0,              // INSTANCE
             &PpiDescriptor, // EFI_PEI_PPI_DESCRIPTOR
@@ -249,7 +249,7 @@ GetAreaInfo (
   EFI_PEI_HOB_POINTERS          Hob;
   EFI_HOB_FLASH_MAP_ENTRY_TYPE  *FlashMapEntry;
 
-  Status = PeiCoreGetHobList (&Hob.Raw);
+  Status = PeiServicesGetHobList (&Hob.Raw);
   while (!END_OF_HOB_LIST (Hob)) {
     if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION && CompareGuid (&Hob.Guid->Name, &gEfiFlashMapHobGuid)) {
       FlashMapEntry = (EFI_HOB_FLASH_MAP_ENTRY_TYPE *) Hob.Raw;
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
index 8c38ee9f59..351e86dffd 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.mbd
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Libraries>
     <Library>PeimEntryPoint</Library>
     <Library>PeiMemoryLib</Library>
-    <Library>PeiCoreLib</Library>
+    <Library>PeiServicesLib</Library>
     <Library>PeiServicesTablePointerLib</Library>
     <Library>PeiHobLib</Library>
     <Library>PeiReportStatusCodeLib</Library>
diff --git a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
index f347ca45db..672199920a 100644
--- a/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
+++ b/EdkNt32Pkg/Pei/FlashMap/FlashMap.msa
@@ -35,7 +35,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DebugLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">PeimEntryPoint</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">HobLib</LibraryClass>
-    <LibraryClass Usage="ALWAYS_CONSUMED">PeiCoreLib</LibraryClass>
+    <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">PeiServicesTablePointerLib</LibraryClass>
     <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
   </LibraryClassDefinitions>