diff --git a/src/tests/add-ons/input_server/Jamfile b/src/tests/add-ons/input_server/Jamfile
index a64bc9a7d8..b5b204f5fb 100644
--- a/src/tests/add-ons/input_server/Jamfile
+++ b/src/tests/add-ons/input_server/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP src tests add-ons input ;
+SubDir OBOS_TOP src tests add-ons input_server ;
 
 SubDirHdrs $(OBOS_TOP) src add-ons input_server devices keyboard ;
 UsePrivateHeaders input ;
diff --git a/src/tests/apps/miniterminal/Jamfile b/src/tests/apps/miniterminal/Jamfile
index 20f0d0a5b8..5932861d71 100644
--- a/src/tests/apps/miniterminal/Jamfile
+++ b/src/tests/apps/miniterminal/Jamfile
@@ -10,4 +10,4 @@ App MiniTerminal :
 	Console.cpp
 	ViewBuffer.cpp ;
 
-LinkSharedOSLibs MiniTerminal : libbe.so ;
+LinkSharedOSLibs MiniTerminal : libroot.so libbe.so ;
diff --git a/src/tests/kits/app/messaging/Jamfile b/src/tests/kits/app/messaging/Jamfile
index 2221e178b1..239607f059 100644
--- a/src/tests/kits/app/messaging/Jamfile
+++ b/src/tests/kits/app/messaging/Jamfile
@@ -6,8 +6,8 @@ UsePrivateHeaders interface ;
 SimpleTest PortLinkTest :
 	PortLinkTest.cpp
 	PortLink.cpp
-	LinkMsgReader.cpp
-	LinkMsgSender.cpp
+	LinkReceiver.cpp
+	LinkSender.cpp
 
 	# PortLink accesses some private stuff directly
 	Shape.cpp
@@ -17,7 +17,7 @@ SimpleTest PortLinkTest :
 	: be
 	;
 
-SEARCH on [ FGristFiles PortLink.cpp LinkMsgReader.cpp LinkMsgSender.cpp ]
+SEARCH on [ FGristFiles PortLink.cpp LinkReceiver.cpp LinkSender.cpp ]
 	= [ FDirName $(OBOS_TOP) src kits app ] ;
 
 SEARCH on [ FGristFiles Shape.cpp Region.cpp RegionSupport.cpp ]
diff --git a/src/tests/kits/app/messaging/PortLinkTest.cpp b/src/tests/kits/app/messaging/PortLinkTest.cpp
index 55f4149527..1c5b58e999 100644
--- a/src/tests/kits/app/messaging/PortLinkTest.cpp
+++ b/src/tests/kits/app/messaging/PortLinkTest.cpp
@@ -9,7 +9,7 @@ const int32 kBufferSize = 2048;
 
 
 void
-get_next_message(BPortLink &link, int32 expectedCode)
+get_next_message(BPrivate::PortLink &link, int32 expectedCode)
 {
 	int32 code;
 	if (link.GetNextMessage(code) != B_OK) {
@@ -28,8 +28,8 @@ main()
 {
 	port_id port = create_port(100, "portlink");
 
-	BPortLink sender(port, -1);
-	BPortLink receiver(-1, port);
+	BPrivate::PortLink sender(port, -1);
+	BPrivate::PortLink receiver(-1, port);
 
 	sender.StartMessage('tst1');
 	sender.Attach<int32>(42);
diff --git a/src/tests/servers/input/prefs/Jamfile b/src/tests/servers/input/prefs/Jamfile
index 301b99b8e5..08845541b7 100644
--- a/src/tests/servers/input/prefs/Jamfile
+++ b/src/tests/servers/input/prefs/Jamfile
@@ -33,7 +33,7 @@ SEARCH on [ FGristFiles
 	Keymap.cpp
 	KeymapTextView.cpp
 	Keymap.rdef ]
-	= [ FDirName $(OBOS_TOP) src prefs keymap ] ;
+	= [ FDirName $(OBOS_TOP) src preferences keymap ] ;
 
 AddResources KeyboardTest : Keyboard.rdef ;
 
@@ -58,7 +58,7 @@ SEARCH on [ FGristFiles
 	KeyboardView.cpp 
 	KeyboardWindow.cpp 
 	Keyboard.rdef ]
-	= [ FDirName $(OBOS_TOP) src prefs keyboard ] ;
+	= [ FDirName $(OBOS_TOP) src preferences keyboard ] ;
 
 AddResources MouseTest : Mouse.rdef ;
 
@@ -87,7 +87,7 @@ SEARCH on [ FGristFiles
 	SettingsView.cpp
 	Mouse.rdef
 	]
-	= [ FDirName $(OBOS_TOP) src prefs mouse ] ;
+	= [ FDirName $(OBOS_TOP) src preferences mouse ] ;
 
 SimpleTest keymapTest :
 	main.cpp