Index: uspace/drv/usbhid/hiddev.c
===================================================================
--- uspace/drv/usbhid/hiddev.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
+++ uspace/drv/usbhid/hiddev.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
@@ -184,5 +184,5 @@
  *                     successfuly initialize the structure.
  *
- * @sa usb_endpoint_pipe_initialize_from_configuration(), 
+ * @sa usb_pipe_initialize_from_configuration(), 
  *     usbhid_dev_get_report_descriptor()
  */
@@ -218,5 +218,5 @@
 	};
 	
-	rc = usb_endpoint_pipe_initialize_from_configuration(
+	rc = usb_pipe_initialize_from_configuration(
 	    endpoint_mapping, 1, descriptors, descriptors_size,
 	    &hid_dev->wire);
@@ -359,6 +359,6 @@
  * @return Other value inherited from one of functions 
  *         usb_device_connection_initialize_from_device(),
- *         usb_endpoint_pipe_initialize_default_control(),
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_initialize_default_control(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usbhid_dev_process_descriptors().
  *
@@ -404,5 +404,5 @@
 	 * Initialize device pipes.
 	 */
-	rc = usb_endpoint_pipe_initialize_default_control(&hid_dev->ctrl_pipe,
+	rc = usb_pipe_initialize_default_control(&hid_dev->ctrl_pipe,
 	    &hid_dev->wire);
 	if (rc != EOK) {
@@ -411,5 +411,5 @@
 		return rc;
 	}
-	rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe);
+	rc = usb_pipe_probe_default_control(&hid_dev->ctrl_pipe);
 	if (rc != EOK) {
 		usb_log_error("Probing default control pipe failed: %s.\n",
@@ -430,5 +430,5 @@
 	 * Get descriptors, parse descriptors and save endpoints.
 	 */
-	rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (rc != EOK) {
 		usb_log_error("Failed to start session on the control pipe: %s"
@@ -440,5 +440,5 @@
 	if (rc != EOK) {
 		/* TODO: end session?? */
-		usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+		usb_pipe_end_session(&hid_dev->ctrl_pipe);
 		usb_log_error("Failed to process descriptors: %s.\n",
 		    str_error(rc));
@@ -446,5 +446,5 @@
 	}
 	
-	rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 	if (rc != EOK) {
 		usb_log_warning("Failed to start session on the control pipe: "
Index: uspace/drv/usbhid/hidreq.c
===================================================================
--- uspace/drv/usbhid/hidreq.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
+++ uspace/drv/usbhid/hidreq.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
@@ -57,5 +57,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -76,5 +76,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -92,5 +92,5 @@
 	    USB_HIDREQ_SET_REPORT, value, hid_dev->iface, buffer, buf_size);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
@@ -119,5 +119,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -137,5 +137,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -151,5 +151,5 @@
 	    USB_HIDREQ_SET_PROTOCOL, protocol, hid_dev->iface, NULL, 0);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
@@ -179,5 +179,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -197,5 +197,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -213,5 +213,5 @@
 	    USB_HIDREQ_SET_IDLE, value, hid_dev->iface, NULL, 0);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
@@ -244,5 +244,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -263,5 +263,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -280,5 +280,5 @@
 	    actual_size);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
@@ -307,5 +307,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -325,5 +325,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -342,5 +342,5 @@
 	    USB_HIDREQ_GET_PROTOCOL, 0, hid_dev->iface, buffer, 1, &actual_size);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
@@ -378,5 +378,5 @@
  * @retval EINVAL if no HID device is given.
  * @return Other value inherited from one of functions 
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usb_control_request_set().
  */
@@ -396,5 +396,5 @@
 	int rc, sess_rc;
 	
-	sess_rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
 	if (sess_rc != EOK) {
 		usb_log_warning("Failed to start a session: %s.\n",
@@ -415,5 +415,5 @@
 	    &actual_size);
 
-	sess_rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+	sess_rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
 
 	if (rc != EOK) {
Index: uspace/drv/usbhid/kbddev.c
===================================================================
--- uspace/drv/usbhid/kbddev.c	(revision a3726632dd6e6060c73878c60f6f3087c5bb4016)
+++ uspace/drv/usbhid/kbddev.c	(revision 3954a63bd87b69fbec5d8bc2146206516a2c83ea)
@@ -780,5 +780,5 @@
 
 	while (true) {
-		sess_rc = usb_endpoint_pipe_start_session(
+		sess_rc = usb_pipe_start_session(
 		    &kbd_dev->hid_dev->poll_pipe);
 		if (sess_rc != EOK) {
@@ -788,8 +788,8 @@
 		}
 
-		rc = usb_endpoint_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
+		rc = usb_pipe_read(&kbd_dev->hid_dev->poll_pipe, 
 		    buffer, BOOTP_BUFFER_SIZE, &actual_size);
 		
-		sess_rc = usb_endpoint_pipe_end_session(
+		sess_rc = usb_pipe_end_session(
 		    &kbd_dev->hid_dev->poll_pipe);