Index: uspace/drv/isa/isa.c
===================================================================
--- uspace/drv/isa/isa.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
+++ uspace/drv/isa/isa.c	(revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50)
@@ -51,5 +51,5 @@
 
 #include <driver.h>
-#include <resource.h>
+#include <hw_res.h>
 
 #include <devman.h>
@@ -84,5 +84,5 @@
 }
 
-static resource_iface_t isa_child_res_iface = {
+static hw_res_ops_t isa_child_hw_res_ops = {
 	&isa_get_child_resources,
 	&isa_enable_child_interrupt
@@ -502,5 +502,5 @@
 static void isa_init() 
 {
-	isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_res_iface;
+	isa_child_dev_ops.interfaces[HW_RES_DEV_IFACE] = &isa_child_hw_res_ops;
 }
 
Index: uspace/drv/ns8250/ns8250.c
===================================================================
--- uspace/drv/ns8250/ns8250.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
+++ uspace/drv/ns8250/ns8250.c	(revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50)
@@ -53,6 +53,5 @@
 
 #include <driver.h>
-#include <char.h>
-#include <resource.h>
+#include <char_dev.h>
 
 #include <devman.h>
@@ -227,5 +226,5 @@
 
 /** The character interface's callbacks. */
-static char_iface_t ns8250_char_iface = {
+static char_dev_ops_t ns8250_char_dev_ops = {
 	.read = &ns8250_read,
 	.write = &ns8250_write
@@ -924,5 +923,5 @@
 	ns8250_dev_ops.close = &ns8250_close;
 	
-	ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_iface;
+	ns8250_dev_ops.interfaces[CHAR_DEV_IFACE] = &ns8250_char_dev_ops;
 	ns8250_dev_ops.default_handler = &ns8250_default_handler;
 }
Index: uspace/drv/pciintel/pci.c
===================================================================
--- uspace/drv/pciintel/pci.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
+++ uspace/drv/pciintel/pci.c	(revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50)
@@ -49,5 +49,5 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <hw_res.h>
 #include <device/hw_res.h>
 #include <ddi.h>
@@ -77,5 +77,5 @@
 }
 
-static resource_iface_t pciintel_child_res_iface = {
+static hw_res_ops_t pciintel_child_hw_res_ops = {
 	&pciintel_get_child_resources,
 	&pciintel_enable_child_interrupt
@@ -515,5 +515,5 @@
 static void pciintel_init(void)
 {
-	pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_res_iface;
+	pci_child_ops.interfaces[HW_RES_DEV_IFACE] = &pciintel_child_hw_res_ops;
 }
 
Index: uspace/drv/rootpc/rootpc.c
===================================================================
--- uspace/drv/rootpc/rootpc.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
+++ uspace/drv/rootpc/rootpc.c	(revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50)
@@ -50,5 +50,5 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
-#include <resource.h>
+#include <hw_res.h>
 #include <device/hw_res.h>
 
@@ -107,5 +107,5 @@
 }
 
-static resource_iface_t child_res_iface = {
+static hw_res_ops_t child_hw_res_ops = {
 	&rootpc_get_child_resources,
 	&rootpc_enable_child_interrupt
@@ -190,5 +190,5 @@
 static void root_pc_init(void)
 {
-	rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_res_iface;
+	rootpc_child_ops.interfaces[HW_RES_DEV_IFACE] = &child_hw_res_ops;
 }
 
Index: uspace/drv/test1/char.c
===================================================================
--- uspace/drv/test1/char.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
+++ uspace/drv/test1/char.c	(revision 50c57df8cdb403dc8776199e522c2b5fcecbeb50)
@@ -33,5 +33,5 @@
 #include <errno.h>
 #include <mem.h>
-#include <char.h>
+#include <char_dev.h>
 
 #include "test1.h"
@@ -46,5 +46,5 @@
 }
 
-static char_iface_t char_interface = {
+static char_dev_ops_t char_dev_ops = {
 	.read = &impl_char_read,
 	.write = &imp_char_write
@@ -52,5 +52,5 @@
 
 device_ops_t char_device_ops = {
-	.interfaces[CHAR_DEV_IFACE] = &char_interface
+	.interfaces[CHAR_DEV_IFACE] = &char_dev_ops
 };