Index: uspace/drv/ohci/batch.c
===================================================================
--- uspace/drv/ohci/batch.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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;
Index: uspace/drv/uhci-hcd/batch.c
===================================================================
--- uspace/drv/uhci-hcd/batch.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ 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;
Index: uspace/lib/usb/include/usb/host/device_keeper.h
===================================================================
--- uspace/lib/usb/include/usb/host/device_keeper.h	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ uspace/lib/usb/include/usb/host/device_keeper.h	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -48,41 +48,41 @@
 };
 
-typedef struct device_keeper {
+typedef struct {
 	struct usb_device_info devices[USB_ADDRESS_COUNT];
 	fibril_mutex_t guard;
 	fibril_condvar_t default_address_occupied;
 	usb_address_t last_address;
-} device_keeper_t;
+} usb_device_keeper_t;
 
-void device_keeper_init(device_keeper_t *instance);
+void usb_device_keeper_init(usb_device_keeper_t *instance);
 
-void device_keeper_reserve_default(
-    device_keeper_t *instance, usb_speed_t speed);
+void usb_device_keeper_reserve_default_address(
+    usb_device_keeper_t *instance, usb_speed_t speed);
 
-void device_keeper_release_default(device_keeper_t *instance);
+void usb_device_keeper_release_default_address(usb_device_keeper_t *instance);
 
-void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target,
+void usb_device_keeper_reset_if_need(
+    usb_device_keeper_t *instance, usb_target_t target,
     const unsigned char *setup_data);
 
-int device_keeper_get_toggle(
-    device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
+int usb_device_keeper_get_toggle(
+    usb_device_keeper_t *instance, usb_target_t target, usb_direction_t direction);
 
-int device_keeper_set_toggle(device_keeper_t *instance,
+int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
     usb_target_t target, usb_direction_t direction, bool toggle);
 
-usb_address_t device_keeper_request(
-    device_keeper_t *instance, usb_speed_t speed);
+usb_address_t device_keeper_get_free_address(
+    usb_device_keeper_t *instance, usb_speed_t speed);
 
-void device_keeper_bind(
-    device_keeper_t *instance, usb_address_t address, devman_handle_t handle);
+void usb_device_keeper_bind(
+    usb_device_keeper_t *instance, usb_address_t address, devman_handle_t handle);
 
-void device_keeper_release(device_keeper_t *instance, usb_address_t address);
+void usb_device_keeper_release(usb_device_keeper_t *instance, usb_address_t address);
 
-usb_address_t device_keeper_find(
-    device_keeper_t *instance, devman_handle_t handle);
+usb_address_t usb_device_keeper_find(
+    usb_device_keeper_t *instance, devman_handle_t handle);
 
-usb_speed_t device_keeper_speed(
-    device_keeper_t *instance, usb_address_t address);
+usb_speed_t usb_device_keeper_get_speed(
+    usb_device_keeper_t *instance, usb_address_t address);
 #endif
 /**
Index: uspace/lib/usb/src/host/device_keeper.c
===================================================================
--- uspace/lib/usb/src/host/device_keeper.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
+++ uspace/lib/usb/src/host/device_keeper.c	(revision 68b5ed6e84e44c178b95805a59943de5f34bddae)
@@ -45,5 +45,5 @@
  * Set all values to false/0.
  */
-void device_keeper_init(device_keeper_t *instance)
+void usb_device_keeper_init(usb_device_keeper_t *instance)
 {
 	assert(instance);
@@ -65,5 +65,5 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_reserve_default(device_keeper_t *instance, usb_speed_t speed)
+void usb_device_keeper_reserve_default_address(usb_device_keeper_t *instance, usb_speed_t speed)
 {
 	assert(instance);
@@ -83,5 +83,5 @@
  * @param[in] speed Speed of the device requesting default address.
  */
-void device_keeper_release_default(device_keeper_t *instance)
+void usb_device_keeper_release_default_address(usb_device_keeper_t *instance)
 {
 	assert(instance);
@@ -100,6 +100,6 @@
  * Really ugly one.
  */
-void device_keeper_reset_if_need(
-    device_keeper_t *instance, usb_target_t target, const unsigned char *data)
+void usb_device_keeper_reset_if_need(
+    usb_device_keeper_t *instance, usb_target_t target, const unsigned char *data)
 {
 	assert(instance);
@@ -144,6 +144,6 @@
  * @return Error code
  */
-int device_keeper_get_toggle(
-    device_keeper_t *instance, usb_target_t target, usb_direction_t direction)
+int usb_device_keeper_get_toggle(
+    usb_device_keeper_t *instance, usb_target_t target, usb_direction_t direction)
 {
 	assert(instance);
@@ -173,5 +173,5 @@
  * @return Error code.
  */
-int device_keeper_set_toggle(device_keeper_t *instance,
+int usb_device_keeper_set_toggle(usb_device_keeper_t *instance,
     usb_target_t target, usb_direction_t direction, bool toggle)
 {
@@ -207,6 +207,6 @@
  * @return Free address, or error code.
  */
-usb_address_t device_keeper_request(
-    device_keeper_t *instance, usb_speed_t speed)
+usb_address_t device_keeper_get_free_address(
+    usb_device_keeper_t *instance, usb_speed_t speed)
 {
 	assert(instance);
@@ -241,6 +241,6 @@
  * @param[in] handle Devman handle of the device.
  */
-void device_keeper_bind(
-    device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
+void usb_device_keeper_bind(
+    usb_device_keeper_t *instance, usb_address_t address, devman_handle_t handle)
 {
 	assert(instance);
@@ -258,5 +258,5 @@
  * @param[in] address Device address
  */
-void device_keeper_release(device_keeper_t *instance, usb_address_t address)
+void usb_device_keeper_release(usb_device_keeper_t *instance, usb_address_t address)
 {
 	assert(instance);
@@ -276,6 +276,6 @@
  * @return USB Address, or error code.
  */
-usb_address_t device_keeper_find(
-    device_keeper_t *instance, devman_handle_t handle)
+usb_address_t usb_device_keeper_find(
+    usb_device_keeper_t *instance, devman_handle_t handle)
 {
 	assert(instance);
@@ -299,6 +299,6 @@
  * @return USB speed.
  */
-usb_speed_t device_keeper_speed(
-    device_keeper_t *instance, usb_address_t address)
+usb_speed_t usb_device_keeper_get_speed(
+    usb_device_keeper_t *instance, usb_address_t address)
 {
 	assert(instance);