Index: uspace/lib/usb/src/devdrv.c
===================================================================
--- uspace/lib/usb/src/devdrv.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/devdrv.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -126,5 +126,5 @@
 
 	for (i = 0; i < pipe_count; i++) {
-		dev->pipes[i].pipe = malloc(sizeof(usb_endpoint_pipe_t));
+		dev->pipes[i].pipe = malloc(sizeof(usb_pipe_t));
 		if (dev->pipes[i].pipe == NULL) {
 			usb_log_oom(dev->ddf_dev);
Index: uspace/lib/usb/src/devpoll.c
===================================================================
--- uspace/lib/usb/src/devpoll.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/devpoll.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -64,5 +64,5 @@
 	assert(polling_data);
 
-	usb_endpoint_pipe_t *pipe
+	usb_pipe_t *pipe
 	    = polling_data->dev->pipes[polling_data->pipe_index].pipe;
 
Index: uspace/lib/usb/src/hub.c
===================================================================
--- uspace/lib/usb/src/hub.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/hub.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -228,5 +228,5 @@
 	}
 
-	usb_endpoint_pipe_t ctrl_pipe;
+	usb_pipe_t ctrl_pipe;
 	rc = usb_endpoint_pipe_initialize_default_control(&ctrl_pipe,
 	    &dev_conn);
Index: uspace/lib/usb/src/pipes.c
===================================================================
--- uspace/lib/usb/src/pipes.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/pipes.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -244,5 +244,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_start_session(usb_endpoint_pipe_t *pipe)
+int usb_endpoint_pipe_start_session(usb_pipe_t *pipe)
 {
 	assert(pipe);
@@ -270,5 +270,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_end_session(usb_endpoint_pipe_t *pipe)
+int usb_endpoint_pipe_end_session(usb_pipe_t *pipe)
 {
 	assert(pipe);
@@ -296,5 +296,5 @@
  * @return Whether @p pipe has opened a session.
  */
-bool usb_endpoint_pipe_is_session_started(usb_endpoint_pipe_t *pipe)
+bool usb_endpoint_pipe_is_session_started(usb_pipe_t *pipe)
 {
 	return (pipe->hc_phone >= 0);
Index: uspace/lib/usb/src/pipesinit.c
===================================================================
--- uspace/lib/usb/src/pipesinit.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/pipesinit.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -342,5 +342,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_initialize(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_initialize(usb_pipe_t *pipe,
     usb_device_connection_t *connection, usb_endpoint_t endpoint_no,
     usb_transfer_type_t transfer_type, size_t max_packet_size,
@@ -367,5 +367,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_initialize_default_control(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_initialize_default_control(usb_pipe_t *pipe,
     usb_device_connection_t *connection)
 {
@@ -390,5 +390,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_probe_default_control(usb_endpoint_pipe_t *pipe)
+int usb_endpoint_pipe_probe_default_control(usb_pipe_t *pipe)
 {
 	assert(pipe);
@@ -451,5 +451,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_register(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_register(usb_pipe_t *pipe,
     unsigned int interval,
     usb_hc_connection_t *hc_connection)
@@ -479,5 +479,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_unregister(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_unregister(usb_pipe_t *pipe,
     usb_hc_connection_t *hc_connection)
 {
Index: uspace/lib/usb/src/pipesio.c
===================================================================
--- uspace/lib/usb/src/pipesio.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/pipesio.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -58,5 +58,5 @@
  * @return Error code.
  */
-static int usb_endpoint_pipe_read_no_checks(usb_endpoint_pipe_t *pipe,
+static int usb_endpoint_pipe_read_no_checks(usb_pipe_t *pipe,
     void *buffer, size_t size, size_t *size_transfered)
 {
@@ -140,5 +140,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_read(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_read(usb_pipe_t *pipe,
     void *buffer, size_t size, size_t *size_transfered)
 {
@@ -190,5 +190,5 @@
  * @return Error code.
  */
-static int usb_endpoint_pipe_write_no_check(usb_endpoint_pipe_t *pipe,
+static int usb_endpoint_pipe_write_no_check(usb_pipe_t *pipe,
     void *buffer, size_t size)
 {
@@ -247,5 +247,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_write(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_write(usb_pipe_t *pipe,
     void *buffer, size_t size)
 {
@@ -289,5 +289,5 @@
  * @return Error code.
  */
-static int usb_endpoint_pipe_control_read_no_check(usb_endpoint_pipe_t *pipe,
+static int usb_endpoint_pipe_control_read_no_check(usb_pipe_t *pipe,
     void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
@@ -365,5 +365,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_control_read(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_control_read(usb_pipe_t *pipe,
     void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size, size_t *data_transfered_size)
@@ -414,5 +414,5 @@
  * @return Error code.
  */
-static int usb_endpoint_pipe_control_write_no_check(usb_endpoint_pipe_t *pipe,
+static int usb_endpoint_pipe_control_write_no_check(usb_pipe_t *pipe,
     void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size)
@@ -473,5 +473,5 @@
  * @return Error code.
  */
-int usb_endpoint_pipe_control_write(usb_endpoint_pipe_t *pipe,
+int usb_endpoint_pipe_control_write(usb_pipe_t *pipe,
     void *setup_buffer, size_t setup_buffer_size,
     void *data_buffer, size_t data_buffer_size)
Index: uspace/lib/usb/src/recognise.c
===================================================================
--- uspace/lib/usb/src/recognise.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/recognise.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -311,5 +311,5 @@
  * @return Error code.
  */
-int usb_device_create_match_ids(usb_endpoint_pipe_t *ctrl_pipe,
+int usb_device_create_match_ids(usb_pipe_t *ctrl_pipe,
     match_id_list_t *matches)
 {
@@ -363,5 +363,5 @@
 	int rc;
 	usb_device_connection_t dev_connection;
-	usb_endpoint_pipe_t ctrl_pipe;
+	usb_pipe_t ctrl_pipe;
 
 	rc = usb_device_connection_initialize(&dev_connection, hc_handle, address);
Index: uspace/lib/usb/src/request.c
===================================================================
--- uspace/lib/usb/src/request.c	(revision 925e099baaa3365ddc004f93328a357cdcac099d)
+++ uspace/lib/usb/src/request.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
@@ -60,5 +60,5 @@
  * @retval ERANGE Data buffer too large.
  */
-int usb_control_request_set(usb_endpoint_pipe_t *pipe,
+int usb_control_request_set(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t request,
@@ -120,5 +120,5 @@
   * @retval ERANGE Data buffer too large.
   */
-int usb_control_request_get(usb_endpoint_pipe_t *pipe,
+int usb_control_request_get(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t request,
@@ -165,5 +165,5 @@
  * @return Error code.
  */
-int usb_request_get_status(usb_endpoint_pipe_t *pipe,
+int usb_request_get_status(usb_pipe_t *pipe,
     usb_request_recipient_t recipient, uint16_t index,
     uint16_t *status)
@@ -203,5 +203,5 @@
  * @return Error code.
  */
-int usb_request_clear_feature(usb_endpoint_pipe_t *pipe,
+int usb_request_clear_feature(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint16_t feature_selector, uint16_t index)
@@ -231,5 +231,5 @@
  * @return Error code.
  */
-int usb_request_set_feature(usb_endpoint_pipe_t *pipe,
+int usb_request_set_feature(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint16_t feature_selector, uint16_t index)
@@ -258,5 +258,5 @@
  * @return Error code.
  */
-int usb_request_set_address(usb_endpoint_pipe_t *pipe,
+int usb_request_set_address(usb_pipe_t *pipe,
     usb_address_t new_address)
 {
@@ -297,5 +297,5 @@
  * @return Error code.
  */
-int usb_request_get_descriptor(usb_endpoint_pipe_t *pipe,
+int usb_request_get_descriptor(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -331,5 +331,5 @@
  * @return
  */
-int usb_request_get_descriptor_alloc(usb_endpoint_pipe_t * pipe,
+int usb_request_get_descriptor_alloc(usb_pipe_t * pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -400,5 +400,5 @@
  * @return Error code.
  */
-int usb_request_get_device_descriptor(usb_endpoint_pipe_t *pipe,
+int usb_request_get_device_descriptor(usb_pipe_t *pipe,
     usb_standard_device_descriptor_t *descriptor)
 {
@@ -442,5 +442,5 @@
  * @return Error code.
  */
-int usb_request_get_bare_configuration_descriptor(usb_endpoint_pipe_t *pipe,
+int usb_request_get_bare_configuration_descriptor(usb_pipe_t *pipe,
     int index, usb_standard_configuration_descriptor_t *descriptor)
 {
@@ -488,5 +488,5 @@
  * @return Error code.
  */
-int usb_request_get_full_configuration_descriptor(usb_endpoint_pipe_t *pipe,
+int usb_request_get_full_configuration_descriptor(usb_pipe_t *pipe,
     int index, void *descriptor, size_t descriptor_size, size_t *actual_size)
 {
@@ -514,5 +514,5 @@
  */
 int usb_request_get_full_configuration_descriptor_alloc(
-    usb_endpoint_pipe_t *pipe, int index,
+    usb_pipe_t *pipe, int index,
     void **descriptor_ptr, size_t *descriptor_size)
 {
@@ -578,5 +578,5 @@
  * @return Error code.
  */
-int usb_request_set_descriptor(usb_endpoint_pipe_t *pipe,
+int usb_request_set_descriptor(usb_pipe_t *pipe,
     usb_request_type_t request_type, usb_request_recipient_t recipient,
     uint8_t descriptor_type, uint8_t descriptor_index,
@@ -607,5 +607,5 @@
  * @return Error code.
  */
-int usb_request_get_configuration(usb_endpoint_pipe_t *pipe,
+int usb_request_get_configuration(usb_pipe_t *pipe,
     uint8_t *configuration_value)
 {
@@ -639,5 +639,5 @@
  * @return Error code.
  */
-int usb_request_set_configuration(usb_endpoint_pipe_t *pipe,
+int usb_request_set_configuration(usb_pipe_t *pipe,
     uint8_t configuration_value)
 {
@@ -658,5 +658,5 @@
  * @return Error code.
  */
-int usb_request_get_interface(usb_endpoint_pipe_t *pipe,
+int usb_request_get_interface(usb_pipe_t *pipe,
     uint8_t interface_index, uint8_t *alternate_setting)
 {
@@ -691,5 +691,5 @@
  * @return Error code.
  */
-int usb_request_set_interface(usb_endpoint_pipe_t *pipe,
+int usb_request_set_interface(usb_pipe_t *pipe,
     uint8_t interface_index, uint8_t alternate_setting)
 {
@@ -710,5 +710,5 @@
  * @return Error code.
  */
-int usb_request_get_supported_languages(usb_endpoint_pipe_t *pipe,
+int usb_request_get_supported_languages(usb_pipe_t *pipe,
     l18_win_locales_t **languages_ptr, size_t *languages_count)
 {
@@ -782,5 +782,5 @@
  * @return Error code.
  */
-int usb_request_get_string(usb_endpoint_pipe_t *pipe,
+int usb_request_get_string(usb_pipe_t *pipe,
     size_t index, l18_win_locales_t lang, char **string_ptr)
 {