Index: uspace/app/tester/hw/misc/virtchar1.c
===================================================================
--- uspace/app/tester/hw/misc/virtchar1.c	(revision 6118ccafe4554d379ec5acedeab74b2887a5dbe2)
+++ uspace/app/tester/hw/misc/virtchar1.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
@@ -79,5 +79,5 @@
 	size_t i;
 	char buffer[BUFFER_SIZE];
-	read_dev(phone, buffer, BUFFER_SIZE);
+	char_dev_read(phone, buffer, BUFFER_SIZE);
 	TPRINTF(" ...verifying that we read zeroes only...\n");
 	for (i = 0; i < BUFFER_SIZE; i++) {
Index: uspace/app/tester/hw/serial/serial1.c
===================================================================
--- uspace/app/tester/hw/serial/serial1.c	(revision 6118ccafe4554d379ec5acedeab74b2887a5dbe2)
+++ uspace/app/tester/hw/serial/serial1.c	(revision f724e82e9467af62ee9b9a530103c1be3d50e4ef)
@@ -121,5 +121,5 @@
 	size_t total = 0;
 	while (total < cnt) {
-		ssize_t read = read_dev(phone, buf, cnt - total);
+		ssize_t read = char_dev_read(phone, buf, cnt - total);
 		
 		if (read < 0) {
@@ -152,5 +152,5 @@
 			 * direction of data transfer.
 			 */
-			ssize_t written = write_dev(phone, buf, read);
+			ssize_t written = char_dev_write(phone, buf, read);
 			
 			if (written < 0) {
@@ -181,5 +181,5 @@
 	
 	size_t eot_size = str_size(EOT);
-	ssize_t written = write_dev(phone, (void *) EOT, eot_size);
+	ssize_t written = char_dev_write(phone, (void *) EOT, eot_size);
 	
 	ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,