diff --git a/FatBinPkg/Fat/Ebc/Fat.efi b/FatBinPkg/EnhancedFatDxe/Ebc/Fat.efi
similarity index 100%
rename from FatBinPkg/Fat/Ebc/Fat.efi
rename to FatBinPkg/EnhancedFatDxe/Ebc/Fat.efi
diff --git a/FatBinPkg/Fat/Fat.inf b/FatBinPkg/EnhancedFatDxe/Fat.inf
similarity index 100%
rename from FatBinPkg/Fat/Fat.inf
rename to FatBinPkg/EnhancedFatDxe/Fat.inf
diff --git a/FatBinPkg/Fat/Fat.msa b/FatBinPkg/EnhancedFatDxe/Fat.msa
similarity index 100%
rename from FatBinPkg/Fat/Fat.msa
rename to FatBinPkg/EnhancedFatDxe/Fat.msa
diff --git a/FatBinPkg/Fat/Ia32/Fat.efi b/FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
similarity index 100%
rename from FatBinPkg/Fat/Ia32/Fat.efi
rename to FatBinPkg/EnhancedFatDxe/Ia32/Fat.efi
diff --git a/FatBinPkg/Fat/Ipf/Fat.efi b/FatBinPkg/EnhancedFatDxe/Ipf/Fat.efi
similarity index 100%
rename from FatBinPkg/Fat/Ipf/Fat.efi
rename to FatBinPkg/EnhancedFatDxe/Ipf/Fat.efi
diff --git a/FatBinPkg/Fat/X64/Fat.efi b/FatBinPkg/EnhancedFatDxe/X64/Fat.efi
similarity index 100%
rename from FatBinPkg/Fat/X64/Fat.efi
rename to FatBinPkg/EnhancedFatDxe/X64/Fat.efi
diff --git a/FatBinPkg/FatBinPkg.nspd b/FatBinPkg/FatBinPkg.nspd
index b4c90dcb8f..f56a9f4b8a 100644
--- a/FatBinPkg/FatBinPkg.nspd
+++ b/FatBinPkg/FatBinPkg.nspd
@@ -20,6 +20,6 @@
false
- Fat/Fat.msa
+ EnhancedFatDxe/Fat.msa
\ No newline at end of file