diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
index 6523c1f819..9482f1124f 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/LightPciBus.msa
@@ -63,11 +63,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>PciEnumerator.c</Filename>
     <Filename>PciEnumeratorSupport.c</Filename>
     <Filename>PciResourceSupport.c</Filename>
-    <Filename>PciCOmmand.c</Filename>
+    <Filename>PciCommand.c</Filename>
     <Filename>ComponentName.c</Filename>
     <Filename>PciDeviceSupport.c</Filename>
     <Filename>PciHotPlugSupport.c</Filename>
-    <Filename>PciBus.c</Filename>
+    <Filename>pcibus.c</Filename>
     <Filename>PciIo.c</Filename>
     <Filename>LightPciLib.c</Filename>
   </SourceFiles>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index fcbf81fd93..1ec7426116 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -65,10 +65,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>PciEnumerator.c</Filename>
     <Filename>PciEnumeratorSupport.c</Filename>
     <Filename>PciResourceSupport.c</Filename>
-    <Filename>PciCOmmand.c</Filename>
+    <Filename>PciCommand.c</Filename>
     <Filename>ComponentName.c</Filename>
     <Filename>PciDeviceSupport.c</Filename>
-    <Filename>PciBus.c</Filename>
+    <Filename>pcibus.c</Filename>
     <Filename>PciIo.c</Filename>
     <Filename>PciLib.c</Filename>
   </SourceFiles>
diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
index ab4c49d805..5d629422ae 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBusLite.msa
@@ -63,10 +63,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>PciEnumerator.c</Filename>
     <Filename>PciEnumeratorSupport.c</Filename>
     <Filename>PciResourceSupport.c</Filename>
-    <Filename>PciCOmmand.c</Filename>
+    <Filename>PciCommand.c</Filename>
     <Filename>PciDeviceSupport.c</Filename>
     <Filename>PciHotPlugSupport.c</Filename>
-    <Filename>PciBus.c</Filename>
+    <Filename>pcibus.c</Filename>
     <Filename>PciIo.c</Filename>
     <Filename>LightPciLib.c</Filename>
   </SourceFiles>
diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
index 6752c0b5c5..f841f11b52 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
@@ -45,14 +45,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">DevicePathLib</LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>UsbBus.h</Filename>
+    <Filename>usbbus.h</Filename>
     <Filename>usbutil.h</Filename>
     <Filename>hub.h</Filename>
-    <Filename>UsbBus.c</Filename>
-    <Filename>UsbIo.c</Filename>
+    <Filename>usbbus.c</Filename>
+    <Filename>usbio.c</Filename>
     <Filename>usb.c</Filename>
     <Filename>usbutil.c</Filename>
-    <Filename>Hub.c</Filename>
+    <Filename>hub.c</Filename>
     <Filename>ComponentName.c</Filename>
   </SourceFiles>
   <Includes>
diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
index 9ef90bb802..0abe2e2670 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
@@ -44,8 +44,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">UefiBootServicesTableLib</LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>cbi0.c</Filename>
-    <Filename>componentname.c</Filename>
+    <Filename>Cbi0.c</Filename>
+    <Filename>ComponentName.c</Filename>
   </SourceFiles>
   <Includes>
     <PackageName>MdePkg</PackageName>
diff --git a/EdkModulePkg/Core/Dxe/DxeMain.msa b/EdkModulePkg/Core/Dxe/DxeMain.msa
index 6ef5677194..5204e540ff 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.msa
+++ b/EdkModulePkg/Core/Dxe/DxeMain.msa
@@ -42,23 +42,23 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <Filename>DxeMain/DxeMain.c</Filename>
         <Filename>DxeMain/DxeProtocolNotify.c</Filename>
         <Filename>Dispatcher/Dispatcher.c</Filename>
-        <Filename>Dispatcher/Dependency.c</Filename>
-        <Filename>Event/ExecData.c</Filename>
-        <Filename>Event/Event.c</Filename>
-        <Filename>Event/Timer.c</Filename>
-        <Filename>Event/Tpl.c</Filename>
+        <Filename>Dispatcher/dependency.c</Filename>
+        <Filename>Event/execdata.c</Filename>
+        <Filename>Event/event.c</Filename>
+        <Filename>Event/timer.c</Filename>
+        <Filename>Event/tpl.c</Filename>
         <Filename>FwVol/FwVol.c</Filename>
         <Filename>FwVol/Ffs.c</Filename>
         <Filename>FwVol/FwVolAttrib.c</Filename>
         <Filename>FwVol/FwVolRead.c</Filename>
         <Filename>FwVol/FwVolWrite.c</Filename>
         <Filename>FwVolBlock/FwVolBlock.c</Filename>
-        <Filename>Mem/MemData.c</Filename>
+        <Filename>Mem/memdata.c</Filename>
         <Filename>Mem/Page.c</Filename>
-        <Filename>Mem/Pool.c</Filename>
-        <Filename>Gcd/Gcd.c</Filename>
-        <Filename>Hand/Handle.c</Filename>
-        <Filename>Hand/Locate.c</Filename>
+        <Filename>Mem/pool.c</Filename>
+        <Filename>Gcd/gcd.c</Filename>
+        <Filename>Hand/handle.c</Filename>
+        <Filename>Hand/locate.c</Filename>
         <Filename>Hand/Notify.c</Filename>
         <Filename>Hand/DriverSupport.c</Filename>
         <Filename>Library/Library.c</Filename>
diff --git a/EdkModulePkg/Core/Pei/PeiMain.msa b/EdkModulePkg/Core/Pei/PeiMain.msa
index 7da4dc9a47..1f5342e9f9 100644
--- a/EdkModulePkg/Core/Pei/PeiMain.msa
+++ b/EdkModulePkg/Core/Pei/PeiMain.msa
@@ -46,7 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <SourceFiles>
     <Filename>PeiMain.h</Filename>
     <Filename>BootMode/BootMode.c</Filename>
-    <Filename>Dependency/Dependency.c</Filename>
+    <Filename>Dependency/dependency.c</Filename>
     <Filename>Dispatcher/Dispatcher.c</Filename>
     <Filename>FwVol/FwVol.c</Filename>
     <Filename>Hob/Hob.c</Filename>
diff --git a/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.msa b/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.msa
index 486eb06bcf..d58942c167 100644
--- a/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.msa
+++ b/EdkModulePkg/Library/EdkUsbLib/EdkUsbLib.msa
@@ -36,7 +36,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <LibraryClass Usage="ALWAYS_CONSUMED">BaseMemoryLib</LibraryClass>
   </LibraryClassDefinitions>
   <SourceFiles>
-    <Filename>UsbDxelib.c</Filename>
+    <Filename>UsbDxeLib.c</Filename>
     <Filename>hid.c</Filename>
   </SourceFiles>
   <Includes>
diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 5c736f517b..23685fff96 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -46,7 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   </LibraryClassDefinitions>
   <SourceFiles>
     <Filename>Variable.c</Filename>
-    <Filename>Reclaim.c</Filename>
+    <Filename>reclaim.c</Filename>
     <Arch ArchType="IA32">
       <Filename>InitVariable.c</Filename>
       <Filename>Ia32Variable.dxs</Filename>