Index: uspace/drv/usbhid/hiddev.h
===================================================================
--- uspace/drv/usbhid/hiddev.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/usbhid/hiddev.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -68,7 +68,7 @@
 	usb_device_connection_t wire;
 	/** USB pipe corresponding to the default Control endpoint. */
-	usb_endpoint_pipe_t ctrl_pipe;
+	usb_pipe_t ctrl_pipe;
 	/** USB pipe corresponding to the Interrupt In (polling) pipe. */
-	usb_endpoint_pipe_t poll_pipe;
+	usb_pipe_t poll_pipe;
 	
 	/** Polling interval retreived from the Interface descriptor. */
Index: uspace/drv/usbhub/usbhub.c
===================================================================
--- uspace/drv/usbhub/usbhub.c	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/usbhub/usbhub.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -354,5 +354,5 @@
 	}
 	//create connection to device
-	usb_endpoint_pipe_t new_device_pipe;
+	usb_pipe_t new_device_pipe;
 	usb_device_connection_t new_device_connection;
 	usb_device_connection_initialize_on_default_address(
@@ -488,5 +488,5 @@
 	usb_log_debug("interrupt at port %d\n", port);
 	//determine type of change
-	usb_endpoint_pipe_t *pipe = hub->control_pipe;
+	usb_pipe_t *pipe = hub->control_pipe;
 	
 	int opResult;
Index: uspace/drv/usbhub/usbhub.h
===================================================================
--- uspace/drv/usbhub/usbhub.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/usbhub/usbhub.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -58,6 +58,6 @@
 /* Hub endpoints. */
 /*typedef struct {
-        usb_endpoint_pipe_t control;
-        usb_endpoint_pipe_t status_change;
+        usb_pipe_t control;
+        usb_pipe_t status_change;
 } usb_hub_endpoints_t;
 */
@@ -88,5 +88,5 @@
 	 * searched again and again for the 'right pipe'.
 	 */
-	usb_endpoint_pipe_t * status_change_pipe;
+	usb_pipe_t * status_change_pipe;
 
 	/** convenience pointer to control pipe
@@ -96,5 +96,5 @@
 	 * searched again and again for the 'right pipe'.
 	 */
-	usb_endpoint_pipe_t * control_pipe;
+	usb_pipe_t * control_pipe;
 
 	/** generic usb device data*/
Index: uspace/drv/usbhub/usbhub_private.h
===================================================================
--- uspace/drv/usbhub/usbhub_private.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/usbhub/usbhub_private.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -95,5 +95,5 @@
  * @return Operation result
  */
-static inline int usb_hub_clear_port_feature(usb_endpoint_pipe_t *pipe,
+static inline int usb_hub_clear_port_feature(usb_pipe_t *pipe,
     int port_index,
     usb_hub_class_feature_t feature) {
Index: uspace/drv/usbmid/usbmid.h
===================================================================
--- uspace/drv/usbmid/usbmid.h	(revision 9078de8f0a6be74cfa097a346f41d6518d2cccb1)
+++ uspace/drv/usbmid/usbmid.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -52,5 +52,5 @@
 	usb_device_connection_t wire;
 	/** Default control pipe. */
-	usb_endpoint_pipe_t ctrl_pipe;
+	usb_pipe_t ctrl_pipe;
 } usbmid_device_t;