diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index d787c9af60..9083875604 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -125,7 +125,7 @@ BEOS_ADD_ONS_DRIVERS_NET = etherpci ipro1000 rtl8139 rtl8169 sis900
 BEOS_ADD_ONS_BUS_MANAGERS = pci $(X86_ONLY)ps2 $(X86_ONLY)isa ide scsi
 	config_manager $(X86_ONLY)agp usb firewire
 ;
-BEOS_ADD_ONS_FILE_SYSTEMS = bfs cdda dos googlefs iso9660 nfs ;
+BEOS_ADD_ONS_FILE_SYSTEMS = bfs cdda fat googlefs iso9660 nfs ;
 
 
 # modules
diff --git a/src/add-ons/kernel/file_systems/Jamfile b/src/add-ons/kernel/file_systems/Jamfile
index c41218629b..df5f37d14a 100644
--- a/src/add-ons/kernel/file_systems/Jamfile
+++ b/src/add-ons/kernel/file_systems/Jamfile
@@ -1,8 +1,8 @@
 SubDir HAIKU_TOP src add-ons kernel file_systems ;
 
-SubInclude HAIKU_TOP src add-ons kernel file_systems dos ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems bfs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems cdda ;
+SubInclude HAIKU_TOP src add-ons kernel file_systems fat ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems googlefs ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems iso9660 ;
 SubInclude HAIKU_TOP src add-ons kernel file_systems nfs ;
diff --git a/src/add-ons/kernel/file_systems/dos/Jamfile b/src/add-ons/kernel/file_systems/fat/Jamfile
similarity index 71%
rename from src/add-ons/kernel/file_systems/dos/Jamfile
rename to src/add-ons/kernel/file_systems/fat/Jamfile
index a8cfae2317..4ac052b096 100644
--- a/src/add-ons/kernel/file_systems/dos/Jamfile
+++ b/src/add-ons/kernel/file_systems/fat/Jamfile
@@ -1,10 +1,10 @@
-SubDir HAIKU_TOP src add-ons kernel file_systems dos ;
+SubDir HAIKU_TOP src add-ons kernel file_systems fat ;
 
 UsePrivateHeaders kernel ;
 
 SubDirCcFlags -DTRACK_FILENAME ;
 
-KernelAddon dos :
+KernelAddon fat :
 	attr.c
 	dir.c
 	dlist.c
diff --git a/src/add-ons/kernel/file_systems/dos/LICENSE b/src/add-ons/kernel/file_systems/fat/LICENSE
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/LICENSE
rename to src/add-ons/kernel/file_systems/fat/LICENSE
diff --git a/src/add-ons/kernel/file_systems/dos/attr.c b/src/add-ons/kernel/file_systems/fat/attr.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/attr.c
rename to src/add-ons/kernel/file_systems/fat/attr.c
diff --git a/src/add-ons/kernel/file_systems/dos/attr.h b/src/add-ons/kernel/file_systems/fat/attr.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/attr.h
rename to src/add-ons/kernel/file_systems/fat/attr.h
diff --git a/src/add-ons/kernel/file_systems/dos/dir.c b/src/add-ons/kernel/file_systems/fat/dir.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/dir.c
rename to src/add-ons/kernel/file_systems/fat/dir.c
diff --git a/src/add-ons/kernel/file_systems/dos/dir.h b/src/add-ons/kernel/file_systems/fat/dir.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/dir.h
rename to src/add-ons/kernel/file_systems/fat/dir.h
diff --git a/src/add-ons/kernel/file_systems/dos/dlist.c b/src/add-ons/kernel/file_systems/fat/dlist.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/dlist.c
rename to src/add-ons/kernel/file_systems/fat/dlist.c
diff --git a/src/add-ons/kernel/file_systems/dos/dlist.h b/src/add-ons/kernel/file_systems/fat/dlist.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/dlist.h
rename to src/add-ons/kernel/file_systems/fat/dlist.h
diff --git a/src/add-ons/kernel/file_systems/dos/dosfs.c b/src/add-ons/kernel/file_systems/fat/dosfs.c
similarity index 98%
rename from src/add-ons/kernel/file_systems/dos/dosfs.c
rename to src/add-ons/kernel/file_systems/fat/dosfs.c
index def193e253..27e81bd050 100644
--- a/src/add-ons/kernel/file_systems/dos/dosfs.c
+++ b/src/add-ons/kernel/file_systems/fat/dosfs.c
@@ -47,7 +47,7 @@ static status_t get_fsinfo(nspace *vol, uint32 *free_count, uint32 *last_allocat
 
 int32 instances = 0;
 
-static int debug_dos(int argc, char **argv)
+static int debug_fat(int argc, char **argv)
 {
 	int i;
 	for (i=1;i<argc;i++) {
@@ -55,7 +55,7 @@ static int debug_dos(int argc, char **argv)
 		if (vol == NULL)
 			continue;
 
-		kprintf("dos nspace @ %p\n", vol);
+		kprintf("fat nspace @ %p\n", vol);
 		kprintf("magic: %lx\n", vol->magic);
 		kprintf("id: %lx, fd: %x, device: %s, flags %lx\n",
 				vol->id, vol->fd, vol->device, vol->flags);
@@ -429,7 +429,7 @@ static status_t mount_fat_disk(const char *path, dev_t nsid,
 	vol->beos_vnid = INVALID_VNID_BITS_MASK;
 	{
 		void *handle;
-		handle = load_driver_settings("dos");
+		handle = load_driver_settings("fat");
 		vol->respect_disk_image =
 				get_driver_boolean_parameter(handle, "respect", true, true);
 		unload_driver_settings(handle);
@@ -674,7 +674,7 @@ dosfs_mount(dev_t nsid, const char *device, uint32 flags,
 	int op_sync_mode;
 	int fs_flags = 0;
 
-	handle = load_driver_settings("dos");
+	handle = load_driver_settings("fat");
 		debug_attr = strtoul(get_driver_parameter(handle, "debug_attr", "0", "0"), NULL, 0);
 		debug_dir = strtoul(get_driver_parameter(handle, "debug_dir", "0", "0"), NULL, 0);
 		debug_dlist = strtoul(get_driver_parameter(handle, "debug_dlist", "0", "0"), NULL, 0);
@@ -734,11 +734,11 @@ dosfs_mount(dev_t nsid, const char *device, uint32 flags,
 		}
 
 #if DEBUG
-		load_driver_symbols("dos");
+		load_driver_symbols("fat");
 
 		if (atomic_add(&instances, 1) == 0) {
-			add_debugger_command("dos", debug_dos, "dump a dos nspace structure");
-			add_debugger_command("dvnode", debug_dvnode, "dump a dos vnode structure");
+			add_debugger_command("fat", debug_fat, "dump a fat nspace structure");
+			add_debugger_command("dvnode", debug_dvnode, "dump a fat vnode structure");
 			add_debugger_command("dfvnid", debug_dfvnid, "find a vnid in the vnid cache");
 			add_debugger_command("dfloc", debug_dfloc, "find a loc in the vnid cache");
 			add_debugger_command("dc2s", debug_dc2s, "calculate sector for cluster");
@@ -839,7 +839,7 @@ dosfs_unmount(void *_vol)
 
 #if DEBUG
 	if (atomic_add(&instances, -1) == 1) {
-		remove_debugger_command("dos", debug_dos);
+		remove_debugger_command("fat", debug_fat);
 		remove_debugger_command("dvnode", debug_dvnode);
 		remove_debugger_command("dfvnid", debug_dfvnid);
 		remove_debugger_command("dfloc", debug_dfloc);
@@ -1184,9 +1184,9 @@ dos_std_ops(int32 op, ...)
 }
 
 
-static file_system_module_info sDosFileSystem = {
+static file_system_module_info sFATFileSystem = {
 	{
-		"file_systems/dos" B_CURRENT_FS_API_VERSION,
+		"file_systems/fat" B_CURRENT_FS_API_VERSION,
 		0,
 		dos_std_ops,
 	},
@@ -1294,6 +1294,6 @@ static file_system_module_info sDosFileSystem = {
 };
 
 module_info *modules[] = {
-	(module_info *)&sDosFileSystem,
+	(module_info *)&sFATFileSystem,
 	NULL,
 };
diff --git a/src/add-ons/kernel/file_systems/dos/dosfs.h b/src/add-ons/kernel/file_systems/fat/dosfs.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/dosfs.h
rename to src/add-ons/kernel/file_systems/fat/dosfs.h
diff --git a/src/add-ons/kernel/file_systems/dos/encodings.cpp b/src/add-ons/kernel/file_systems/fat/encodings.cpp
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/encodings.cpp
rename to src/add-ons/kernel/file_systems/fat/encodings.cpp
diff --git a/src/add-ons/kernel/file_systems/dos/encodings.h b/src/add-ons/kernel/file_systems/fat/encodings.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/encodings.h
rename to src/add-ons/kernel/file_systems/fat/encodings.h
diff --git a/src/add-ons/kernel/file_systems/dos/fat.c b/src/add-ons/kernel/file_systems/fat/fat.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/fat.c
rename to src/add-ons/kernel/file_systems/fat/fat.c
diff --git a/src/add-ons/kernel/file_systems/dos/fat.h b/src/add-ons/kernel/file_systems/fat/fat.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/fat.h
rename to src/add-ons/kernel/file_systems/fat/fat.h
diff --git a/src/add-ons/kernel/file_systems/dos/file.c b/src/add-ons/kernel/file_systems/fat/file.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/file.c
rename to src/add-ons/kernel/file_systems/fat/file.c
diff --git a/src/add-ons/kernel/file_systems/dos/file.h b/src/add-ons/kernel/file_systems/fat/file.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/file.h
rename to src/add-ons/kernel/file_systems/fat/file.h
diff --git a/src/add-ons/kernel/file_systems/dos/iter.c b/src/add-ons/kernel/file_systems/fat/iter.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/iter.c
rename to src/add-ons/kernel/file_systems/fat/iter.c
diff --git a/src/add-ons/kernel/file_systems/dos/iter.h b/src/add-ons/kernel/file_systems/fat/iter.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/iter.h
rename to src/add-ons/kernel/file_systems/fat/iter.h
diff --git a/src/add-ons/kernel/file_systems/dos/mime_table.c b/src/add-ons/kernel/file_systems/fat/mime_table.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/mime_table.c
rename to src/add-ons/kernel/file_systems/fat/mime_table.c
diff --git a/src/add-ons/kernel/file_systems/dos/mime_table.h b/src/add-ons/kernel/file_systems/fat/mime_table.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/mime_table.h
rename to src/add-ons/kernel/file_systems/fat/mime_table.h
diff --git a/src/add-ons/kernel/file_systems/dos/rtc_info.h b/src/add-ons/kernel/file_systems/fat/rtc_info.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/rtc_info.h
rename to src/add-ons/kernel/file_systems/fat/rtc_info.h
diff --git a/src/add-ons/kernel/file_systems/dos/settings/dos b/src/add-ons/kernel/file_systems/fat/settings/dos
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/settings/dos
rename to src/add-ons/kernel/file_systems/fat/settings/dos
diff --git a/src/add-ons/kernel/file_systems/dos/util.c b/src/add-ons/kernel/file_systems/fat/util.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/util.c
rename to src/add-ons/kernel/file_systems/fat/util.c
diff --git a/src/add-ons/kernel/file_systems/dos/util.h b/src/add-ons/kernel/file_systems/fat/util.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/util.h
rename to src/add-ons/kernel/file_systems/fat/util.h
diff --git a/src/add-ons/kernel/file_systems/dos/vcache.c b/src/add-ons/kernel/file_systems/fat/vcache.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/vcache.c
rename to src/add-ons/kernel/file_systems/fat/vcache.c
diff --git a/src/add-ons/kernel/file_systems/dos/vcache.h b/src/add-ons/kernel/file_systems/fat/vcache.h
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/vcache.h
rename to src/add-ons/kernel/file_systems/fat/vcache.h
diff --git a/src/add-ons/kernel/file_systems/dos/version.c b/src/add-ons/kernel/file_systems/fat/version.c
similarity index 100%
rename from src/add-ons/kernel/file_systems/dos/version.c
rename to src/add-ons/kernel/file_systems/fat/version.c