diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index 3fbebaa18b..58d47cbebe 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -362,7 +362,7 @@
   $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
   $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
   $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf
-  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf
+  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
   $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
   $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf
   $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf
index 8ff6327abb..e5d8bbe4c7 100644
--- a/Nt32Pkg/Nt32Pkg.fdf
+++ b/Nt32Pkg/Nt32Pkg.fdf
@@ -116,7 +116,7 @@ INF  $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
 INF  $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf
 INF  $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf
-INF  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf
+INF  $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf
 INF  $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/VariablePei.inf
 INF  $(WORKSPACE)/Nt32Pkg/WinNtAutoScanPei/WinNtAutoScanPei.inf
diff --git a/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
similarity index 96%
rename from Nt32Pkg/WinNtFlashMapPei/FlashMap.inf
rename to Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
index bd96ed70cc..8f546724ea 100644
--- a/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf
+++ b/Nt32Pkg/WinNtFlashMapPei/WinNtFlashMapPei.inf
@@ -21,7 +21,7 @@
 ################################################################################
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = PeiFlashMap
+  BASE_NAME                      = WinNtFlashMapPei
   FILE_GUID                      = 681F3771-6F1D-42DE-9AA2-F82BBCDBC5F9
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0