diff --git a/src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp b/src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp
index 6b312bb0f2..fc7074b682 100644
--- a/src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp
+++ b/src/kernel/core/disk_device_manager/KDiskDeviceManager.cpp
@@ -506,9 +506,9 @@ KDiskDeviceManager::JobQueueAt(int32 index)
 	return NULL;
 }
 
-// DiskSystemWithName
+// FindDiskSystem
 KDiskSystem *
-KDiskDeviceManager::DiskSystemWithName(const char *name)
+KDiskDeviceManager::FindDiskSystem(const char *name)
 {
 	for (int32 cookie = 0;
 		 KDiskSystem *diskSystem = NextDiskSystem(&cookie); ) {
@@ -518,9 +518,9 @@ KDiskDeviceManager::DiskSystemWithName(const char *name)
 	return NULL;
 }
 
-// DiskSystemWithID
+// FindDiskSystem
 KDiskSystem *
-KDiskDeviceManager::DiskSystemWithID(disk_system_id id)
+KDiskDeviceManager::FindDiskSystem(disk_system_id id)
 {
 	DiskSystemMap::Iterator it = fDiskSystems->Find(id);
 	if (it != fDiskSystems->End())
@@ -556,7 +556,7 @@ KDiskDeviceManager::LoadDiskSystem(disk_system_id id)
 {
 	KDiskSystem *diskSystem = NULL;
 	if (ManagerLocker locker = this) {
-		diskSystem = DiskSystemWithID(id);
+		diskSystem = FindDiskSystem(id);
 		if (diskSystem && diskSystem->Load() != B_OK)
 			diskSystem = NULL;
 	}
diff --git a/src/kernel/core/disk_device_manager/disk_device_manager.cpp b/src/kernel/core/disk_device_manager/disk_device_manager.cpp
index aff13d9919..61d829d82e 100644
--- a/src/kernel/core/disk_device_manager/disk_device_manager.cpp
+++ b/src/kernel/core/disk_device_manager/disk_device_manager.cpp
@@ -184,7 +184,7 @@ find_disk_system(const char *name)
 {
 	KDiskDeviceManager *manager = KDiskDeviceManager::Default();
 	if (ManagerLocker locker = manager) {
-		if (KDiskSystem *diskSystem = manager->DiskSystemWithName(name))
+		if (KDiskSystem *diskSystem = manager->FindDiskSystem(name))
 			return diskSystem->ID();
 	}
 	return -1;