diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile
index 7a6402987a..988b809be6 100644
--- a/src/tests/add-ons/kernel/network/Jamfile
+++ b/src/tests/add-ons/kernel/network/Jamfile
@@ -28,6 +28,7 @@ SimpleTest net_stack_tester :
 }
 
 # for convenience: this target builds all userland modules
+Depends net_stack_tester : userland_network_modules :
 
 NotFile userland_network_modules ;
 Depends userland_network_modules :
diff --git a/src/tests/add-ons/kernel/network/core/Jamfile b/src/tests/add-ons/kernel/network/core/Jamfile
index 9f6f935b9c..9fe5acf895 100644
--- a/src/tests/add-ons/kernel/network/core/Jamfile
+++ b/src/tests/add-ons/kernel/network/core/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network core ] ;
 
-Addon <userland>core : userland network :
+Addon <userland>core : userland obos_network :
 	cksum.c
 	core.c
 	if.c
diff --git a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile
index fda37fbd00..fdee28b733 100644
--- a/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/ethernet/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces ethernet ] ;
 
-Addon <userland>ethernet : userland network interfaces : 
+Addon <userland>ethernet : userland obos_network interfaces : 
 	ethernet.c
 ;
 
diff --git a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile
index 9cb47e67e5..72cbc2a6ea 100644
--- a/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/loopback/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces loopback ] ;
 
-Addon <userland>loopback : userland network interfaces : 
+Addon <userland>loopback : userland obos_network interfaces : 
 	loopback.c
 ;
 
diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
index a4810b0fc6..5c6b44358a 100644
--- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
@@ -6,7 +6,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkerne
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces ppp ] ;
 
 
-Addon <userland>ppp : userland network interfaces : 
+Addon <userland>ppp : userland obos_network interfaces : 
 	ppp.cpp
 	PPPManager.cpp
 ;
diff --git a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
index 9b27279fbb..5fb5d1f932 100644
--- a/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
+++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkerne
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp ipcp ] ;
 
 
-Addon <userland>ipcp : userland network ppp :
+Addon <userland>ipcp : userland obos_network ppp :
 	ipcp.cpp
 	Protocol.cpp
 ;
diff --git a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile
index cc0e5d7973..4a8b1b65b1 100644
--- a/src/tests/add-ons/kernel/network/ppp/modem/Jamfile
+++ b/src/tests/add-ons/kernel/network/ppp/modem/Jamfile
@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkerne
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp modem ] ;
 
 
-Addon <userland>pppoe : userland network ppp :
+Addon <userland>pppoe : userland obos_network ppp :
 	modem.cpp
 	ModemDevice.cpp
 	ACFCHandler.cpp
diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile
index a8256ff09a..05db8118d2 100644
--- a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile
+++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile
@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkerne
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pap ] ;
 
 
-Addon <userland>pap : userland network ppp :
+Addon <userland>pap : userland obos_network ppp :
 	pap.cpp
 	Protocol.cpp
 ;
diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
index 773ba9bc4b..0d7cdec0c9 100644
--- a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
+++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
@@ -7,7 +7,7 @@ UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkerne
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pppoe ] ;
 
 
-Addon <userland>pppoe : userland network ppp :
+Addon <userland>pppoe : userland obos_network ppp :
 	pppoe.cpp
 	PPPoEDevice.cpp
 	DiscoveryPacket.cpp
diff --git a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile
index fe297775ab..aa3ddb55c2 100644
--- a/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile
+++ b/src/tests/add-ons/kernel/network/protocols/icmp/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols icmp ] ;
 
-Addon <userland>icmp : userland network protocols : 
+Addon <userland>icmp : userland obos_network protocols : 
 	icmp.c
 ;
 
diff --git a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile
index a21bbb988b..09988c0a5b 100644
--- a/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile
+++ b/src/tests/add-ons/kernel/network/protocols/ipv4/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols ipv4 ] ;
 
-Addon <userland>ipv4 : userland network protocols : 
+Addon <userland>ipv4 : userland obos_network protocols : 
 	ipv4.c
 ;
 
diff --git a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile
index 494a018618..6eb761a92b 100644
--- a/src/tests/add-ons/kernel/network/protocols/raw/Jamfile
+++ b/src/tests/add-ons/kernel/network/protocols/raw/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols raw ] ;
 
-Addon <userland>raw : userland network protocols : 
+Addon <userland>raw : userland obos_network protocols : 
 	raw.c
 ;
 
diff --git a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile
index 32f5f8b25d..d3bf6d3491 100644
--- a/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile
+++ b/src/tests/add-ons/kernel/network/protocols/tcp/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols tcp ] ;
 
-Addon <userland>tcp : userland network protocols : 
+Addon <userland>tcp : userland obos_network protocols : 
 	tcp.c
 	tcp_debug.c
 	tcp_input.c
diff --git a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile
index 3ff917df7a..a3a2814acc 100644
--- a/src/tests/add-ons/kernel/network/protocols/udp/Jamfile
+++ b/src/tests/add-ons/kernel/network/protocols/udp/Jamfile
@@ -4,7 +4,7 @@ UsePrivateHeaders net ;
 
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols udp ] ;
 
-Addon <userland>udp : userland network protocols : 
+Addon <userland>udp : userland obos_network protocols : 
 	udp.c
 ;