diff --git a/headers/private/kernel/arch/arm/uart.h b/headers/private/kernel/arch/arm/uart.h
index 25685ed808..48004e45f5 100644
--- a/headers/private/kernel/arch/arm/uart.h
+++ b/headers/private/kernel/arch/arm/uart.h
@@ -26,8 +26,8 @@ struct uart_info {
 	void (*init)(addr_t base);
 	void (*init_early)(void);
 	void (*init_port)(addr_t base, uint baud);
-	int (*putc)(addr_t base, char c);
-	int (*getc)(addr_t base, bool wait);
+	int (*putchar)(addr_t base, char c);
+	int (*getchar)(addr_t base, bool wait);
 	void (*flush_tx)(addr_t base);
 	void (*flush_rx)(addr_t base);
 };
diff --git a/headers/private/kernel/arch/arm/uart_8250.h b/headers/private/kernel/arch/arm/uart_8250.h
index 97d6ae330d..be557e7bff 100644
--- a/headers/private/kernel/arch/arm/uart_8250.h
+++ b/headers/private/kernel/arch/arm/uart_8250.h
@@ -35,8 +35,8 @@ extern "C" {
 void uart_8250_init_port(addr_t base, uint baud);
 void uart_8250_init_early(void);
 void uart_8250_init(addr_t base);
-int uart_8250_putc(addr_t base, char c);
-int uart_8250_getc(addr_t base, bool wait);
+int uart_8250_putchar(addr_t base, char c);
+int uart_8250_getchar(addr_t base, bool wait);
 void uart_8250_flush_tx(addr_t base);
 void uart_8250_flush_rx(addr_t base);
 
diff --git a/src/system/boot/platform/raspberrypi_arm/serial.cpp b/src/system/boot/platform/raspberrypi_arm/serial.cpp
index 39d39fcf31..797d06395c 100644
--- a/src/system/boot/platform/raspberrypi_arm/serial.cpp
+++ b/src/system/boot/platform/raspberrypi_arm/serial.cpp
@@ -28,7 +28,7 @@ static void
 serial_putc(char c)
 {
 	if (gUARTInfo != NULL)
-		gUARTInfo->putc(gUARTInfo->base, c);
+		gUARTInfo->putchar(gUARTInfo->base, c);
 }
 
 
diff --git a/src/system/boot/platform/u-boot/serial.cpp b/src/system/boot/platform/u-boot/serial.cpp
index 49c86d751f..2fa59c2e62 100644
--- a/src/system/boot/platform/u-boot/serial.cpp
+++ b/src/system/boot/platform/u-boot/serial.cpp
@@ -26,7 +26,7 @@ static uint32 sBufferPosition;
 static void
 serial_putc(char c)
 {
-	gUARTInfo->putc(gUARTInfo->base, c);
+	gUARTInfo->putchar(gUARTInfo->base, c);
 }
 
 
diff --git a/src/system/kernel/arch/arm/arch_debug_console.cpp b/src/system/kernel/arch/arm/arch_debug_console.cpp
index f1933ea466..7e02347957 100644
--- a/src/system/kernel/arch/arm/arch_debug_console.cpp
+++ b/src/system/kernel/arch/arm/arch_debug_console.cpp
@@ -60,8 +60,8 @@ arch_debug_serial_try_getchar(void)
 char
 arch_debug_serial_getchar(void)
 {
-	if (gUART->getc != NULL)
-		return gUART->getc(gUART->base, false);
+	if (gUART->getchar != NULL)
+		return gUART->getchar(gUART->base, false);
 
 	return 0;
 }
@@ -70,8 +70,8 @@ arch_debug_serial_getchar(void)
 void
 arch_debug_serial_putchar(const char c)
 {
-	if (gUART->putc != NULL)
-		gUART->putc(gUART->base, c);
+	if (gUART->putchar != NULL)
+		gUART->putchar(gUART->base, c);
 }
 
 
diff --git a/src/system/kernel/arch/arm/uart.cpp b/src/system/kernel/arch/arm/uart.cpp
index 480b7c070c..7f4cc4a6f9 100644
--- a/src/system/kernel/arch/arm/uart.cpp
+++ b/src/system/kernel/arch/arm/uart.cpp
@@ -54,8 +54,8 @@ uart_create(void)
 	uart->init = uart_8250_init;
 	uart->init_early = uart_8250_init_early;
 	uart->init_port = uart_8250_init_port;
-	uart->putc = uart_8250_putc;
-	uart->getc = uart_8250_getc;
+	uart->putchar = uart_8250_putchar;
+	uart->getchar = uart_8250_getchar;
 	uart->flush_tx = uart_8250_flush_tx;
 	uart->flush_rx = uart_8250_flush_rx;
 	#elif defined(BOARD_UART_AMBA)
@@ -63,8 +63,8 @@ uart_create(void)
 	uart->init = uart_amba_init;
 	uart->init_early = uart_amba_init_early;
 	uart->init_port = uart_amba_init_port;
-	uart->putc = uart_amba_putc;
-	uart->getc = uart_amba_getc;
+	uart->putchar = uart_amba_putchar;
+	uart->getchar = uart_amba_getchar;
 	uart->flush_tx = uart_amba_flush_tx;
 	uart->flush_rx = uart_amba_flush_rx;
 	#else
diff --git a/src/system/kernel/arch/arm/uart_8250.cpp b/src/system/kernel/arch/arm/uart_8250.cpp
index f04166cd01..ea12b5d5c2 100644
--- a/src/system/kernel/arch/arm/uart_8250.cpp
+++ b/src/system/kernel/arch/arm/uart_8250.cpp
@@ -138,7 +138,7 @@ uart_8250_init(addr_t base)
 
 
 int
-uart_8250_putc(addr_t base, char c )
+uart_8250_putchar(addr_t base, char c)
 {
 	while (!(read_8250(base, UART_LSR) & (1<<6)));
 		// wait for the last char to get out
@@ -149,7 +149,7 @@ uart_8250_putc(addr_t base, char c )
 
 /* returns -1 if no data available */
 int
-uart_8250_getc(addr_t base, bool wait)
+uart_8250_getchar(addr_t base, bool wait)
 {
 	if (wait) {
 		while (!(read_8250(base, UART_LSR) & (1<<0)));