Index: uspace/drv/uhci-hcd/batch.c
===================================================================
--- uspace/drv/uhci-hcd/batch.c	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/batch.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -50,5 +50,5 @@
 	td_t *tds;
 	size_t packets;
-	device_keeper_t *manager;
+	usb_device_keeper_t *manager;
 } uhci_batch_t;
 
@@ -88,5 +88,5 @@
     usbhc_iface_transfer_in_callback_t func_in,
     usbhc_iface_transfer_out_callback_t func_out, void *arg,
-    device_keeper_t *manager
+    usb_device_keeper_t *manager
     )
 {
@@ -182,5 +182,5 @@
 			td_print_status(&data->tds[i]);
 
-			device_keeper_set_toggle(data->manager,
+			usb_device_keeper_set_toggle(data->manager,
 			    instance->target, instance->direction,
 			    td_toggle(&data->tds[i]));
@@ -311,5 +311,5 @@
 
 	const bool low_speed = instance->speed == USB_SPEED_LOW;
-	int toggle = device_keeper_get_toggle(
+	int toggle = usb_device_keeper_get_toggle(
 	    data->manager, instance->target, instance->direction);
 	assert(toggle == 0 || toggle == 1);
@@ -343,5 +343,5 @@
 	}
 	td_set_ioc(&data->tds[packet - 1]);
-	device_keeper_set_toggle(data->manager, instance->target,
+	usb_device_keeper_set_toggle(data->manager, instance->target,
 	    instance->direction, toggle);
 }
Index: uspace/drv/uhci-hcd/batch.h
===================================================================
--- uspace/drv/uhci-hcd/batch.h	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/batch.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -57,5 +57,5 @@
     usbhc_iface_transfer_out_callback_t func_out,
 		void *arg,
-		device_keeper_t *manager
+		usb_device_keeper_t *manager
 		);
 
Index: uspace/drv/uhci-hcd/iface.c
===================================================================
--- uspace/drv/uhci-hcd/iface.c	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/iface.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -55,5 +55,5 @@
 	assert(hc);
 	usb_log_debug("Default address request with speed %d.\n", speed);
-	device_keeper_reserve_default(&hc->device_manager, speed);
+	usb_device_keeper_reserve_default_address(&hc->device_manager, speed);
 	return EOK;
 }
@@ -70,5 +70,5 @@
 	assert(hc);
 	usb_log_debug("Default address release.\n");
-	device_keeper_release_default(&hc->device_manager);
+	usb_device_keeper_release_default_address(&hc->device_manager);
 	return EOK;
 }
@@ -90,5 +90,5 @@
 
 	usb_log_debug("Address request with speed %d.\n", speed);
-	*address = device_keeper_request(&hc->device_manager, speed);
+	*address = device_keeper_get_free_address(&hc->device_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);
-	device_keeper_bind(&hc->device_manager, address, handle);
+	usb_device_keeper_bind(&hc->device_manager, address, handle);
 	return EOK;
 }
@@ -127,5 +127,5 @@
 	assert(hc);
 	usb_log_debug("Address release %d.\n", address);
-	device_keeper_release(&hc->device_manager, address);
+	usb_device_keeper_release(&hc->device_manager, address);
 	return EOK;
 }
@@ -149,5 +149,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 
 	usb_log_debug("Interrupt OUT %d:%d %zu(%zu).\n",
@@ -186,5 +186,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 	usb_log_debug("Interrupt IN %d:%d %zu(%zu).\n",
 	    target.address, target.endpoint, size, max_packet_size);
@@ -222,5 +222,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 
 	usb_log_debug("Bulk OUT %d:%d %zu(%zu).\n",
@@ -259,5 +259,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 	usb_log_debug("Bulk IN %d:%d %zu(%zu).\n",
 	    target.address, target.endpoint, size, max_packet_size);
@@ -298,5 +298,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 	usb_log_debug("Control WRITE (%d) %d:%d %zu(%zu).\n",
 	    speed, target.address, target.endpoint, size, max_packet_size);
@@ -310,5 +310,5 @@
 	if (!batch)
 		return ENOMEM;
-	device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
+	usb_device_keeper_reset_if_need(&hc->device_manager, target, setup_data);
 	batch_control_write(batch);
 	const int ret = uhci_hc_schedule(hc, batch);
@@ -341,5 +341,5 @@
 	uhci_hc_t *hc = fun_to_uhci_hc(fun);
 	assert(hc);
-	usb_speed_t speed = device_keeper_speed(&hc->device_manager, target.address);
+	usb_speed_t speed = usb_device_keeper_get_speed(&hc->device_manager, target.address);
 
 	usb_log_debug("Control READ(%d) %d:%d %zu(%zu).\n",
Index: uspace/drv/uhci-hcd/uhci.c
===================================================================
--- uspace/drv/uhci-hcd/uhci.c	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/uhci.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -70,7 +70,7 @@
 {
 	assert(fun);
-	device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
-
-	usb_address_t addr = device_keeper_find(manager, handle);
+	usb_device_keeper_t *manager = &((uhci_t*)fun->dev->driver_data)->hc.device_manager;
+
+	usb_address_t addr = usb_device_keeper_find(manager, handle);
 	if (addr < 0) {
 		return addr;
Index: uspace/drv/uhci-hcd/uhci_hc.c
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.c	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/uhci_hc.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -234,5 +234,5 @@
 
 	/* Init device keeper*/
-	device_keeper_init(&instance->device_manager);
+	usb_device_keeper_init(&instance->device_manager);
 	usb_log_debug("Initialized device manager.\n");
 
Index: uspace/drv/uhci-hcd/uhci_hc.h
===================================================================
--- uspace/drv/uhci-hcd/uhci_hc.h	(revision c15070c233781cf449d1d8c725b9ef073a6039fe)
+++ uspace/drv/uhci-hcd/uhci_hc.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -83,5 +83,5 @@
 
 typedef struct uhci_hc {
-	device_keeper_t device_manager;
+	usb_device_keeper_t device_manager;
 
 	regs_t *registers;