INF $(WORKSPACE)/MdeModulePkg/Core/Pei/PeiMain.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/PCD/Pei/Pcd.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf\r
-INF $(WORKSPACE)/Nt32Pkg/BootModePei/BootMode.inf\r
+INF $(WORKSPACE)/Nt32Pkg/BootModePei/BootModePei.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtFlashMapPei/FlashMap.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/BaseMemoryTestPei/BaseMemoryTest.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/VariablePei/Variable.inf\r
##\r
INF $(WORKSPACE)/MdeModulePkg/Core/Dxe/DxeMain.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf\r
-INF $(WORKSPACE)/Nt32Pkg/MetronomeDxe/Metronome.inf\r
-INF $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClock.inf\r
-INF $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/Reset.inf\r
+INF $(WORKSPACE)/Nt32Pkg/MetronomeDxe/MetronomeDxe.inf\r
+INF $(WORKSPACE)/Nt32Pkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf\r
+INF $(WORKSPACE)/Nt32Pkg/ResetRuntimeDxe/ResetRuntimeDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/RuntimeDxe/Runtime.inf\r
INF $(WORKSPACE)/Nt32Pkg/FvbServicesRuntimeDxe/Nt32Fwh.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/SecurityStubDxe/SecurityStub.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/HiiDataBaseDxe/HiiDatabase.inf\r
INF $(WORKSPACE)/Nt32Pkg/WinNtThunkDxe/WinNtThunk.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.inf\r
-INF $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/Cpu.inf\r
-INF $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf\r
+INF $(WORKSPACE)/Nt32Pkg/CpuRuntimeDxe/CpuRuntimeDxe.inf\r
+INF $(WORKSPACE)/Nt32Pkg/PlatformBdsDxe/PlatformBdsDxe.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.inf\r
-INF $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubclassDriver.inf\r
-INF $(WORKSPACE)/Nt32Pkg/TimerDxe/Timer.inf\r
+INF $(WORKSPACE)/Nt32Pkg/MiscSubClassPlatformDxe/MiscSubClassPlatformDxe.inf\r
+INF $(WORKSPACE)/Nt32Pkg/TimerDxe/TimerDxe.inf\r
INF $(WORKSPACE)/IntelFrameworkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/VariableRuntimeDxe/Variable.inf\r
INF $(WORKSPACE)/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf\r