diff --git a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
index 748340ddd2..86cdc2bd4a 100644
--- a/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
+++ b/EdkNt32Pkg/Dxe/PlatformBds/PlatformBds.msa
@@ -83,43 +83,43 @@
     <Filename>PlatformData.c</Filename>
     <Filename>BdsPlatform.h</Filename>
     <Filename>BdsPlatform.c</Filename>
-    <Filename>Generic\Bds.h</Filename>
-    <Filename>Generic\BdsEntry.c</Filename>
-    <Filename>Generic\FrontPage.h</Filename>
-    <Filename>Generic\FrontPage.c</Filename>
-    <Filename>Generic\FrontPageStrings.uni</Filename>
-    <Filename>Generic\FrontPageVfr.Vfr</Filename>
-    <Filename>Generic\Language.h</Filename>
-    <Filename>Generic\Language.c</Filename>
-    <Filename>Generic\String.h</Filename>
-    <Filename>Generic\String.c</Filename>
-    <Filename>Generic\Strings.uni</Filename>
-    <Filename>Generic\Capsules.c</Filename>
-    <Filename>Generic\MemoryTest.c</Filename>
-    <Filename>Generic\BootMaint\BmString.uni</Filename>
-    <Filename>Generic\BootMaint\bm.vfr</Filename>
-    <Filename>Generic\BootMaint\BBSsupport.h</Filename>
-    <Filename>Generic\BootMaint\BootMaint.h</Filename>
-    <Filename>Generic\BootMaint\FormGuid.h</Filename>
-    <Filename>Generic\BootMaint\BmLib.c</Filename>
-    <Filename>Generic\BootMaint\BootOption.c</Filename>
-    <Filename>Generic\BootMaint\ConsoleOption.c</Filename>
-    <Filename>Generic\BootMaint\Data.c</Filename>
-    <Filename>Generic\BootMaint\Variable.c</Filename>
-    <Filename>Generic\BootMaint\UpdatePage.c</Filename>
-    <Filename>Generic\BootMaint\BBSsupport.c</Filename>
-    <Filename>Generic\BootMaint\BootMaint.c</Filename>
-    <Filename>Generic\BootMaint\FileExplorer.c</Filename>
-    <Filename>Generic\BootMaint\FE.vfr</Filename>
-    <Filename>Generic\BootMngr\BootManager.h</Filename>
-    <Filename>Generic\BootMngr\BootManager.c</Filename>
-    <Filename>Generic\BootMngr\BootManagerStrings.uni</Filename>
-    <Filename>Generic\BootMngr\BootManagerVfr.Vfr</Filename>
-    <Filename>Generic\DeviceMngr\DeviceManager.h</Filename>
-    <Filename>Generic\DeviceMngr\DeviceManager.c</Filename>
-    <Filename>Generic\DeviceMngr\DeviceManagerStrings.uni</Filename>
-    <Filename>Generic\DeviceMngr\DeviceManagerVfr.Vfr</Filename>
-    <Filename>Generic\Bds.dxs</Filename>
+    <Filename>Generic/Bds.h</Filename>
+    <Filename>Generic/BdsEntry.c</Filename>
+    <Filename>Generic/FrontPage.h</Filename>
+    <Filename>Generic/FrontPage.c</Filename>
+    <Filename>Generic/FrontPageStrings.uni</Filename>
+    <Filename>Generic/FrontPageVfr.Vfr</Filename>
+    <Filename>Generic/Language.h</Filename>
+    <Filename>Generic/Language.c</Filename>
+    <Filename>Generic/String.h</Filename>
+    <Filename>Generic/String.c</Filename>
+    <Filename>Generic/Strings.uni</Filename>
+    <Filename>Generic/Capsules.c</Filename>
+    <Filename>Generic/MemoryTest.c</Filename>
+    <Filename>Generic/BootMaint/bmstring.uni</Filename>
+    <Filename>Generic/BootMaint/bm.vfr</Filename>
+    <Filename>Generic/BootMaint/BBSsupport.h</Filename>
+    <Filename>Generic/BootMaint/BootMaint.h</Filename>
+    <Filename>Generic/BootMaint/FormGuid.h</Filename>
+    <Filename>Generic/BootMaint/BmLib.c</Filename>
+    <Filename>Generic/BootMaint/BootOption.c</Filename>
+    <Filename>Generic/BootMaint/ConsoleOption.c</Filename>
+    <Filename>Generic/BootMaint/Data.c</Filename>
+    <Filename>Generic/BootMaint/Variable.c</Filename>
+    <Filename>Generic/BootMaint/UpdatePage.c</Filename>
+    <Filename>Generic/BootMaint/BBSsupport.c</Filename>
+    <Filename>Generic/BootMaint/BootMaint.c</Filename>
+    <Filename>Generic/BootMaint/FileExplorer.c</Filename>
+    <Filename>Generic/BootMaint/FE.vfr</Filename>
+    <Filename>Generic/BootMngr/BootManager.h</Filename>
+    <Filename>Generic/BootMngr/BootManager.c</Filename>
+    <Filename>Generic/BootMngr/BootManagerStrings.uni</Filename>
+    <Filename>Generic/BootMngr/BootManagerVfr.Vfr</Filename>
+    <Filename>Generic/DeviceMngr/DeviceManager.h</Filename>
+    <Filename>Generic/DeviceMngr/DeviceManager.c</Filename>
+    <Filename>Generic/DeviceMngr/DeviceManagerStrings.uni</Filename>
+    <Filename>Generic/DeviceMngr/DeviceManagerVfr.Vfr</Filename>
+    <Filename>Generic/Bds.dxs</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -232,4 +232,4 @@
       <ModuleEntryPoint>BdsInitialize</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index c2f8d5bd16..af0c7e0d77 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -74,7 +74,7 @@
     <Filename>Performance.h</Filename>
     <Filename>Performance.c</Filename>
     <Filename>BdsMisc.c</Filename>
-    <Filename SupArchList="IPF">Ipf\ShadowRom.c</Filename>
+    <Filename SupArchList="IPF">Ipf/ShadowRom.c</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
diff --git a/EdkNt32Pkg/Logo/Logo.msa b/EdkNt32Pkg/Logo/Logo.msa
index 6c8eb7758b..965f141fe9 100644
--- a/EdkNt32Pkg/Logo/Logo.msa
+++ b/EdkNt32Pkg/Logo/Logo.msa
@@ -22,7 +22,7 @@
     <OutputFileBasename>Logo</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
-    <Filename>Logo.bmp</Filename>
+    <Filename>logo.bmp</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -31,4 +31,4 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>