Index: uspace/drv/bus/usb/xhci/bus.c
===================================================================
--- uspace/drv/bus/usb/xhci/bus.c	(revision 0892663adc814c89139511bb2bea33fffe20ff46)
+++ uspace/drv/bus/usb/xhci/bus.c	(revision 9848c770a5d230b87ec6a67839bdefc5a227e495)
@@ -203,5 +203,5 @@
  * @return Error code.
  */
-static void device_remove(device_t *dev)
+static void device_gone(device_t *dev)
 {
 	int err;
@@ -369,5 +369,5 @@
 
 	.device_enumerate = device_enumerate,
-	.device_remove = device_remove,
+	.device_gone = device_gone,
 	.device_online = device_online,
 	.device_offline = device_offline,
Index: uspace/drv/bus/usb/xhci/rh.c
===================================================================
--- uspace/drv/bus/usb/xhci/rh.c	(revision 0892663adc814c89139511bb2bea33fffe20ff46)
+++ uspace/drv/bus/usb/xhci/rh.c	(revision 9848c770a5d230b87ec6a67839bdefc5a227e495)
@@ -206,5 +206,5 @@
 
 	/* Remove device from XHCI bus. */
-	bus_device_remove(&dev->base);
+	bus_device_gone(&dev->base);
 
 	return EOK;
Index: uspace/lib/usbhost/include/usb/host/bus.h
===================================================================
--- uspace/lib/usbhost/include/usb/host/bus.h	(revision 0892663adc814c89139511bb2bea33fffe20ff46)
+++ uspace/lib/usbhost/include/usb/host/bus.h	(revision 9848c770a5d230b87ec6a67839bdefc5a227e495)
@@ -103,5 +103,5 @@
 	/* Operations on device */
 	int (*device_enumerate)(device_t *);
-	void (*device_remove)(device_t *);
+	void (*device_gone)(device_t *);
 	int (*device_online)(device_t *);			/**< Optional */
 	void (*device_offline)(device_t *);			/**< Optional */
@@ -149,5 +149,5 @@
 
 int bus_device_enumerate(device_t *);
-void bus_device_remove(device_t *);
+void bus_device_gone(device_t *);
 
 int bus_device_online(device_t *);
Index: uspace/lib/usbhost/src/bus.c
===================================================================
--- uspace/lib/usbhost/src/bus.c	(revision 0892663adc814c89139511bb2bea33fffe20ff46)
+++ uspace/lib/usbhost/src/bus.c	(revision 9848c770a5d230b87ec6a67839bdefc5a227e495)
@@ -167,5 +167,5 @@
 		 */
 		fibril_mutex_unlock(&dev->guard);
-		bus_device_remove(child);
+		bus_device_gone(child);
 		fibril_mutex_lock(&dev->guard);
 	}
@@ -176,10 +176,10 @@
  * Resolve a USB device that is gone.
  */
-void bus_device_remove(device_t *dev)
+void bus_device_gone(device_t *dev)
 {
 	assert(dev);
 	assert(dev->fun == NULL);
 
-	const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_remove);
+	const bus_ops_t *ops = BUS_OPS_LOOKUP(dev->bus->ops, device_gone);
 	assert(ops);
 
@@ -212,5 +212,5 @@
 
 	/* Tell the HC to release its resources. */
-	ops->device_remove(dev);
+	ops->device_gone(dev);
 
 	/* Release the EP0 bus reference */
Index: uspace/lib/usbhost/src/ddf_helpers.c
===================================================================
--- uspace/lib/usbhost/src/ddf_helpers.c	(revision 0892663adc814c89139511bb2bea33fffe20ff46)
+++ uspace/lib/usbhost/src/ddf_helpers.c	(revision 9848c770a5d230b87ec6a67839bdefc5a227e495)
@@ -354,5 +354,5 @@
 	assert(victim->hub == hub);
 
-	bus_device_remove(victim);
+	bus_device_gone(victim);
 	return EOK;
 }