Index: uspace/lib/drv/generic/driver.c
===================================================================
--- uspace/lib/drv/generic/driver.c	(revision 8871dba5729d36839c3aaeb2aa0f78bfac20d2a0)
+++ uspace/lib/drv/generic/driver.c	(revision d35ac1db915f076a3072db1fdc5f8c6a9f8d3dba)
@@ -140,5 +140,5 @@
 }
 
-static device_t * driver_get_device(link_t *devices, devman_handle_t handle)
+static device_t *driver_get_device(link_t *devices, devman_handle_t handle)
 {
 	device_t *dev = NULL;
@@ -164,7 +164,7 @@
 	int res = EOK;
 	
-	devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+	devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
     	devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
-    
+	
 	device_t *dev = create_device();
 	dev->handle = dev_handle;
@@ -177,5 +177,5 @@
 	
 	res = driver->driver_ops->add_device(dev);
-	if (0 == res) {
+	if (res == 0) {
 		printf("%s: new device with handle=%" PRIun " was added.\n",
 		    driver->name, dev_handle);
@@ -246,5 +246,5 @@
 		ret = (*dev->ops->open)(dev);
 	
-	ipc_answer_0(iid, ret);	
+	ipc_answer_0(iid, ret);
 	if (EOK != ret)
 		return;
@@ -258,5 +258,5 @@
 		
 		switch  (method) {
-		case IPC_M_PHONE_HUNGUP:		
+		case IPC_M_PHONE_HUNGUP:
 			/* close the device */
 			if (NULL != dev->ops && NULL != dev->ops->close)
@@ -264,5 +264,5 @@
 			ipc_answer_0(callid, EOK);
 			return;
-		default:		
+		default:
 			/* convert ipc interface id to interface index */
 			
@@ -289,7 +289,7 @@
 			/* calling one of the device's interfaces */
 			
-			/* get the device interface structure */
-			void *iface = device_get_iface(dev, iface_idx);
-			if (NULL == iface) {
+			/* Get the interface ops structure. */
+			void *ops = device_get_ops(dev, iface_idx);
+			if (ops == NULL) {
 				printf("%s: driver_connection_gen error - ",
 				    driver->name);
@@ -304,5 +304,5 @@
 			 * handling ("remote interface").
 			 */
-			remote_iface_t* rem_iface = get_remote_iface(iface_idx);
+			remote_iface_t *rem_iface = get_remote_iface(iface_idx);
 			assert(NULL != rem_iface);
 
@@ -325,5 +325,5 @@
 			 * associated with the device by its driver.
 			 */
-			(*iface_method_ptr)(dev, iface, callid, &call);
+			(*iface_method_ptr)(dev, ops, callid, &call);
 			break;
 		}
@@ -377,5 +377,5 @@
 	if (EOK == res)
 		return res;
-	remove_from_devices_list(child);	
+	remove_from_devices_list(child);
 	return res;
 }
Index: uspace/lib/drv/generic/remote_char_dev.c
===================================================================
--- uspace/lib/drv/generic/remote_char_dev.c	(revision 8871dba5729d36839c3aaeb2aa0f78bfac20d2a0)
+++ uspace/lib/drv/generic/remote_char_dev.c	(revision d35ac1db915f076a3072db1fdc5f8c6a9f8d3dba)
@@ -69,11 +69,11 @@
  *
  * @param dev		The device from which the data are read.
- * @param iface		The local interface structure.
+ * @param ops		The local ops structure.
  */
 static void
-remote_char_read(device_t *dev, void *iface, ipc_callid_t callid,
+remote_char_read(device_t *dev, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
-	char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
+	char_dev_ops_t *char_dev_ops = (char_dev_ops_t *) ops;
 	ipc_callid_t cid;
 	
@@ -85,5 +85,5 @@
 	}
 	
-	if (!char_iface->read) {
+	if (!char_dev_ops->read) {
 		async_data_read_finalize(cid, NULL, 0);
 		ipc_answer_0(callid, ENOTSUP);
@@ -95,5 +95,5 @@
 	
 	char buf[MAX_CHAR_RW_COUNT];
-	int ret = (*char_iface->read)(dev, buf, len);
+	int ret = (*char_dev_ops->read)(dev, buf, len);
 	
 	if (ret < 0) {
@@ -116,11 +116,11 @@
  *
  * @param dev		The device to which the data are written.
- * @param iface		The local interface structure.
+ * @param ops		The local ops structure.
  */
 static void
-remote_char_write(device_t *dev, void *iface, ipc_callid_t callid,
+remote_char_write(device_t *dev, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
-	char_dev_ops_t *char_iface = (char_dev_ops_t *) iface;
+	char_dev_ops_t *char_dev_ops = (char_dev_ops_t *) ops;
 	ipc_callid_t cid;
 	size_t len;
@@ -132,5 +132,5 @@
 	}
 	
-	if (!char_iface->write) {
+	if (!char_dev_ops->write) {
 		async_data_write_finalize(cid, NULL, 0);
 		ipc_answer_0(callid, ENOTSUP);
@@ -145,5 +145,5 @@
 	async_data_write_finalize(cid, buf, len);
 	
-	int ret = (*char_iface->write)(dev, buf, len);
+	int ret = (*char_dev_ops->write)(dev, buf, len);
 	if (ret < 0) {
 		/* Some error occured. */
Index: uspace/lib/drv/generic/remote_hw_res.c
===================================================================
--- uspace/lib/drv/generic/remote_hw_res.c	(revision 8871dba5729d36839c3aaeb2aa0f78bfac20d2a0)
+++ uspace/lib/drv/generic/remote_hw_res.c	(revision d35ac1db915f076a3072db1fdc5f8c6a9f8d3dba)
@@ -56,12 +56,12 @@
 };
 
-static void remote_res_enable_interrupt(device_t *dev, void *iface,
+static void remote_res_enable_interrupt(device_t *dev, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
-	hw_res_ops_t *ires = (hw_res_ops_t *) iface;
+	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
 	
-	if (NULL == ires->enable_interrupt)
+	if (hw_res_ops->enable_interrupt == NULL)
 		ipc_answer_0(callid, ENOTSUP);
-	else if (ires->enable_interrupt(dev))
+	else if (hw_res_ops->enable_interrupt(dev))
 		ipc_answer_0(callid, EOK);
 	else
@@ -69,14 +69,15 @@
 }
 
-static void remote_res_get_resource_list(device_t *dev, void *iface,
+static void remote_res_get_resource_list(device_t *dev, void *ops,
     ipc_callid_t callid, ipc_call_t *call)
 {
-	hw_res_ops_t *ires = (hw_res_ops_t *) iface;
-	if (NULL == ires->get_resource_list) {
+	hw_res_ops_t *hw_res_ops = (hw_res_ops_t *) ops;
+
+	if (hw_res_ops->get_resource_list == NULL) {
 		ipc_answer_0(callid, ENOTSUP);
 		return;
 	}
 	
-	hw_resource_list_t *hw_resources = ires->get_resource_list(dev);
+	hw_resource_list_t *hw_resources = hw_res_ops->get_resource_list(dev);
 	if (NULL == hw_resources){
 		ipc_answer_0(callid, ENOENT);
Index: uspace/lib/drv/include/driver.h
===================================================================
--- uspace/lib/drv/include/driver.h	(revision 8871dba5729d36839c3aaeb2aa0f78bfac20d2a0)
+++ uspace/lib/drv/include/driver.h	(revision d35ac1db915f076a3072db1fdc5f8c6a9f8d3dba)
@@ -188,8 +188,8 @@
 }
 
-static inline void *device_get_iface(device_t *dev, dev_inferface_idx_t idx)
+static inline void *device_get_ops(device_t *dev, dev_inferface_idx_t idx)
 {
 	assert(is_valid_iface_idx(idx));
-	if (NULL == dev->ops)
+	if (dev->ops == NULL)
 		return NULL;
 	return dev->ops->interfaces[idx];