diff --git a/headers/private/kernel/ksystem_info.h b/headers/private/kernel/ksystem_info.h
index 48c1b85c3f..e22d0142fd 100644
--- a/headers/private/kernel/ksystem_info.h
+++ b/headers/private/kernel/ksystem_info.h
@@ -25,10 +25,10 @@ status_t _user_get_system_info(system_info *userInfo, size_t size);
 status_t _user_get_system_info_etc(int32 id, void *buffer,
 			size_t bufferSize);
 
-status_t _user_start_system_watching(int32 object, uint32 flags,
-			port_id port, int32 token);
-status_t _user_stop_system_watching(int32 object, uint32 flags,
-			port_id port, int32 token);
+status_t _user_start_watching_system(int32 object, uint32 flags, port_id port,
+			int32 token);
+status_t _user_stop_watching_system(int32 object, uint32 flags, port_id port,
+			int32 token);
 
 
 #ifdef __cplusplus
diff --git a/headers/private/system/syscalls.h b/headers/private/system/syscalls.h
index a09a82e26e..42e6d57e9e 100644
--- a/headers/private/system/syscalls.h
+++ b/headers/private/system/syscalls.h
@@ -174,9 +174,9 @@ extern status_t		_kern_get_team_usage_info(team_id team, int32 who,
 extern status_t		_kern_get_extended_team_info(team_id teamID, uint32 flags,
 						void* buffer, size_t size, size_t* _sizeNeeded);
 
-extern status_t		_kern_start_system_watching(int32 object, uint32 flags,
+extern status_t		_kern_start_watching_system(int32 object, uint32 flags,
 						port_id port, int32 token);
-extern status_t		_kern_stop_system_watching(int32 object, uint32 flags,
+extern status_t		_kern_stop_watching_system(int32 object, uint32 flags,
 						port_id port, int32 token);
 
 extern status_t		_kern_block_thread(uint32 flags, bigtime_t timeout);
diff --git a/headers/private/system/system_info.h b/headers/private/system/system_info.h
index 0a8843d359..fc8439287f 100644
--- a/headers/private/system/system_info.h
+++ b/headers/private/system/system_info.h
@@ -65,9 +65,9 @@ extern "C" {
 
 status_t get_system_info_etc(int32 id, void* buffer, size_t bufferSize);
 
-status_t start_system_watching(int32 object, uint32 flags, port_id port,
+status_t start_watching_system(int32 object, uint32 flags, port_id port,
 			int32 token);
-status_t stop_system_watching(int32 object, uint32 flags, port_id port,
+status_t stop_watching_system(int32 object, uint32 flags, port_id port,
 			int32 token);
 
 
diff --git a/src/apps/debugger/debugger_interface/DebuggerInterface.cpp b/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
index de5e5a1a8c..836f20c2d9 100644
--- a/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
+++ b/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
@@ -282,10 +282,11 @@ DebuggerInterface::Init()
 	if (fSystemWatchPort < 0)
 		return fSystemWatchPort;
 
-	error = start_system_watching(fTeamID, B_WATCH_SYSTEM_THREAD_PROPERTIES,
+	error = start_watching_system(fTeamID, B_WATCH_SYSTEM_THREAD_PROPERTIES,
 		fSystemWatchPort, 0);
 	if (error != B_OK)
 		return error;
+// TODO: Stop watching in Close()!
 
 	// create debug context pool
 	fDebugContextPool = new(std::nothrow) DebugContextPool(fTeamID, fNubPort);
diff --git a/src/system/kernel/system_info.cpp b/src/system/kernel/system_info.cpp
index 6d158d233a..1b01ad67a8 100644
--- a/src/system/kernel/system_info.cpp
+++ b/src/system/kernel/system_info.cpp
@@ -524,7 +524,7 @@ _user_get_system_info_etc(int32 id, void* userInfo, size_t size)
 
 
 status_t
-_user_start_system_watching(int32 object, uint32 flags, port_id port,
+_user_start_watching_system(int32 object, uint32 flags, port_id port,
 	int32 token)
 {
 	return sSystemNotificationService.StartListening(object, flags, port,
@@ -533,7 +533,7 @@ _user_start_system_watching(int32 object, uint32 flags, port_id port,
 
 
 status_t
-_user_stop_system_watching(int32 object, uint32 flags, port_id port,
+_user_stop_watching_system(int32 object, uint32 flags, port_id port,
 	int32 token)
 {
 	return sSystemNotificationService.StopListening(object, flags, port, token);
diff --git a/src/system/libroot/os/system_info.c b/src/system/libroot/os/system_info.c
index 9b67661157..4c74efd2fe 100644
--- a/src/system/libroot/os/system_info.c
+++ b/src/system/libroot/os/system_info.c
@@ -31,16 +31,16 @@ get_system_info_etc(int32 id, void *info, size_t size)
 
 
 status_t
-start_system_watching(int32 object, uint32 flags, port_id port, int32 token)
+start_watching_system(int32 object, uint32 flags, port_id port, int32 token)
 {
-	return _kern_start_system_watching(object, flags, port, token);
+	return _kern_start_watching_system(object, flags, port, token);
 }
 
 
 status_t
-stop_system_watching(int32 object, uint32 flags, port_id port, int32 token)
+stop_watching_system(int32 object, uint32 flags, port_id port, int32 token)
 {
-	return _kern_stop_system_watching(object, flags, port, token);
+	return _kern_stop_watching_system(object, flags, port, token);
 }
 
 
diff --git a/src/tests/system/libroot/os/system_watching_test.cpp b/src/tests/system/libroot/os/system_watching_test.cpp
index f32895b78f..c1dbb90588 100644
--- a/src/tests/system/libroot/os/system_watching_test.cpp
+++ b/src/tests/system/libroot/os/system_watching_test.cpp
@@ -97,7 +97,7 @@ main(int argc, const char* const* argv)
 	}
 
 	// start watching
-	status_t error = start_system_watching(watchTeam, watchEvents, port, 0);
+	status_t error = start_watching_system(watchTeam, watchEvents, port, 0);
 	if (error != B_OK) {
 		fprintf(stderr, "Failed to start watching: %s\n", strerror(error));
 		exit(1);