diff --git a/src/kits/debug/debug_support.cpp b/src/kits/debug/debug_support.cpp
index 60cff4620d..a2130e1c2b 100644
--- a/src/kits/debug/debug_support.cpp
+++ b/src/kits/debug/debug_support.cpp
@@ -344,8 +344,8 @@ debug_lookup_symbol_address(debug_symbol_lookup_context *lookupContext,
 	}
 
 	if (imageName) {
-		if (imageNameSize > B_OS_NAME_LENGTH)
-			imageNameSize = B_OS_NAME_LENGTH;
+		if (imageNameSize > B_PATH_NAME_LENGTH)
+			imageNameSize = B_PATH_NAME_LENGTH;
 		strlcpy(imageName, _imageName, imageNameSize);
 	}
 
diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp
index ca3acb4ec9..d11b687b2b 100644
--- a/src/servers/debug/DebugServer.cpp
+++ b/src/servers/debug/DebugServer.cpp
@@ -587,7 +587,7 @@ TeamDebugHandler::_LookupSymbolAddress(
 	// lookup the symbol
 	void *baseAddress;
 	char symbolName[1024];
-	char imageName[B_OS_NAME_LENGTH];
+	char imageName[B_PATH_NAME_LENGTH];
 	bool exactMatch;
 	bool lookupSucceeded = false;
 	if (lookupContext) {