Index: kernel/genarch/src/drivers/dsrln/dsrlnout.c
===================================================================
--- kernel/genarch/src/drivers/dsrln/dsrlnout.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/dsrln/dsrlnout.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -49,5 +49,5 @@
 } dsrlnout_instance_t;
 
-static void dsrlnout_putchar(outdev_t *dev, const wchar_t ch)
+static void dsrlnout_putwchar(outdev_t *dev, const wchar_t ch)
 {
 	dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data;
@@ -62,5 +62,5 @@
 
 static outdev_operations_t dsrlndev_ops = {
-	.write = dsrlnout_putchar,
+	.write = dsrlnout_putwchar,
 	.redraw = NULL,
 	.scroll_up = NULL,
Index: kernel/genarch/src/drivers/ega/ega.c
===================================================================
--- kernel/genarch/src/drivers/ega/ega.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/ega/ega.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -72,9 +72,9 @@
 } ega_instance_t;
 
-static void ega_putchar(outdev_t *, wchar_t);
+static void ega_putwchar(outdev_t *, wchar_t);
 static void ega_redraw(outdev_t *);
 
 static outdev_operations_t egadev_ops = {
-	.write = ega_putchar,
+	.write = ega_putwchar,
 	.redraw = ega_redraw,
 	.scroll_up = NULL,
@@ -516,5 +516,5 @@
 }
 
-static void ega_display_char(ega_instance_t *instance, wchar_t ch)
+static void ega_display_wchar(ega_instance_t *instance, wchar_t ch)
 {
 	uint16_t index = ega_oem_glyph(ch);
@@ -539,5 +539,5 @@
 }
 
-static void ega_putchar(outdev_t *dev, wchar_t ch)
+static void ega_putwchar(outdev_t *dev, wchar_t ch)
 {
 	ega_instance_t *instance = (ega_instance_t *) dev->data;
@@ -559,5 +559,5 @@
 		break;
 	default:
-		ega_display_char(instance, ch);
+		ega_display_wchar(instance, ch);
 		instance->cursor++;
 		break;
Index: kernel/genarch/src/drivers/ns16550/ns16550.c
===================================================================
--- kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/ns16550/ns16550.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -92,5 +92,5 @@
 }
 
-static void ns16550_putchar(outdev_t *dev, wchar_t ch)
+static void ns16550_putwchar(outdev_t *dev, wchar_t ch)
 {
 	ns16550_instance_t *instance = (ns16550_instance_t *) dev->data;
@@ -105,5 +105,5 @@
 
 static outdev_operations_t ns16550_ops = {
-	.write = ns16550_putchar,
+	.write = ns16550_putwchar,
 	.redraw = NULL
 };
Index: kernel/genarch/src/drivers/omap/uart.c
===================================================================
--- kernel/genarch/src/drivers/omap/uart.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/omap/uart.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -49,5 +49,5 @@
 }
 
-static void omap_uart_putchar(outdev_t *dev, wchar_t ch)
+static void omap_uart_putwchar(outdev_t *dev, wchar_t ch)
 {
 	omap_uart_t *uart = dev->data;
@@ -62,5 +62,5 @@
 
 static outdev_operations_t omap_uart_ops = {
-	.write = omap_uart_putchar,
+	.write = omap_uart_putwchar,
 	.redraw = NULL,
 	.scroll_up = NULL,
Index: kernel/genarch/src/drivers/pl011/pl011.c
===================================================================
--- kernel/genarch/src/drivers/pl011/pl011.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/pl011/pl011.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -56,5 +56,5 @@
 }
 
-static void pl011_uart_putchar(outdev_t *dev, wchar_t ch)
+static void pl011_uart_putwchar(outdev_t *dev, wchar_t ch)
 {
 	pl011_uart_t *uart = dev->data;
@@ -70,5 +70,5 @@
 
 static outdev_operations_t pl011_uart_ops = {
-	.write = pl011_uart_putchar,
+	.write = pl011_uart_putwchar,
 	.redraw = NULL,
 	.scroll_up = NULL,
Index: kernel/genarch/src/drivers/s3c24xx/uart.c
===================================================================
--- kernel/genarch/src/drivers/s3c24xx/uart.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/drivers/s3c24xx/uart.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -61,5 +61,5 @@
 }
 
-static void s3c24xx_uart_putchar(outdev_t *dev, wchar_t ch)
+static void s3c24xx_uart_putwchar(outdev_t *dev, wchar_t ch)
 {
 	s3c24xx_uart_t *uart =
@@ -94,5 +94,5 @@
 
 static outdev_operations_t s3c24xx_uart_ops = {
-	.write = s3c24xx_uart_putchar,
+	.write = s3c24xx_uart_putwchar,
 	.redraw = NULL,
 	.scroll_up = NULL,
Index: kernel/genarch/src/fb/fb.c
===================================================================
--- kernel/genarch/src/fb/fb.c	(revision 904b1bc3e43b98f81bec9e9296b154371c383776)
+++ kernel/genarch/src/fb/fb.c	(revision 95faa4dec13caf69ef6b5a19e578aecba68ea63a)
@@ -122,5 +122,5 @@
 } fb_instance_t;
 
-static void fb_putchar(outdev_t *, wchar_t);
+static void fb_putwchar(outdev_t *, wchar_t);
 static void fb_redraw(outdev_t *);
 static void fb_scroll_up(outdev_t *);
@@ -128,5 +128,5 @@
 
 static outdev_operations_t fbdev_ops = {
-	.write = fb_putchar,
+	.write = fb_putwchar,
 	.redraw = fb_redraw,
 	.scroll_up = fb_scroll_up,
@@ -410,5 +410,5 @@
  *
  */
-static void fb_putchar(outdev_t *dev, wchar_t ch)
+static void fb_putwchar(outdev_t *dev, wchar_t ch)
 {
 	fb_instance_t *instance = (fb_instance_t *) dev->data;