diff --git a/headers/private/shared/AutoDeleterDrivers.h b/headers/private/shared/AutoDeleterDrivers.h
index 939fdaf4a0..b93e505188 100644
--- a/headers/private/shared/AutoDeleterDrivers.h
+++ b/headers/private/shared/AutoDeleterDrivers.h
@@ -26,7 +26,7 @@ typedef CObjectDeleter<void, status_t, unload_driver_settings>
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
 
 typedef CObjectDeleter<struct vnode, void, vfs_put_vnode> VnodePutter;
-typedef CObjectDeleter<file_descriptor, void, put_fd> DescriptorPutter;
+typedef CObjectDeleter<file_descriptor, void, put_fd> FileDescriptorPutter;
 typedef MethodDeleter<VMAddressSpace, void, &VMAddressSpace::Put>
 	VMAddressSpacePutter;
 
@@ -62,7 +62,7 @@ using ::BPrivate::DriverSettingsUnloader;
 #if defined(_KERNEL_MODE) && !defined(_BOOT_MODE)
 
 using ::BPrivate::VnodePutter;
-using ::BPrivate::DescriptorPutter;
+using ::BPrivate::FileDescriptorPutter;
 using ::BPrivate::VMAddressSpacePutter;
 using ::BPrivate::DeviceNodePutter;
 
diff --git a/src/system/kernel/events/event_queue.cpp b/src/system/kernel/events/event_queue.cpp
index b42aaf7432..f6658dea8b 100644
--- a/src/system/kernel/events/event_queue.cpp
+++ b/src/system/kernel/events/event_queue.cpp
@@ -658,7 +658,7 @@ _user_event_queue_select(int queue, event_wait_info* userInfos, int numInfos)
 
 	file_descriptor* descriptor;
 	GET_QUEUE_FD_OR_RETURN(queue, false, descriptor);
-	DescriptorPutter _(descriptor);
+	FileDescriptorPutter _(descriptor);
 
 	EventQueue* eventQueue = (EventQueue*)descriptor->u.queue;
 
@@ -711,7 +711,7 @@ _user_event_queue_wait(int queue, event_wait_info* userInfos, int numInfos,
 
 	file_descriptor* descriptor;
 	GET_QUEUE_FD_OR_RETURN(queue, false, descriptor);
-	DescriptorPutter _(descriptor);
+	FileDescriptorPutter _(descriptor);
 
 	EventQueue* eventQueue = (EventQueue*)descriptor->u.queue;
 
diff --git a/src/system/kernel/fs/fd.cpp b/src/system/kernel/fs/fd.cpp
index 880fb15d92..286a2453c7 100644
--- a/src/system/kernel/fs/fd.cpp
+++ b/src/system/kernel/fs/fd.cpp
@@ -499,7 +499,7 @@ dup_foreign_fd(team_id fromTeam, int fd, bool kernel)
 	file_descriptor* descriptor = get_fd(fromContext, fd);
 	if (descriptor == NULL)
 		return B_FILE_ERROR;
-	DescriptorPutter descriptorPutter(descriptor);
+	FileDescriptorPutter descriptorPutter(descriptor);
 
 	// create a new FD in the target I/O context
 	int result = new_fd(get_current_io_context(kernel), descriptor);
diff --git a/src/system/kernel/fs/vfs_request_io.cpp b/src/system/kernel/fs/vfs_request_io.cpp
index 264977f542..c8335244f6 100644
--- a/src/system/kernel/fs/vfs_request_io.cpp
+++ b/src/system/kernel/fs/vfs_request_io.cpp
@@ -479,7 +479,7 @@ do_fd_io(int fd, io_request* request)
 		return B_FILE_ERROR;
 	}
 
-	DescriptorPutter descriptorPutter(descriptor);
+	FileDescriptorPutter descriptorPutter(descriptor);
 
 	return vfs_vnode_io(vnode, descriptor->cookie, request);
 }
@@ -501,7 +501,7 @@ do_iterative_fd_io(int fd, io_request* request, iterative_io_get_vecs getVecs,
 		return B_FILE_ERROR;
 	}
 
-	DescriptorPutter descriptorPutter(descriptor);
+	FileDescriptorPutter descriptorPutter(descriptor);
 
 	if (!HAS_FS_CALL(vnode, io)) {
 		// no io() call -- fall back to synchronous I/O