Index: uspace/drv/ohci/batch.c
===================================================================
--- uspace/drv/ohci/batch.c	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/batch.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -58,5 +58,5 @@
     usbhc_iface_transfer_out_callback_t func_out,
 		void *arg,
-		device_keeper_t *manager
+		usb_device_keeper_t *manager
 		)
 {
Index: uspace/drv/ohci/batch.h
===================================================================
--- uspace/drv/ohci/batch.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/batch.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -54,5 +54,5 @@
     usbhc_iface_transfer_out_callback_t func_out,
 		void *arg,
-		device_keeper_t *manager
+		usb_device_keeper_t *manager
 		);
 
Index: uspace/drv/ohci/hc.c
===================================================================
--- uspace/drv/ohci/hc.c	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/hc.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -65,5 +65,5 @@
 	}
 	instance->ddf_instance = fun;
-	device_keeper_init(&instance->manager);
+	usb_device_keeper_init(&instance->manager);
 
 
Index: uspace/drv/ohci/hc.h
===================================================================
--- uspace/drv/ohci/hc.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/hc.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -53,5 +53,5 @@
 	rh_t rh;
 	ddf_fun_t *ddf_instance;
-	device_keeper_t manager;
+	usb_device_keeper_t manager;
 } hc_t;
 
Index: uspace/drv/ohci/iface.c
===================================================================
--- uspace/drv/ohci/iface.c	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/iface.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -64,5 +64,5 @@
   assert(hc);
   usb_log_debug("Default address request with speed %d.\n", speed);
-  device_keeper_reserve_default(&hc->manager, speed);
+  usb_device_keeper_reserve_default_address(&hc->manager, speed);
   return EOK;
 }
@@ -79,5 +79,5 @@
   assert(hc);
   usb_log_debug("Default address release.\n");
-  device_keeper_release_default(&hc->manager);
+  usb_device_keeper_release_default_address(&hc->manager);
   return EOK;
 }
@@ -99,5 +99,5 @@
 
   usb_log_debug("Address request with speed %d.\n", speed);
-  *address = device_keeper_request(&hc->manager, speed);
+  *address = device_keeper_get_free_address(&hc->manager, speed);
   usb_log_debug("Address request with result: %d.\n", *address);
   if (*address <= 0)
@@ -120,5 +120,5 @@
   assert(hc);
   usb_log_debug("Address bind %d-%d.\n", address, handle);
-  device_keeper_bind(&hc->manager, address, handle);
+  usb_device_keeper_bind(&hc->manager, address, handle);
   return EOK;
 }
@@ -136,5 +136,5 @@
   assert(hc);
   usb_log_debug("Address release %d.\n", address);
-  device_keeper_release(&hc->manager, address);
+  usb_device_keeper_release(&hc->manager, address);
   return EOK;
 }
@@ -200,5 +200,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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",
@@ -243,5 +243,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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);
@@ -285,5 +285,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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",
@@ -329,5 +329,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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);
@@ -376,5 +376,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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);
@@ -388,5 +388,5 @@
   if (!batch)
     return ENOMEM;
-  device_keeper_reset_if_need(&hc->manager, target, setup_data);
+  usb_device_keeper_reset_if_need(&hc->manager, target, setup_data);
   batch_control_write(batch);
   const int ret = hc_schedule(hc, batch);
@@ -427,5 +427,5 @@
   hc_t *hc = fun_to_hc(fun);
   assert(hc);
-  usb_speed_t speed = device_keeper_speed(&hc->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",
Index: uspace/drv/ohci/main.c
===================================================================
--- uspace/drv/ohci/main.c	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/ohci/main.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -61,6 +61,6 @@
 {
 	assert(fun);
-	device_keeper_t *manager = &fun_to_hc(fun)->manager;
-  usb_address_t addr = device_keeper_find(manager, handle);
+	usb_device_keeper_t *manager = &fun_to_hc(fun)->manager;
+  usb_address_t addr = usb_device_keeper_find(manager, handle);
   if (addr < 0) {
     return addr;