Index: uspace/lib/usb/include/usb/pipes.h
===================================================================
--- uspace/lib/usb/include/usb/pipes.h	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
+++ uspace/lib/usb/include/usb/pipes.h	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
@@ -125,26 +125,24 @@
 usb_address_t usb_device_get_assigned_address(devman_handle_t);
 
-int usb_endpoint_pipe_initialize(usb_pipe_t *,
-    usb_device_connection_t *,
+int usb_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_pipe_t *,
+int usb_pipe_initialize_default_control(usb_pipe_t *,
     usb_device_connection_t *);
-int usb_endpoint_pipe_probe_default_control(usb_pipe_t *);
-int usb_endpoint_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
+int usb_pipe_probe_default_control(usb_pipe_t *);
+int usb_pipe_initialize_from_configuration(usb_endpoint_mapping_t *,
     size_t, uint8_t *, size_t, usb_device_connection_t *);
-int usb_endpoint_pipe_register(usb_pipe_t *, unsigned int,
-    usb_hc_connection_t *);
-int usb_endpoint_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
+int usb_pipe_register(usb_pipe_t *, unsigned int, usb_hc_connection_t *);
+int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_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_pipe_start_session(usb_pipe_t *);
+int usb_pipe_end_session(usb_pipe_t *);
+bool usb_pipe_is_session_started(usb_pipe_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_pipe_read(usb_pipe_t *, void *, size_t, size_t *);
+int usb_pipe_write(usb_pipe_t *, void *, size_t);
 
-int usb_endpoint_pipe_control_read(usb_pipe_t *, void *, size_t,
+int usb_pipe_control_read(usb_pipe_t *, void *, size_t,
     void *, size_t, size_t *);
-int usb_endpoint_pipe_control_write(usb_pipe_t *, void *, size_t,
+int usb_pipe_control_write(usb_pipe_t *, void *, size_t,
     void *, size_t);