diff --git a/EdkShellBinPkg/FullShell/FullShell.msa b/EdkShellBinPkg/FullShell/FullShell.msa
index dcd8e083ee..3b019e739c 100644
--- a/EdkShellBinPkg/FullShell/FullShell.msa
+++ b/EdkShellBinPkg/FullShell/FullShell.msa
@@ -28,7 +28,7 @@
   <SourceFiles>
     <Filename SupArchList="IA32">ia32/Shell_Full.efi</Filename>
     <Filename SupArchList="IPF">ipf/Shell_Full.efi</Filename>
-    <Filename SupArchList="X64">x64/Shell_Full.efi</Filename>
+    <Filename SupArchList="X64">x64/Shell_full.efi</Filename>
   </SourceFiles>
   <PackageDependencies>
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>
@@ -37,4 +37,4 @@
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkShellBinPkg/MinimumShell/MinimumShell.msa b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
index 926019b3e7..6a669f1430 100644
--- a/EdkShellBinPkg/MinimumShell/MinimumShell.msa
+++ b/EdkShellBinPkg/MinimumShell/MinimumShell.msa
@@ -160,8 +160,8 @@
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/efidecompress.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/err.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/hexedit.efi</Filename>
-    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/legacyboot.efi</Filename>
-    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/loadfv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LegacyBoot.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LoadFv.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mem.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/memmap.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mm.efi</Filename>
diff --git a/EdkShellBinPkg/bin/Shell.msa b/EdkShellBinPkg/bin/Shell.msa
index 75164f88f9..a46aa03adb 100644
--- a/EdkShellBinPkg/bin/Shell.msa
+++ b/EdkShellBinPkg/bin/Shell.msa
@@ -124,7 +124,7 @@
     <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/stall.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="IPF">ipf/Apps/timezone.efi</Filename>
     <Filename SupArchList="IPF">ipf/Shell.efi</Filename>
-    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Shell_Full.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Shell_full.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Attrib.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cls.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/Cp.efi</Filename>
@@ -163,8 +163,8 @@
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/efidecompress.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/err.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/hexedit.efi</Filename>
-    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/legacyboot.efi</Filename>
-    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/loadfv.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LegacyBoot.efi</Filename>
+    <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/LoadFv.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mem.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/memmap.efi</Filename>
     <Filename ToolCode="DUMMY" SupArchList="X64">x64/Apps/mm.efi</Filename>