Index: uspace/drv/uhci-hcd/hc.c
===================================================================
--- uspace/drv/uhci-hcd/hc.c	(revision 33fbe95ae55b7ade1c70254efd592f56ff337806)
+++ uspace/drv/uhci-hcd/hc.c	(revision 62ed5bc1bda7bdd1be1c735c399c3b3be035c1b1)
@@ -236,5 +236,5 @@
 
 	/* Init device keeper*/
-	usb_device_keeper_init(&instance->device_manager);
+	usb_device_keeper_init(&instance->manager);
 	usb_log_debug("Initialized device manager.\n");
 
Index: uspace/drv/uhci-hcd/hc.h
===================================================================
--- uspace/drv/uhci-hcd/hc.h	(revision 33fbe95ae55b7ade1c70254efd592f56ff337806)
+++ uspace/drv/uhci-hcd/hc.h	(revision 62ed5bc1bda7bdd1be1c735c399c3b3be035c1b1)
@@ -83,5 +83,5 @@
 
 typedef struct hc {
-	usb_device_keeper_t device_manager;
+	usb_device_keeper_t manager;
 
 	regs_t *registers;
Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision 33fbe95ae55b7ade1c70254efd592f56ff337806)
+++ uspace/drv/uhci-hcd/iface.c	(revision 62ed5bc1bda7bdd1be1c735c399c3b3be035c1b1)
@@ -55,5 +55,5 @@
 	assert(hc);
 	usb_log_debug("Default address request with speed %d.\n", speed);
-	usb_device_keeper_reserve_default_address(&hc->device_manager, speed);
+	usb_device_keeper_reserve_default_address(&hc->manager, speed);
 	return EOK;
 }
@@ -70,5 +70,5 @@
 	assert(hc);
 	usb_log_debug("Default address release.\n");
-	usb_device_keeper_release_default_address(&hc->device_manager);
+	usb_device_keeper_release_default_address(&hc->manager);
 	return EOK;
 }
@@ -90,5 +90,5 @@
 
 	usb_log_debug("Address request with speed %d.\n", speed);
-	*address = device_keeper_get_free_address(&hc->device_manager, speed);
+	*address = device_keeper_get_free_address(&hc->manager, speed);
 	usb_log_debug("Address request with result: %d.\n", *address);
 	if (*address <= 0)
@@ -111,5 +111,5 @@
 	assert(hc);
 	usb_log_debug("Address bind %d-%d.\n", address, handle);
-	usb_device_keeper_bind(&hc->device_manager, address, handle);
+	usb_device_keeper_bind(&hc->manager, address, handle);
 	return EOK;
 }
@@ -127,5 +127,5 @@
 	assert(hc);
 	usb_log_debug("Address release %d.\n", address);
-	usb_device_keeper_release(&hc->device_manager, address);
+	usb_device_keeper_release(&hc->manager, address);
 	return EOK;
 }
@@ -149,5 +149,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
 	usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
@@ -156,5 +156,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
 	    max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
-	    &hc->device_manager);
+	    &hc->manager);
 	if (!batch)
 		return ENOMEM;
@@ -186,5 +186,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 	usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
 	    target.address, target.endpoint, size, max_packet_size);
@@ -192,5 +192,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_INTERRUPT,
 	    max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
-			&hc->device_manager);
+			&hc->manager);
 	if (!batch)
 		return ENOMEM;
@@ -222,5 +222,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
 	usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
@@ -229,5 +229,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
 	    max_packet_size, speed, data, size, NULL, 0, NULL, callback, arg,
-	    &hc->device_manager);
+	    &hc->manager);
 	if (!batch)
 		return ENOMEM;
@@ -259,5 +259,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 	usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
 	    target.address, target.endpoint, size, max_packet_size);
@@ -265,5 +265,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_BULK,
 	    max_packet_size, speed, data, size, NULL, 0, callback, NULL, arg,
-	    &hc->device_manager);
+	    &hc->manager);
 	if (!batch)
 		return ENOMEM;
@@ -298,5 +298,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 	usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
 	    speed, target.address, target.endpoint, size, max_packet_size);
@@ -307,8 +307,8 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
 	    max_packet_size, speed, data, size, setup_data, setup_size,
-	    NULL, callback, arg, &hc->device_manager);
-	if (!batch)
-		return ENOMEM;
-	usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
+	    NULL, callback, arg, &hc->manager);
+	if (!batch)
+		return ENOMEM;
+	usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
 	batch_control_write(batch);
 	const int ret = hc_schedule(hc, batch);
@@ -341,5 +341,5 @@
 	hc_t *hc = fun_to_hc(fun);
 	assert(hc);
-	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->manager, target.address);
 
 	usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
@@ -347,5 +347,5 @@
 	usb_transfer_batch_t *batch = batch_get(fun, target, USB_TRANSFER_CONTROL,
 	    max_packet_size, speed, data, size, setup_data, setup_size, callback,
-	    NULL, arg, &hc->device_manager);
+	    NULL, arg, &hc->manager);
 	if (!batch)
 		return ENOMEM;
Index: uspace/drv/uhci-hcd/uhci.c
===================================================================
--- uspace/drv/uhci-hcd/uhci.c	(revision 33fbe95ae55b7ade1c70254efd592f56ff337806)
+++ uspace/drv/uhci-hcd/uhci.c	(revision 62ed5bc1bda7bdd1be1c735c399c3b3be035c1b1)
@@ -70,5 +70,5 @@
 {
 	assert(fun);
-	usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
+	usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.manager;
 
 	usb_address_t addr = usb_device_keeper_find(manager, handle);