diff --git a/headers/os/kernel/debugger.h b/headers/os/kernel/debugger.h
index 3dca2158fc..3f40636bec 100644
--- a/headers/os/kernel/debugger.h
+++ b/headers/os/kernel/debugger.h
@@ -167,15 +167,14 @@ typedef enum {
 	B_DEBUG_MESSAGE_GET_SIGNAL_HANDLER,	//  a signal
 	B_DEBUG_MESSAGE_CLONE_AREA,			// clone a team area into the debugger team
 
-	B_DEBUG_MESSAGE_PREPARE_HANDOVER,	// prepares the debugged team for being
+	B_DEBUG_MESSAGE_PREPARE_HANDOVER = 1000, // prepares the debugged team for being
 										// handed over to another debugger;
 										// the new debugger can just invoke
 										// install_team_debugger()
+	B_DEBUG_MESSAGE_WRITE_CORE_FILE,	// write a core file
 
-	B_DEBUG_START_PROFILER,				// start/stop sampling
-	B_DEBUG_STOP_PROFILER,				//
-
-	B_DEBUG_WRITE_CORE_FILE,			// write a core file
+	B_DEBUG_MESSAGE_START_PROFILER = 2000, // start/stop sampling
+	B_DEBUG_MESSAGE_STOP_PROFILER,		//
 } debug_nub_message;
 
 // messages sent to the debugger
diff --git a/src/bin/debug/profile/Team.cpp b/src/bin/debug/profile/Team.cpp
index 31c233b9cb..6ef8ab3160 100644
--- a/src/bin/debug/profile/Team.cpp
+++ b/src/bin/debug/profile/Team.cpp
@@ -150,7 +150,7 @@ Team::InitThread(Thread* thread)
 
 		debug_nub_start_profiler_reply reply;
 		status_t error = send_debug_message(&fDebugContext,
-			B_DEBUG_START_PROFILER, &message, sizeof(message), &reply,
+			B_DEBUG_MESSAGE_START_PROFILER, &message, sizeof(message), &reply,
 			sizeof(reply));
 		if (error != B_OK || (error = reply.error) != B_OK) {
 			fprintf(stderr,
diff --git a/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp b/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp
index d14ca8ddea..f3660e37fc 100644
--- a/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp
+++ b/src/kits/debugger/debugger_interface/local/LocalDebuggerInterface.cpp
@@ -749,7 +749,7 @@ LocalDebuggerInterface::WriteCoreFile(const char* path)
 	strlcpy(message.path, path, sizeof(message.path));
 
 	status_t error = send_debug_message(contextGetter.Context(),
-		B_DEBUG_WRITE_CORE_FILE, &message, sizeof(message), &reply,
+		B_DEBUG_MESSAGE_WRITE_CORE_FILE, &message, sizeof(message), &reply,
 		sizeof(reply));
 	if (error == B_OK)
 		error = reply.error;
diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp
index 2fd7accd9c..06c2eac28b 100644
--- a/src/servers/debug/DebugServer.cpp
+++ b/src/servers/debug/DebugServer.cpp
@@ -783,7 +783,7 @@ TeamDebugHandler::_WriteCoreFile()
 
 	debug_nub_write_core_file_reply reply;
 
-	error = send_debug_message(&fDebugContext, B_DEBUG_WRITE_CORE_FILE,
+	error = send_debug_message(&fDebugContext, B_DEBUG_MESSAGE_WRITE_CORE_FILE,
 			&message, sizeof(message), &reply, sizeof(reply));
 	if (error == B_OK)
 		error = reply.error;
diff --git a/src/system/kernel/debug/user_debugger.cpp b/src/system/kernel/debug/user_debugger.cpp
index 5eb369d041..74247da307 100644
--- a/src/system/kernel/debug/user_debugger.cpp
+++ b/src/system/kernel/debug/user_debugger.cpp
@@ -2345,7 +2345,7 @@ debug_nub_thread(void *)
 				break;
 			}
 
-			case B_DEBUG_START_PROFILER:
+			case B_DEBUG_MESSAGE_START_PROFILER:
 			{
 				// get the parameters
 				thread_id threadID = message.start_profiler.thread;
@@ -2457,7 +2457,7 @@ debug_nub_thread(void *)
 				break;
 			}
 
-			case B_DEBUG_STOP_PROFILER:
+			case B_DEBUG_MESSAGE_STOP_PROFILER:
 			{
 				// get the parameters
 				thread_id threadID = message.stop_profiler.thread;
@@ -2539,7 +2539,7 @@ debug_nub_thread(void *)
 				break;
 			}
 
-			case B_DEBUG_WRITE_CORE_FILE:
+			case B_DEBUG_MESSAGE_WRITE_CORE_FILE:
 			{
 				// get the parameters
 				replyPort = message.write_core_file.reply_port;