diff --git a/CODEOWNERS b/CODEOWNERS
index 18b6d1aa1ae..8f67ff1af16 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -272,7 +272,7 @@
 /drivers/filesystems/btrfs/         @HeisSpiter
 /drivers/filesystems/cdfs/          @HeisSpiter
 /drivers/filesystems/ext2/          @HeisSpiter
-/drivers/filesystems/fastfat_new/   @HeisSpiter
+/drivers/filesystems/fastfat/       @HeisSpiter
 /drivers/filesystems/nfs/           @HeisSpiter
 /media/doc/README.FSD               @HeisSpiter
 /sdk/lib/fslib/btrfslib/            @HeisSpiter
diff --git a/drivers/filesystems/CMakeLists.txt b/drivers/filesystems/CMakeLists.txt
index 05add682ad3..d59e304cc8b 100644
--- a/drivers/filesystems/CMakeLists.txt
+++ b/drivers/filesystems/CMakeLists.txt
@@ -2,7 +2,7 @@
 add_subdirectory(btrfs)
 add_subdirectory(cdfs)
 add_subdirectory(ext2)
-add_subdirectory(fastfat_new)
+add_subdirectory(fastfat)
 add_subdirectory(fs_rec)
 add_subdirectory(msfs)
 add_subdirectory(mup)
diff --git a/drivers/filesystems/fastfat_new/CMakeLists.txt b/drivers/filesystems/fastfat/CMakeLists.txt
similarity index 100%
rename from drivers/filesystems/fastfat_new/CMakeLists.txt
rename to drivers/filesystems/fastfat/CMakeLists.txt
diff --git a/drivers/filesystems/fastfat_new/README.md b/drivers/filesystems/fastfat/README.md
similarity index 100%
rename from drivers/filesystems/fastfat_new/README.md
rename to drivers/filesystems/fastfat/README.md
diff --git a/drivers/filesystems/fastfat_new/acchksup.c b/drivers/filesystems/fastfat/acchksup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/acchksup.c
rename to drivers/filesystems/fastfat/acchksup.c
diff --git a/drivers/filesystems/fastfat_new/allocsup.c b/drivers/filesystems/fastfat/allocsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/allocsup.c
rename to drivers/filesystems/fastfat/allocsup.c
diff --git a/drivers/filesystems/fastfat_new/cachesup.c b/drivers/filesystems/fastfat/cachesup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/cachesup.c
rename to drivers/filesystems/fastfat/cachesup.c
diff --git a/drivers/filesystems/fastfat_new/cleanup.c b/drivers/filesystems/fastfat/cleanup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/cleanup.c
rename to drivers/filesystems/fastfat/cleanup.c
diff --git a/drivers/filesystems/fastfat_new/close.c b/drivers/filesystems/fastfat/close.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/close.c
rename to drivers/filesystems/fastfat/close.c
diff --git a/drivers/filesystems/fastfat_new/create.c b/drivers/filesystems/fastfat/create.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/create.c
rename to drivers/filesystems/fastfat/create.c
diff --git a/drivers/filesystems/fastfat_new/devctrl.c b/drivers/filesystems/fastfat/devctrl.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/devctrl.c
rename to drivers/filesystems/fastfat/devctrl.c
diff --git a/drivers/filesystems/fastfat_new/deviosup.c b/drivers/filesystems/fastfat/deviosup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/deviosup.c
rename to drivers/filesystems/fastfat/deviosup.c
diff --git a/drivers/filesystems/fastfat_new/dirctrl.c b/drivers/filesystems/fastfat/dirctrl.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/dirctrl.c
rename to drivers/filesystems/fastfat/dirctrl.c
diff --git a/drivers/filesystems/fastfat_new/dirsup.c b/drivers/filesystems/fastfat/dirsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/dirsup.c
rename to drivers/filesystems/fastfat/dirsup.c
diff --git a/drivers/filesystems/fastfat_new/dumpsup.c b/drivers/filesystems/fastfat/dumpsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/dumpsup.c
rename to drivers/filesystems/fastfat/dumpsup.c
diff --git a/drivers/filesystems/fastfat_new/ea.c b/drivers/filesystems/fastfat/ea.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/ea.c
rename to drivers/filesystems/fastfat/ea.c
diff --git a/drivers/filesystems/fastfat_new/easup.c b/drivers/filesystems/fastfat/easup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/easup.c
rename to drivers/filesystems/fastfat/easup.c
diff --git a/drivers/filesystems/fastfat_new/fastfat.rc b/drivers/filesystems/fastfat/fastfat.rc
similarity index 100%
rename from drivers/filesystems/fastfat_new/fastfat.rc
rename to drivers/filesystems/fastfat/fastfat.rc
diff --git a/drivers/filesystems/fastfat_new/fat.h b/drivers/filesystems/fastfat/fat.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/fat.h
rename to drivers/filesystems/fastfat/fat.h
diff --git a/drivers/filesystems/fastfat_new/fatdata.c b/drivers/filesystems/fastfat/fatdata.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatdata.c
rename to drivers/filesystems/fastfat/fatdata.c
diff --git a/drivers/filesystems/fastfat_new/fatdata.h b/drivers/filesystems/fastfat/fatdata.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatdata.h
rename to drivers/filesystems/fastfat/fatdata.h
diff --git a/drivers/filesystems/fastfat_new/fatinit.c b/drivers/filesystems/fastfat/fatinit.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatinit.c
rename to drivers/filesystems/fastfat/fatinit.c
diff --git a/drivers/filesystems/fastfat_new/fatprocs.h b/drivers/filesystems/fastfat/fatprocs.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatprocs.h
rename to drivers/filesystems/fastfat/fatprocs.h
diff --git a/drivers/filesystems/fastfat_new/fatprocssrc.c b/drivers/filesystems/fastfat/fatprocssrc.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatprocssrc.c
rename to drivers/filesystems/fastfat/fatprocssrc.c
diff --git a/drivers/filesystems/fastfat_new/fatstruc.h b/drivers/filesystems/fastfat/fatstruc.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/fatstruc.h
rename to drivers/filesystems/fastfat/fatstruc.h
diff --git a/drivers/filesystems/fastfat_new/fileinfo.c b/drivers/filesystems/fastfat/fileinfo.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fileinfo.c
rename to drivers/filesystems/fastfat/fileinfo.c
diff --git a/drivers/filesystems/fastfat_new/filobsup.c b/drivers/filesystems/fastfat/filobsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/filobsup.c
rename to drivers/filesystems/fastfat/filobsup.c
diff --git a/drivers/filesystems/fastfat_new/flush.c b/drivers/filesystems/fastfat/flush.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/flush.c
rename to drivers/filesystems/fastfat/flush.c
diff --git a/drivers/filesystems/fastfat_new/fsctrl.c b/drivers/filesystems/fastfat/fsctrl.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fsctrl.c
rename to drivers/filesystems/fastfat/fsctrl.c
diff --git a/drivers/filesystems/fastfat_new/fspdisp.c b/drivers/filesystems/fastfat/fspdisp.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/fspdisp.c
rename to drivers/filesystems/fastfat/fspdisp.c
diff --git a/drivers/filesystems/fastfat_new/lfn.h b/drivers/filesystems/fastfat/lfn.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/lfn.h
rename to drivers/filesystems/fastfat/lfn.h
diff --git a/drivers/filesystems/fastfat_new/lockctrl.c b/drivers/filesystems/fastfat/lockctrl.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/lockctrl.c
rename to drivers/filesystems/fastfat/lockctrl.c
diff --git a/drivers/filesystems/fastfat_new/namesup.c b/drivers/filesystems/fastfat/namesup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/namesup.c
rename to drivers/filesystems/fastfat/namesup.c
diff --git a/drivers/filesystems/fastfat_new/nodetype.h b/drivers/filesystems/fastfat/nodetype.h
similarity index 100%
rename from drivers/filesystems/fastfat_new/nodetype.h
rename to drivers/filesystems/fastfat/nodetype.h
diff --git a/drivers/filesystems/fastfat_new/pnp.c b/drivers/filesystems/fastfat/pnp.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/pnp.c
rename to drivers/filesystems/fastfat/pnp.c
diff --git a/drivers/filesystems/fastfat_new/read.c b/drivers/filesystems/fastfat/read.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/read.c
rename to drivers/filesystems/fastfat/read.c
diff --git a/drivers/filesystems/fastfat_new/resrcsup.c b/drivers/filesystems/fastfat/resrcsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/resrcsup.c
rename to drivers/filesystems/fastfat/resrcsup.c
diff --git a/drivers/filesystems/fastfat_new/shutdown.c b/drivers/filesystems/fastfat/shutdown.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/shutdown.c
rename to drivers/filesystems/fastfat/shutdown.c
diff --git a/drivers/filesystems/fastfat_new/splaysup.c b/drivers/filesystems/fastfat/splaysup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/splaysup.c
rename to drivers/filesystems/fastfat/splaysup.c
diff --git a/drivers/filesystems/fastfat_new/strucsup.c b/drivers/filesystems/fastfat/strucsup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/strucsup.c
rename to drivers/filesystems/fastfat/strucsup.c
diff --git a/drivers/filesystems/fastfat_new/timesup.c b/drivers/filesystems/fastfat/timesup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/timesup.c
rename to drivers/filesystems/fastfat/timesup.c
diff --git a/drivers/filesystems/fastfat_new/verfysup.c b/drivers/filesystems/fastfat/verfysup.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/verfysup.c
rename to drivers/filesystems/fastfat/verfysup.c
diff --git a/drivers/filesystems/fastfat_new/volinfo.c b/drivers/filesystems/fastfat/volinfo.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/volinfo.c
rename to drivers/filesystems/fastfat/volinfo.c
diff --git a/drivers/filesystems/fastfat_new/workque.c b/drivers/filesystems/fastfat/workque.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/workque.c
rename to drivers/filesystems/fastfat/workque.c
diff --git a/drivers/filesystems/fastfat_new/write.c b/drivers/filesystems/fastfat/write.c
similarity index 100%
rename from drivers/filesystems/fastfat_new/write.c
rename to drivers/filesystems/fastfat/write.c
diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt
index 0ab9cc921ab..7ce89a1c79f 100644
--- a/media/doc/3rd Party Files.txt	
+++ b/media/doc/3rd Party Files.txt	
@@ -104,7 +104,7 @@ License: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later.html)
 URL: http://www.citi.umich.edu/projects/nfsv4/windows/readme.html
 
 Title: Microsoft fastfat File System Driver
-Path: drivers/filesystems/fastfat_new
+Path: drivers/filesystems/fastfat
 Used Version: git commit 16022c5
 License: MS-PL (https://spdx.org/licenses/MS-PL.html)
 URL: https://github.com/microsoft/Windows-driver-samples/tree/master/filesys/fastfat