diff --git a/src/add-ons/kernel/generic/Jamfile b/src/add-ons/kernel/generic/Jamfile
index 48f8d273f9..f828fe1dba 100644
--- a/src/add-ons/kernel/generic/Jamfile
+++ b/src/add-ons/kernel/generic/Jamfile
@@ -1,7 +1,7 @@
 SubDir OBOS_TOP src add-ons kernel generic ; 
 
 SubInclude OBOS_TOP src add-ons kernel generic atomizer ;
-SubInclude OBOS_TOP src add-ons kernel generic blkman ;
+SubInclude OBOS_TOP src add-ons kernel generic block_io ;
 SubInclude OBOS_TOP src add-ons kernel generic fast_log ;
 SubInclude OBOS_TOP src add-ons kernel generic ide_adapter ;
 SubInclude OBOS_TOP src add-ons kernel generic locked_pool ;
diff --git a/src/add-ons/kernel/generic/blkman/Jamfile b/src/add-ons/kernel/generic/block_io/Jamfile
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/Jamfile
rename to src/add-ons/kernel/generic/block_io/Jamfile
diff --git a/src/add-ons/kernel/generic/blkman/KernelExport_ext.h b/src/add-ons/kernel/generic/block_io/KernelExport_ext.h
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/KernelExport_ext.h
rename to src/add-ons/kernel/generic/block_io/KernelExport_ext.h
diff --git a/src/add-ons/kernel/generic/blkman/bios_drive.h b/src/add-ons/kernel/generic/block_io/bios_drive.h
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/bios_drive.h
rename to src/add-ons/kernel/generic/block_io/bios_drive.h
diff --git a/src/add-ons/kernel/generic/blkman/blkman.c b/src/add-ons/kernel/generic/block_io/blkman.c
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/blkman.c
rename to src/add-ons/kernel/generic/block_io/blkman.c
diff --git a/src/add-ons/kernel/generic/blkman/blkman_int.h b/src/add-ons/kernel/generic/block_io/blkman_int.h
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/blkman_int.h
rename to src/add-ons/kernel/generic/block_io/blkman_int.h
diff --git a/src/add-ons/kernel/generic/blkman/io.c b/src/add-ons/kernel/generic/block_io/io.c
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/io.c
rename to src/add-ons/kernel/generic/block_io/io.c
diff --git a/src/add-ons/kernel/generic/blkman/virtual_memory.c b/src/add-ons/kernel/generic/block_io/virtual_memory.c
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/virtual_memory.c
rename to src/add-ons/kernel/generic/block_io/virtual_memory.c
diff --git a/src/add-ons/kernel/generic/blkman/wrapper.h b/src/add-ons/kernel/generic/block_io/wrapper.h
similarity index 100%
rename from src/add-ons/kernel/generic/blkman/wrapper.h
rename to src/add-ons/kernel/generic/block_io/wrapper.h