diff --git a/src/add-ons/kernel/drivers/Jamfile b/src/add-ons/kernel/drivers/Jamfile
index 0af184b6eb..4a5ace1bca 100644
--- a/src/add-ons/kernel/drivers/Jamfile
+++ b/src/add-ons/kernel/drivers/Jamfile
@@ -4,6 +4,5 @@ SubInclude OBOS_TOP src add-ons kernel drivers arch ;
 SubInclude OBOS_TOP src add-ons kernel drivers audio ;
 SubInclude OBOS_TOP src add-ons kernel drivers common ;
 SubInclude OBOS_TOP src add-ons kernel drivers misc ;
+SubInclude OBOS_TOP src add-ons kernel drivers network ;
 SubInclude OBOS_TOP src add-ons kernel drivers random ;
-SubInclude OBOS_TOP src add-ons kernel drivers net ;
-
diff --git a/src/add-ons/kernel/drivers/network/Jamfile b/src/add-ons/kernel/drivers/network/Jamfile
index b6eacff6c0..2fcc934ee1 100644
--- a/src/add-ons/kernel/drivers/network/Jamfile
+++ b/src/add-ons/kernel/drivers/network/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src add-ons kernel drivers net ;
+SubDir OBOS_TOP src add-ons kernel drivers network ;
 
-SubInclude OBOS_TOP src add-ons kernel drivers net stack ;
-SubInclude OBOS_TOP src add-ons kernel drivers net sis900 ;
+SubInclude OBOS_TOP src add-ons kernel drivers network sis900 ;
+SubInclude OBOS_TOP src add-ons kernel drivers network stack ;
diff --git a/src/add-ons/kernel/drivers/network/sis900/Jamfile b/src/add-ons/kernel/drivers/network/sis900/Jamfile
index e8c543a939..c5ecc960d0 100644
--- a/src/add-ons/kernel/drivers/network/sis900/Jamfile
+++ b/src/add-ons/kernel/drivers/network/sis900/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src add-ons kernel drivers net sis900 ;
+SubDir OBOS_TOP src add-ons kernel drivers network sis900 ;
 
 # set some additional defines
 {
@@ -12,7 +12,7 @@ SubDir OBOS_TOP src add-ons kernel drivers net sis900 ;
 	SubDirCcFlags $(defines) -Wall -Wno-multichar ;
 }
 
-R5KernelAddon sis900 : [ FDirName kernel drivers net ] :
+R5KernelAddon sis900 : [ FDirName kernel drivers network ] :
 	driver.c
 	device.c
 	interface.c
diff --git a/src/add-ons/kernel/drivers/network/stack/Jamfile b/src/add-ons/kernel/drivers/network/stack/Jamfile
index e3d691aaf6..abdc61f1dd 100644
--- a/src/add-ons/kernel/drivers/network/stack/Jamfile
+++ b/src/add-ons/kernel/drivers/network/stack/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src add-ons kernel drivers net stack ;
+SubDir OBOS_TOP src add-ons kernel drivers network stack ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/kernel/Jamfile b/src/kernel/Jamfile
index 864a88062d..8bbdf225ee 100644
--- a/src/kernel/Jamfile
+++ b/src/kernel/Jamfile
@@ -431,10 +431,9 @@ KernelFloppyImage $(OBOS_FLOPPY) : $(OBOS_KERNEL) : $(SUBDIR)/boot/arch/$(OBOS_A
 Depends floppy : $(OBOS_FLOPPY) ;
 NotFile floppy ;
 
+SubInclude OBOS_TOP src kernel apps ;
 SubInclude OBOS_TOP src kernel boot ;
 SubInclude OBOS_TOP src kernel core ;
 SubInclude OBOS_TOP src kernel drivers ;
-SubInclude OBOS_TOP src kernel global ;
 SubInclude OBOS_TOP src kernel glue ;
-SubInclude OBOS_TOP src kernel apps ;
 SubInclude OBOS_TOP src kernel libroot ;
diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index ad156d5e45..1a8471b3de 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -61,4 +61,4 @@ SubInclude OBOS_TOP src kits support ;
 SubInclude OBOS_TOP src kits translation ;
 SubInclude OBOS_TOP src kits device ;
 SubInclude OBOS_TOP src kits game ;
-SubInclude OBOS_TOP src kits net ;
+SubInclude OBOS_TOP src kits network ;
diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile
index eac961f4a7..e994d30931 100644
--- a/src/kits/network/Jamfile
+++ b/src/kits/network/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kits net ;
+SubDir OBOS_TOP src kits network ;
 
-SubInclude OBOS_TOP src kits net libnet ;
-SubInclude OBOS_TOP src kits net libnetapi ;
+SubInclude OBOS_TOP src kits network libnet ;
+SubInclude OBOS_TOP src kits network libnetapi ;
diff --git a/src/kits/network/libnet/Jamfile b/src/kits/network/libnet/Jamfile
index 83060fc7d5..7fd813e54b 100644
--- a/src/kits/network/libnet/Jamfile
+++ b/src/kits/network/libnet/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kits net libnet ;
+SubDir OBOS_TOP src kits network libnet ;
 
 UsePrivateHeaders net ;
 
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 0772653305..5096b384f4 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src kits net libnetapi ;
+SubDir OBOS_TOP src kits network libnetapi ;
 
 UsePrivateHeaders net ;