diff --git a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
index ebc83fcd86..8c8b9132c2 100644
--- a/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
+++ b/EdkModulePkg/Core/DxeIplPeim/DxeIpl.msa
@@ -52,20 +52,20 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DxeLoad.c</Filename>
     <Filename>DxeIpl.dxs</Filename>
     <Arch ArchType="IA32">
-      <Filename>ia32/ImageRead.c</Filename>
-      <Filename>ia32/DxeLoadFunc.c</Filename>
+      <Filename>Ia32/ImageRead.c</Filename>
+      <Filename>Ia32/DxeLoadFunc.c</Filename>
     </Arch>
     <Arch ArchType="X64">
-      <Filename>ia32/ImageRead.c</Filename>
-      <Filename>ia32/DxeLoadFunc.c</Filename>
+      <Filename>Ia32/ImageRead.c</Filename>
+      <Filename>Ia32/DxeLoadFunc.c</Filename>
     </Arch>
     <Arch ArchType="IPF">
       <Filename>ipf/ImageRead.c</Filename>
       <Filename>ipf/DxeLoadFunc.c</Filename>
     </Arch>
     <Arch ArchType="EBC">
-      <Filename>ia32/ImageRead.c</Filename>
-      <Filename>ia32/DxeLoadFunc.c</Filename>
+      <Filename>Ia32/ImageRead.c</Filename>
+      <Filename>Ia32/DxeLoadFunc.c</Filename>
     </Arch>
   </SourceFiles>
   <Includes>
diff --git a/EdkModulePkg/Core/Pei/Dependency/dependency.c b/EdkModulePkg/Core/Pei/Dependency/dependency.c
index 5c82eefa1b..b893cbe6fc 100644
--- a/EdkModulePkg/Core/Pei/Dependency/dependency.c
+++ b/EdkModulePkg/Core/Pei/Dependency/dependency.c
@@ -24,7 +24,7 @@ Abstract:
 --*/
 
 #include <PeiMain.h>
-#include "Dependency.h"
+#include "dependency.h"
 
 STATIC
 BOOLEAN
diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 775c52e84c..7d05ffd7c6 100644
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -76,7 +76,7 @@ Abstract:
 #include <Protocol/AcpiS3Save.h>
 #include <Protocol/Performance.h>
 #include <Protocol/PxeDhcp4.h>
-#include <Protocol/PxeDhcp4Callback.h>
+#include <Protocol/PxeDhcp4CallBack.h>
 #include <Protocol/UgaIo.h>
 #include <Protocol/DebugAssert.h>
 #include <Protocol/usbatapi.h>
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index 1986c1d835..32618a00bf 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -42,8 +42,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>DebugSupport.c</Filename>
     <Filename>DebugSupport.dxs</Filename>
     <Arch ArchType="IA32">
-      <Filename>ia32/AsmFuncs.asm</Filename>
-      <Filename>ia32/plDebugSupport.c</Filename>
+      <Filename>Ia32/AsmFuncs.s</Filename>
+      <Filename>Ia32/plDebugSupport.c</Filename>
     </Arch>
     <Arch ArchType="IPF">
       <Filename>ipf/AsmFuncs.s</Filename>
diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
index a4eed02ef1..cd5819150a 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
@@ -48,7 +48,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Gpt.h</Filename>
     <Filename>Mbr.h</Filename>
     <Filename>Partition.c</Filename>
-    <Filename>Eltorito.c</Filename>
+    <Filename>ElTorito.c</Filename>
     <Filename>Gpt.c</Filename>
     <Filename>Mbr.c</Filename>
     <Filename>ComponentName.c</Filename>
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index 81cd125882..0bed650b0d 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -46,7 +46,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>FtwWorkSpace.c</Filename>
     <Filename>FtwLite.dxs</Filename>
     <Arch ArchType="IA32">
-      <Filename>ia32/Ia32FtwMisc.c</Filename>
+      <Filename>Ia32/Ia32FtwMisc.c</Filename>
     </Arch>
     <Arch ArchType="X64">
       <Filename>x64/x64FtwMisc.c</Filename>
@@ -55,7 +55,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Filename>Ipf/IpfFtwMisc.c</Filename>
     </Arch>
     <Arch ArchType="EBC">
-      <Filename>ia32/Ia32FtwMisc.c</Filename>
+      <Filename>Ia32/Ia32FtwMisc.c</Filename>
     </Arch>
   </SourceFiles>
   <Includes>
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
index b9f48912e2..c42cc9cca8 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/bc.c
@@ -15,7 +15,7 @@ Abstract:
 
 --*/
 
-#include "bc.h"
+#include "Bc.h"
 
 //
 //
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
index 801f592042..15a056a95e 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_arp.c
@@ -17,7 +17,7 @@ Abstract:
 --*/
 
 
-#include "bc.h"
+#include "Bc.h"
 
 //
 // Definitions for ARP
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 012b61cf37..c493c99da9 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -18,7 +18,7 @@ Abstract:
 --*/
 
 
-#include "bc.h"
+#include "Bc.h"
 
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DhcpServerPort        = DHCP_SERVER_PORT;
 STATIC EFI_PXE_BASE_CODE_UDP_PORT DHCPClientPort        = DHCP_CLIENT_PORT;
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
index 6737ede9b8..f4935b26b3 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_igmp.c
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 
 #define RAND_MAX  0x10000
-#include "bc.h"
+#include "Bc.h"
 
 //
 // Definitions for internet group management protocol version 2 message
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
index 26bc2109ae..e0e12ece81 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_ip.c
@@ -17,7 +17,7 @@ Abstract:
 --*/
 
 
-#include "bc.h"
+#include "Bc.h"
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 BOOLEAN
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
index 3e0b0f547f..e6e91c3c10 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_mtftp.c
@@ -33,7 +33,7 @@ Revision History
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 
 
-#include "bc.h"
+#include "Bc.h"
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
 UINT64
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
index ab9d3b794b..7d782955c8 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_udp.c
@@ -17,7 +17,7 @@ Abstract:
 --*/
 
 
-#include "bc.h"
+#include "Bc.h"
 
 //
 // //////////////////////////////////////////////////////////////////////
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
index 8897bc726e..315c95a9f5 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_loadfile.c
@@ -18,7 +18,7 @@ Abstract:
 --*/
 
 
-#include "bc.h"
+#include "Bc.h"
 
 #define DO_MENU     (EFI_SUCCESS)
 #define NO_MENU     (DO_MENU + 1)
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/WaitForPacket.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/WaitForPacket.c
index dff0da1a63..51a3bb856f 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/WaitForPacket.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/WaitForPacket.c
@@ -17,7 +17,7 @@ Abstract:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 VOID
 EFIAPI
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
index 488efc6a01..65a4d580d4 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/callback.c
@@ -19,7 +19,7 @@ Abstract:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 //
 // Global variables
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/get_status.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/get_status.c
index a3fa173d3e..6d89d4c9c6 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/get_status.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/get_status.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_getstatus (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
index d05395bd19..cb80171b24 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/initialize.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 VOID
 EFIAPI
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/mcast_ip_to_mac.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/mcast_ip_to_mac.c
index 995e33e27d..11b29f4fd7 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/mcast_ip_to_mac.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/mcast_ip_to_mac.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_ip2mac (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/nvdata.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/nvdata.c
index 0167e4db30..e9302da607 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/nvdata.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/nvdata.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_nvdata_read (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive.c
index 5a41b8a1ee..2d92ddeeed 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_receive (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive_filters.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive_filters.c
index 233448cda5..6e234de96c 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive_filters.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/receive_filters.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_rcvfilter_enable (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/reset.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/reset.c
index 8d56ecf361..a8dace6e10 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/reset.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/reset.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_reset (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/shutdown.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/shutdown.c
index efa6cf7302..5d7a4b27f8 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/shutdown.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/shutdown.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_shutdown (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
index ab3c997448..c193730ffa 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
@@ -16,7 +16,7 @@ Abstract:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_start (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/start.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/start.c
index 1fab0de8ef..b21d8cb5a1 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/start.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/start.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_start (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/station_address.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/station_address.c
index 2d143ef9a5..b5d2c40220 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/station_address.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/station_address.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_get_stn_addr (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/stop.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/stop.c
index c68731df26..6abd07eafc 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/stop.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/stop.c
@@ -18,7 +18,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_stop (
diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/transmit.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/transmit.c
index b48e2c79e8..404c75d5ae 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/transmit.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/transmit.c
@@ -19,7 +19,7 @@ Revision history:
 --*/
 
 
-#include "snp.h"
+#include "Snp.h"
 
 EFI_STATUS
 pxe_fillheader (