Index: uspace/lib/usb/include/usb/devdrv.h
===================================================================
--- uspace/lib/usb/include/usb/devdrv.h	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/include/usb/devdrv.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -41,5 +41,5 @@
 typedef struct {
 	/** The default control pipe. */
-	usb_endpoint_pipe_t ctrl_pipe;
+	usb_pipe_t ctrl_pipe;
 	/** Other endpoint pipes.
 	 * This is an array of other endpoint pipes in the same order as
Index: uspace/lib/usb/include/usb/pipes.h
===================================================================
--- uspace/lib/usb/include/usb/pipes.h	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/include/usb/pipes.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -80,5 +80,5 @@
 	 */
 	int hc_phone;
-} usb_endpoint_pipe_t;
+} usb_pipe_t;
 
 
@@ -102,5 +102,5 @@
 typedef struct {
 	/** Endpoint pipe. */
-	usb_endpoint_pipe_t *pipe;
+	usb_pipe_t *pipe;
 	/** Endpoint description. */
 	const usb_endpoint_description_t *description;
@@ -125,26 +125,26 @@
 usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
-int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *,
+int usb_endpoint_pipe_initialize(usb_pipe_t *,
     usb_device_connection_t *,
     usb_endpoint_t, usb_transfer_type_t, size_t, usb_direction_t);
-int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *,
+int usb_endpoint_pipe_initialize_default_control(usb_pipe_t *,
     usb_device_connection_t *);
-int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *);
+int usb_endpoint_pipe_probe_default_control(usb_pipe_t *);
 int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-int usb_endpoint_pipe_register(usb_endpoint_pipe_t *, unsigned int,
+int usb_endpoint_pipe_register(usb_pipe_t *, unsigned int,
     usb_hc_connection_t *);
-int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *, usb_hc_connection_t *);
+int usb_endpoint_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
 
-int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *);
-int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *);
-bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *);
+int usb_endpoint_pipe_start_session(usb_pipe_t *);
+int usb_endpoint_pipe_end_session(usb_pipe_t *);
+bool usb_endpoint_pipe_is_session_started(usb_pipe_t *);
 
-int usb_endpoint_pipe_read(usb_endpoint_pipe_t *, void *, size_t, size_t *);
-int usb_endpoint_pipe_write(usb_endpoint_pipe_t *, void *, size_t);
+int usb_endpoint_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
+int usb_endpoint_pipe_write(usb_pipe_t *, void *, size_t);
 
-int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *, void *, size_t,
+int usb_endpoint_pipe_control_read(usb_pipe_t *, void *, size_t,
     void *, size_t, size_t *);
-int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *, void *, size_t,
+int usb_endpoint_pipe_control_write(usb_pipe_t *, void *, size_t,
     void *, size_t);
 
Index: uspace/lib/usb/include/usb/recognise.h
===================================================================
--- uspace/lib/usb/include/usb/recognise.h	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/include/usb/recognise.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -48,5 +48,5 @@
     const usb_standard_interface_descriptor_t *, match_id_list_t *);
 
-int usb_device_create_match_ids(usb_endpoint_pipe_t *, match_id_list_t *);
+int usb_device_create_match_ids(usb_pipe_t *, match_id_list_t *);
 
 int usb_device_register_child_in_devman(usb_address_t, devman_handle_t,
Index: uspace/lib/usb/include/usb/request.h
===================================================================
--- uspace/lib/usb/include/usb/request.h	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/include/usb/request.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -86,42 +86,42 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int usb_control_request_set(usb_endpoint_pipe_t *,
+int usb_control_request_set(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, void *, size_t);
 
-int usb_control_request_get(usb_endpoint_pipe_t *,
+int usb_control_request_get(usb_pipe_t *,
     usb_request_type_t, usb_request_recipient_t, uint8_t,
     uint16_t, uint16_t, void *, size_t, size_t *);
 
-int usb_request_get_status(usb_endpoint_pipe_t *, usb_request_recipient_t,
+int usb_request_get_status(usb_pipe_t *, usb_request_recipient_t,
     uint16_t, uint16_t *);
-int usb_request_clear_feature(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_clear_feature(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint16_t, uint16_t);
-int usb_request_set_feature(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_set_feature(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint16_t, uint16_t);
-int usb_request_set_address(usb_endpoint_pipe_t *, usb_address_t);
-int usb_request_get_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_set_address(usb_pipe_t *, usb_address_t);
+int usb_request_get_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t, 
     size_t *);
-int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_get_descriptor_alloc(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void **, size_t *);
-int usb_request_get_device_descriptor(usb_endpoint_pipe_t *,
+int usb_request_get_device_descriptor(usb_pipe_t *,
     usb_standard_device_descriptor_t *);
-int usb_request_get_bare_configuration_descriptor(usb_endpoint_pipe_t *, int,
+int usb_request_get_bare_configuration_descriptor(usb_pipe_t *, int,
     usb_standard_configuration_descriptor_t *);
-int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *, int,
+int usb_request_get_full_configuration_descriptor(usb_pipe_t *, int,
     void *, size_t, size_t *);
-int usb_request_get_full_configuration_descriptor_alloc(usb_endpoint_pipe_t *,
+int usb_request_get_full_configuration_descriptor_alloc(usb_pipe_t *,
     int, void **, size_t *);
-int usb_request_set_descriptor(usb_endpoint_pipe_t *, usb_request_type_t,
+int usb_request_set_descriptor(usb_pipe_t *, usb_request_type_t,
     usb_request_recipient_t, uint8_t, uint8_t, uint16_t, void *, size_t);
-int usb_request_get_configuration(usb_endpoint_pipe_t *, uint8_t *);
-int usb_request_set_configuration(usb_endpoint_pipe_t *, uint8_t);
-int usb_request_get_interface(usb_endpoint_pipe_t *, uint8_t, uint8_t *);
-int usb_request_set_interface(usb_endpoint_pipe_t *, uint8_t, uint8_t);
+int usb_request_get_configuration(usb_pipe_t *, uint8_t *);
+int usb_request_set_configuration(usb_pipe_t *, uint8_t);
+int usb_request_get_interface(usb_pipe_t *, uint8_t, uint8_t *);
+int usb_request_set_interface(usb_pipe_t *, uint8_t, uint8_t);
 
-int usb_request_get_supported_languages(usb_endpoint_pipe_t *,
+int usb_request_get_supported_languages(usb_pipe_t *,
     l18_win_locales_t **, size_t *);
-int usb_request_get_string(usb_endpoint_pipe_t *, size_t, l18_win_locales_t,
+int usb_request_get_string(usb_pipe_t *, size_t, l18_win_locales_t,
     char **);