Index: uspace/lib/c/generic/device/char.c
===================================================================
--- uspace/lib/c/generic/device/char.c	(revision 0adddea8e047683851e1f1f1906641749c328226)
+++ uspace/lib/c/generic/device/char.c	(revision b2263e6a6a638f44495be72cf7ebf80ffb3394ab)
@@ -45,18 +45,14 @@
  * using its character interface.
  *
- * @param dev_phone Phone to the device.
- * @param buf       Buffer for the data read
- *                  from or written to the device.
- * @param len       Maximum length of the data to be
- *                  read or written.
- * @param read      Read from the device if true,
- *                  write to it otherwise.
+ * @param dev_phone	Phone to the device.
+ * @param buf		Buffer for the data read from or written to the device.
+ * @param size		Maximum size of data (in bytes) to be read or written.
+ * @param read		Read from the device if true, write to it otherwise.
  *
- * @return Non-negative number of bytes actually read
- *         from or written to the device on success,
- *         negative error number otherwise.
- *
+ * @return		Non-negative number of bytes actually read from or
+ *			written to the device on success, negative error number
+ *			otherwise.
  */
-static ssize_t rw_dev(int dev_phone, void *buf, size_t len, bool read)
+static ssize_t char_dev_rw(int dev_phone, void *buf, size_t size, bool read)
 {
 	async_serialize_start();
@@ -68,10 +64,10 @@
 	if (read) {
 		req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE),
-		    CHAR_READ_DEV, &answer);
-		ret = async_data_read_start(dev_phone, buf, len);
+		    CHAR_DEV_READ, &answer);
+		ret = async_data_read_start(dev_phone, buf, size);
 	} else {
 		req = async_send_1(dev_phone, DEV_IFACE_ID(CHAR_DEV_IFACE),
-		    CHAR_WRITE_DEV, &answer);
-		ret = async_data_write_start(dev_phone, buf, len);
+		    CHAR_DEV_WRITE, &answer);
+		ret = async_data_write_start(dev_phone, buf, size);
 	}
 	
@@ -96,36 +92,31 @@
 }
 
-/** Read from device using its character interface.
+/** Read from character device.
  *
- * @param dev_phone Phone to the device.
- * @param buf       Output buffer for the data
- *                  read from the device.
- * @param len       Maximum length of the data to be read.
+ * @param dev_phone	Phone to the device.
+ * @param buf		Output buffer for the data read from the device.
+ * @param size		Maximum size (in bytes) of the data to be read.
  *
- * @return Non-negative number of bytes actually read
- *         from the device on success, negative error
- *         number otherwise.
- *
+ * @return		Non-negative number of bytes actually read from the
+ *			device on success, negative error number otherwise.
  */
-ssize_t read_dev(int dev_phone, void *buf, size_t len)
+ssize_t char_dev_read(int dev_phone, void *buf, size_t size)
 {
-	return rw_dev(dev_phone, buf, len, true);
+	return char_dev_rw(dev_phone, buf, size, true);
 }
 
-/** Write to device using its character interface.
+/** Write to character device.
  *
- * @param dev_phone Phone to the device.
- * @param buf       Input buffer containg the data
- *                  to be written to the device.
- * @param len       Maximum length of the data to be written.
+ * @param dev_phone	Phone to the device.
+ * @param buf		Input buffer containg the data to be written to the
+ *			device.
+ * @param size		Maximum size (in bytes) of the data to be written.
  *
- * @return Non-negative number of bytes actually written
- *         to the device on success, negative error number
- *         otherwise.
- *
+ * @return		Non-negative number of bytes actually written to the
+ *			device on success, negative error number otherwise.
  */
-ssize_t write_dev(int dev_phone, void *buf, size_t len)
+ssize_t char_dev_write(int dev_phone, void *buf, size_t size)
 {
-	return rw_dev(dev_phone, buf, len, false);
+	return char_dev_rw(dev_phone, buf, size, false);
 }
 
Index: uspace/lib/c/include/device/char.h
===================================================================
--- uspace/lib/c/include/device/char.h	(revision 0adddea8e047683851e1f1f1906641749c328226)
+++ uspace/lib/c/include/device/char.h	(revision b2263e6a6a638f44495be72cf7ebf80ffb3394ab)
@@ -37,10 +37,10 @@
 
 typedef enum {
-	CHAR_READ_DEV = 0,
-	CHAR_WRITE_DEV
+	CHAR_DEV_READ = 0,
+	CHAR_DEV_WRITE
 } hw_res_funcs_t;
 
-ssize_t read_dev(int dev_phone, void *buf, size_t len);
-ssize_t write_dev(int dev_phone, void *buf, size_t len);
+ssize_t char_dev_read(int dev_phone, void *buf, size_t len);
+ssize_t char_dev_write(int dev_phone, void *buf, size_t len);
 
 #endif
Index: uspace/lib/c/include/ipc/dev_iface.h
===================================================================
--- uspace/lib/c/include/ipc/dev_iface.h	(revision 0adddea8e047683851e1f1f1906641749c328226)
+++ uspace/lib/c/include/ipc/dev_iface.h	(revision b2263e6a6a638f44495be72cf7ebf80ffb3394ab)
@@ -35,8 +35,7 @@
 #include <libarch/types.h>
 
-typedef enum {	
-	HW_RES_DEV_IFACE = 0,	
+typedef enum {
+	HW_RES_DEV_IFACE = 0,
 	CHAR_DEV_IFACE,
-	// TODO add more interfaces
 	DEV_IFACE_MAX
 } dev_inferface_idx_t;