Index: uspace/lib/usbdev/include/usb/dev/driver.h
===================================================================
--- uspace/lib/usbdev/include/usb/dev/driver.h	(revision 25696fead2f82e3c4923516a5d7d80ffe0dd3e7a)
+++ uspace/lib/usbdev/include/usb/dev/driver.h	(revision 22ceff3a80ac18ff36c3836ced4e7fe4470aca56)
@@ -156,5 +156,5 @@
 \endcode
 	 */
-	usb_endpoint_description_t **endpoints;
+	const usb_endpoint_description_t **endpoints;
 	/** Driver ops. */
 	const usb_driver_ops_t *ops;
@@ -164,13 +164,14 @@
 
 int usb_device_select_interface(usb_device_t *, uint8_t,
-    usb_endpoint_description_t **);
+    const usb_endpoint_description_t **);
 
 int usb_device_retrieve_descriptors(usb_pipe_t *, usb_device_descriptors_t *);
 int usb_device_create_pipes(const ddf_dev_t *, usb_device_connection_t *,
-    usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
+    const usb_endpoint_description_t **, const uint8_t *, size_t, int, int,
     usb_endpoint_mapping_t **, size_t *);
 int usb_device_destroy_pipes(const ddf_dev_t *, usb_endpoint_mapping_t *, size_t);
-int usb_device_create(ddf_dev_t *, usb_endpoint_description_t **, usb_device_t **, const char **);
-void usb_device_destroy(usb_device_t *);
+int usb_device_create(ddf_dev_t *, const usb_endpoint_description_t **,
+    usb_device_t **, const char **);
+void usb_device_deinit(usb_device_t *);
 void * usb_device_data_alloc(usb_device_t *, size_t);
 
Index: uspace/lib/usbdev/src/devdrv.c
===================================================================
--- uspace/lib/usbdev/src/devdrv.c	(revision 25696fead2f82e3c4923516a5d7d80ffe0dd3e7a)
+++ uspace/lib/usbdev/src/devdrv.c	(revision 22ceff3a80ac18ff36c3836ced4e7fe4470aca56)
@@ -81,5 +81,5 @@
  * @return Number of pipes (excluding default control pipe).
  */
-static size_t count_other_pipes(usb_endpoint_description_t **endpoints)
+static size_t count_other_pipes(const usb_endpoint_description_t **endpoints)
 {
 	size_t count = 0;
@@ -101,5 +101,5 @@
  * @return Error code.
  */
-static int initialize_other_pipes(usb_endpoint_description_t **endpoints,
+static int initialize_other_pipes(const usb_endpoint_description_t **endpoints,
     usb_device_t *dev, int alternate_setting)
 {
@@ -154,5 +154,5 @@
 	rc = driver->ops->device_add(dev);
 	if (rc != EOK)
-		usb_device_destroy(dev);
+		usb_device_deinit(dev);
 	return rc;
 }
@@ -191,5 +191,5 @@
 	const int ret = driver->ops->device_gone(usb_dev);
 	if (ret == EOK)
-		usb_device_destroy(usb_dev);
+		usb_device_deinit(usb_dev);
 
 	return ret;
@@ -238,5 +238,5 @@
  */
 int usb_device_select_interface(usb_device_t *dev, uint8_t alternate_setting,
-    usb_endpoint_description_t **endpoints)
+    const usb_endpoint_description_t **endpoints)
 {
 	if (dev->interface_no < 0) {
@@ -321,5 +321,5 @@
  */
 int usb_device_create_pipes(const ddf_dev_t *dev, usb_device_connection_t *wire,
-    usb_endpoint_description_t **endpoints,
+    const usb_endpoint_description_t **endpoints,
     const uint8_t *config_descr, size_t config_descr_size,
     int interface_no, int interface_setting,
@@ -526,5 +526,5 @@
  */
 int usb_device_create(ddf_dev_t *ddf_dev,
-    usb_endpoint_description_t **endpoints,
+    const usb_endpoint_description_t **endpoints,
     usb_device_t **dev_ptr, const char **errstr_ptr)
 {
@@ -590,7 +590,9 @@
 /** Destroy instance of a USB device.
  *
- * @param dev Device to be destroyed.
- */
-void usb_device_destroy(usb_device_t *dev)
+ * @param dev Device to be de-initialized.
+ *
+ * Does not free/destroy supplied pointer.
+ */
+void usb_device_deinit(usb_device_t *dev)
 {
 	if (dev == NULL) {
Index: uspace/lib/usbhid/include/usb/hid/hiddescriptor.h
===================================================================
--- uspace/lib/usbhid/include/usb/hid/hiddescriptor.h	(revision 25696fead2f82e3c4923516a5d7d80ffe0dd3e7a)
+++ uspace/lib/usbhid/include/usb/hid/hiddescriptor.h	(revision 22ceff3a80ac18ff36c3836ced4e7fe4470aca56)
@@ -42,12 +42,12 @@
 #include <usb/hid/hidtypes.h>
 
-int usb_hid_parse_report_descriptor(usb_hid_report_t *report, 
+int usb_hid_parse_report_descriptor(usb_hid_report_t *report,
 		const uint8_t *data, size_t size);
-
-void usb_hid_free_report(usb_hid_report_t *report);
 
 void usb_hid_descriptor_print(usb_hid_report_t *report);
 
 int usb_hid_report_init(usb_hid_report_t *report);
+
+void usb_hid_report_deinit(usb_hid_report_t *report);
 
 int usb_hid_report_append_fields(usb_hid_report_t *report,
Index: uspace/lib/usbhid/src/hiddescriptor.c
===================================================================
--- uspace/lib/usbhid/src/hiddescriptor.c	(revision 25696fead2f82e3c4923516a5d7d80ffe0dd3e7a)
+++ uspace/lib/usbhid/src/hiddescriptor.c	(revision 22ceff3a80ac18ff36c3836ced4e7fe4470aca56)
@@ -1016,5 +1016,5 @@
  * @return void
  */
-void usb_hid_free_report(usb_hid_report_t *report)
+void usb_hid_report_deinit(usb_hid_report_t *report)
 {
 	if(report == NULL){