diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index b8e15f9fb3..9d73da2d05 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -62,7 +62,7 @@
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>PciBus.h</Filename>
+    <Filename>pcibus.h</Filename>
     <Filename>PciIo.h</Filename>
     <Filename>PciCommand.h</Filename>
     <Filename>PciDeviceSupport.h</Filename>
@@ -181,4 +181,4 @@
       <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>
     </PcdEntry>
   </PcdCoded>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
index bac1669c33..ad8e9f202e 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
@@ -54,7 +54,7 @@
     </LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>Cbi.h</Filename>
+    <Filename>cbi.h</Filename>
     <Filename>Cbi0.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index 41b1b28841..55d2dbacdf 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -90,10 +90,10 @@
     <Filename>Exec.h</Filename>
     <Filename>FwVolBlock.h</Filename>
     <Filename>FwVolDriver.h</Filename>
-    <Filename>Gcd.h</Filename>
-    <Filename>Hand.h</Filename>
+    <Filename>gcd.h</Filename>
+    <Filename>hand.h</Filename>
     <Filename>Image.h</Filename>
-    <Filename>Imem.h</Filename>
+    <Filename>imem.h</Filename>
     <Filename>Library.h</Filename>
   </SourceFiles>
   <PackageDependencies>
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index bc56709d7e..01b61af697 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -50,7 +50,7 @@
     <Filename SupArchList="IA32">Ia32/plDebugSupport.c</Filename>
     <Filename SupArchList="IPF">ipf/AsmFuncs.s</Filename>
     <Filename SupArchList="IPF">ipf/common.i</Filename>
-    <Filename SupArchList="IPF">ipf/ds64macros.i</Filename>
+    <Filename SupArchList="IPF">ipf/Ds64Macros.i</Filename>
     <Filename SupArchList="IPF">ipf/plDebugSupport.c</Filename>
     <Filename SupArchList="IPF">ipf/plDebugSupport.h</Filename>
     <Filename ToolChainFamily="MSFT" SupArchList="X64">x64/AsmFuncs.asm</Filename>
diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
index 5e2c5c7f71..da662049fd 100644
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
+++ b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
@@ -49,7 +49,7 @@
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>diskio.c</Filename>
-    <Filename>diskio.h</Filename>
+    <Filename>DiskIo.h</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
   <PackageDependencies>
@@ -71,4 +71,4 @@
       <ComponentName>gDiskIoComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index 6a2321ea5c..40a44cbb2e 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -62,7 +62,7 @@
     <Filename>hton.h</Filename>
     <Filename>tftp.h</Filename>
     <Filename>dhcp.h</Filename>
-    <Filename>bc.h</Filename>
+    <Filename>Bc.h</Filename>
     <Filename>ip.h</Filename>
     <Filename>ComponentName.c</Filename>
     <Filename>Print.c</Filename>
@@ -118,4 +118,4 @@
       <ComponentName>gPxeBcComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
index 58d8a9a378..24c05a4f11 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
@@ -58,7 +58,7 @@
     <Filename>reset.c</Filename>
     <Filename>shutdown.c</Filename>
     <Filename>snp.c</Filename>
-    <Filename>snp.h</Filename>
+    <Filename>Snp.h</Filename>
     <Filename>start.c</Filename>
     <Filename>station_address.c</Filename>
     <Filename>statistics.c</Filename>
@@ -96,4 +96,4 @@
       <ComponentName>gSimpleNetworkComponentName</ComponentName>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>