diff --git a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
index acde29456c..b25b9008a4 100644
--- a/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
@@ -430,7 +430,7 @@ embedded_controller_register_child_devices(void* _cookie)
 		return B_ERROR;
 	}
 
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	snprintf(name, sizeof(name), ACPI_EC_BASENAME, pathID);
 
 	return gDeviceManager->publish_device(node, name, ACPI_EC_DEVICE_NAME);
diff --git a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
index 4892f84022..baf7157d4d 100644
--- a/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
+++ b/src/add-ons/kernel/bus_managers/i2c/I2CBus.cpp
@@ -132,7 +132,7 @@ i2c_init_bus(device_node *node, void **_bus)
 
 	*_bus = bus;
 
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	snprintf(name, sizeof(name), "bus/i2c/%d/bus_raw", pathID);
 
 	return gDeviceManager->publish_device(node, name, I2C_BUS_RAW_MODULE_NAME);
diff --git a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
index 85381240dc..375e528ba1 100644
--- a/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
+++ b/src/add-ons/kernel/drivers/audio/ice1712/ice1712.h
@@ -130,7 +130,7 @@ typedef struct ice1712
 {
 	uint32 irq;
 	pci_info info;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	ice1712Midi midiItf[MAX_MIDI_INTERFACE];
 
diff --git a/src/add-ons/kernel/drivers/display/display_adapter.cpp b/src/add-ons/kernel/drivers/display/display_adapter.cpp
index 72aaa8af32..b0af25c181 100644
--- a/src/add-ons/kernel/drivers/display/display_adapter.cpp
+++ b/src/add-ons/kernel/drivers/display/display_adapter.cpp
@@ -236,7 +236,7 @@ register_displays(const char *parentName, device_node *node)
 		gDeviceManager->register_node(node, DISPLAY_DEVICE_MODULE_NAME, attrs,
 				NULL, &deviceNode);
 
-		char deviceName[128];
+		char deviceName[B_DEV_NAME_LENGTH];
 		snprintf(deviceName, sizeof(deviceName), "%s/%s", parentName, name);
 		gDeviceManager->publish_device(parent, deviceName,
 			DISPLAY_DEVICE_MODULE_NAME);
@@ -288,7 +288,7 @@ displayadapter_register_child_devices(void *_cookie)
 		return B_ERROR;
 	}
 
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	snprintf(name, sizeof(name), DISPLAYADAPTER_BASENAME, path_id);
 	status_t status = gDeviceManager->publish_device(node, name,
 		DISPLAYADAPTER_DEVICE_MODULE_NAME);
diff --git a/src/add-ons/kernel/drivers/input/i2c_elan/Driver.cpp b/src/add-ons/kernel/drivers/input/i2c_elan/Driver.cpp
index 4a58604d23..34b1dad0f1 100644
--- a/src/add-ons/kernel/drivers/input/i2c_elan/Driver.cpp
+++ b/src/add-ons/kernel/drivers/input/i2c_elan/Driver.cpp
@@ -337,7 +337,7 @@ i2c_elan_register_child_devices(void *cookie)
 	// might have been unplugged. So we just generate names
 	// until we find one that is not currently in use.
 	int32 index = 0;
-	char pathBuffer[128];
+	char pathBuffer[B_DEV_NAME_LENGTH];
 	while (true) {
 		sprintf(pathBuffer, "input/mouse/" DEVICE_PATH_SUFFIX "/%" B_PRId32, index++);
 		if (gDeviceList->FindDevice(pathBuffer) == NULL) {
diff --git a/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp b/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp
index a77b6ae57d..b99fa32308 100644
--- a/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp
+++ b/src/add-ons/kernel/drivers/input/i2c_hid/Driver.cpp
@@ -411,7 +411,7 @@ i2c_hid_register_child_devices(void *cookie)
 		// might have been unplugged. So we just generate names
 		// until we find one that is not currently in use.
 		int32 index = 0;
-		char pathBuffer[128];
+		char pathBuffer[B_DEV_NAME_LENGTH];
 		const char *basePath = handler->BasePath();
 		while (true) {
 			sprintf(pathBuffer, "%s%" B_PRId32, basePath, index++);
diff --git a/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp b/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
index deccd43550..6d1445da49 100644
--- a/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
+++ b/src/add-ons/kernel/drivers/input/usb_hid/Driver.cpp
@@ -156,7 +156,7 @@ usb_hid_device_added(usb_device device, void **cookie)
 					// might have been unplugged. So we just generate names
 					// until we find one that is not currently in use.
 					int32 index = 0;
-					char pathBuffer[128];
+					char pathBuffer[B_DEV_NAME_LENGTH];
 					const char *basePath = handler->BasePath();
 					while (true) {
 						sprintf(pathBuffer, "%s%" B_PRId32, basePath, index++);
diff --git a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
index 5f56b524a6..e0b9c2029c 100644
--- a/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
+++ b/src/add-ons/kernel/drivers/power/acpi_ac/acpi_ac.cpp
@@ -248,7 +248,7 @@ acpi_ac_register_child_devices(void *driverCookie)
 {
 	acpi_ac_device_info *device = (acpi_ac_device_info *)driverCookie;
 	int path_id;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	path_id = sDeviceManager->create_id(ACPI_AC_PATHID_GENERATOR);
 	if (path_id < 0) {
diff --git a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp
index 4dedd2be8f..48930ad861 100644
--- a/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp
+++ b/src/add-ons/kernel/drivers/power/acpi_battery/acpi_battery.cpp
@@ -598,7 +598,7 @@ acpi_battery_register_child_devices(void *cookie)
 		return B_ERROR;
 	}
 
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	snprintf(name, sizeof(name), ACPI_BATTERY_BASENAME, pathID);
 
 	return sDeviceManager->publish_device(device->node, name,
diff --git a/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp b/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp
index bdf0e59968..4d824d4cfe 100644
--- a/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp
+++ b/src/add-ons/kernel/drivers/power/acpi_lid/acpi_lid.cpp
@@ -294,7 +294,7 @@ acpi_lid_register_child_devices(void *_cookie)
 {
 	acpi_lid_device_info *device = (acpi_lid_device_info *)_cookie;
 	int path_id;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	path_id = sDeviceManager->create_id(ACPI_LID_PATHID_GENERATOR);
 	if (path_id < 0) {
diff --git a/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c b/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c
index 68838913bb..26207c7984 100644
--- a/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c
+++ b/src/add-ons/kernel/drivers/power/acpi_thermal/acpi_thermal.c
@@ -319,7 +319,7 @@ acpi_thermal_register_child_devices(void* _cookie)
 {
 	device_node* node = _cookie;
 	int path_id;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	path_id = sDeviceManager->create_id(ACPI_THERMAL_PATHID_GENERATOR);
 	if (path_id < 0) {
diff --git a/src/add-ons/kernel/drivers/power/amd_thermal/amd_thermal.cpp b/src/add-ons/kernel/drivers/power/amd_thermal/amd_thermal.cpp
index f31a092288..1494287738 100644
--- a/src/add-ons/kernel/drivers/power/amd_thermal/amd_thermal.cpp
+++ b/src/add-ons/kernel/drivers/power/amd_thermal/amd_thermal.cpp
@@ -243,7 +243,7 @@ amd_thermal_register_child_devices(void* _cookie)
 {
 	device_node* node = (device_node*)_cookie;
 	int path_id;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	path_id = sDeviceManager->create_id(AMD_THERMAL_PATHID_GENERATOR);
 	if (path_id < 0) {
diff --git a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp
index 953e0acb9d..b777ec6562 100644
--- a/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp
+++ b/src/add-ons/kernel/drivers/power/pch_thermal/pch_thermal.cpp
@@ -259,7 +259,7 @@ pch_thermal_register_child_devices(void *_cookie)
 {
 	device_node *node = (device_node*)_cookie;
 	int path_id;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 
 	path_id = sDeviceManager->create_id(PCH_THERMAL_PATHID_GENERATOR);
 	if (path_id < 0) {
diff --git a/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp b/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp
index f7a2e4f201..7bb6337ed1 100644
--- a/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp
+++ b/src/add-ons/kernel/drivers/sensor/acpi_als/acpi_als.cpp
@@ -305,7 +305,7 @@ acpi_als_register_child_devices(void *cookie)
 		return B_ERROR;
 	}
 
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	snprintf(name, sizeof(name), ACPI_ALS_BASENAME, pathID);
 
 	return sDeviceManager->publish_device(device->node, name,
diff --git a/src/add-ons/kernel/generic/scsi_periph/device.cpp b/src/add-ons/kernel/generic/scsi_periph/device.cpp
index c6bcb83c07..117d6696b7 100644
--- a/src/add-ons/kernel/generic/scsi_periph/device.cpp
+++ b/src/add-ons/kernel/generic/scsi_periph/device.cpp
@@ -23,7 +23,7 @@ char *
 periph_compose_device_name(device_node *node, const char *prefix)
 {
 	uint8 pathID, targetID, targetLUN, type;
-	char name[128];
+	char name[B_DEV_NAME_LENGTH];
 	uint32 channel;
 
 	if (gDeviceManager->get_attr_uint8(node, SCSI_BUS_PATH_ID_ITEM, &pathID, true) != B_OK