Index: uspace/drv/bus/usb/vhc/connhost.c
===================================================================
--- uspace/drv/bus/usb/vhc/connhost.c	(revision e779bd3c5b8ec9106b912f1444caf1cdf6565058)
+++ uspace/drv/bus/usb/vhc/connhost.c	(revision 8b54fe65a364c1a1e5c214a700fc8d1bf4aed3e5)
@@ -62,6 +62,6 @@
 	VHC_DATA(vhc, fun);
 
-	usb_address_t addr = device_keeper_get_free_address(&vhc->dev_keeper,
-	    USB_SPEED_HIGH);
+	usb_address_t addr = usb_device_manager_get_free_address(
+	    &vhc->dev_manager, USB_SPEED_HIGH);
 	if (addr < 0) {
 		return addr;
@@ -88,5 +88,5 @@
 	usb_log_debug("Binding handle %" PRIun " to address %d.\n",
 	    handle, address);
-	usb_device_keeper_bind(&vhc->dev_keeper, address, handle);
+	usb_device_manager_bind(&vhc->dev_manager, address, handle);
 
 	return EOK;
@@ -105,5 +105,5 @@
 	VHC_DATA(vhc, fun);
 	bool found =
-	    usb_device_keeper_find_by_address(&vhc->dev_keeper, address, handle);
+	    usb_device_manager_find_by_address(&vhc->dev_manager, address, handle);
 	return found ? EOK : ENOENT;
 }
@@ -119,5 +119,5 @@
 	VHC_DATA(vhc, fun);
 	usb_log_debug("Releasing address %d...\n", address);
-	usb_device_keeper_release(&vhc->dev_keeper, address);
+	usb_device_manager_release(&vhc->dev_manager, address);
 
 	return ENOTSUP;
@@ -514,5 +514,5 @@
 
 	usb_log_debug("tell_address_rh(handle=%" PRIun ")\n", handle);
-	usb_address_t addr = usb_device_keeper_find(&vhc->dev_keeper, handle);
+	usb_address_t addr = usb_device_manager_find(&vhc->dev_manager, handle);
 	if (addr < 0) {
 		return addr;
Index: uspace/drv/bus/usb/vhc/main.c
===================================================================
--- uspace/drv/bus/usb/vhc/main.c	(revision e779bd3c5b8ec9106b912f1444caf1cdf6565058)
+++ uspace/drv/bus/usb/vhc/main.c	(revision 8b54fe65a364c1a1e5c214a700fc8d1bf4aed3e5)
@@ -80,5 +80,5 @@
 		return rc;
 	}
-	usb_device_keeper_init(&data->dev_keeper);
+	usb_device_manager_init(&data->dev_manager);
 
 	ddf_fun_t *hc = ddf_fun_create(dev, fun_exposed, "hc");
Index: uspace/drv/bus/usb/vhc/vhcd.h
===================================================================
--- uspace/drv/bus/usb/vhc/vhcd.h	(revision e779bd3c5b8ec9106b912f1444caf1cdf6565058)
+++ uspace/drv/bus/usb/vhc/vhcd.h	(revision 8b54fe65a364c1a1e5c214a700fc8d1bf4aed3e5)
@@ -39,5 +39,5 @@
 #include <usbvirt/device.h>
 #include <usb/host/usb_endpoint_manager.h>
-#include <usb/host/device_keeper.h>
+#include <usb/host/usb_device_manager.h>
 #include <usbhc_iface.h>
 #include <async.h>
@@ -60,5 +60,5 @@
 	fibril_mutex_t guard;
 	usb_endpoint_manager_t ep_manager;
-	usb_device_keeper_t dev_keeper;
+	usb_device_manager_t dev_manager;
 	usbvirt_device_t *hub;
 	ddf_fun_t *hc_fun;