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);