diff --git a/arch/arm/fsl_frdm_k64f/irq_vector_table.c b/arch/arm/fsl_frdm_k64f/irq_vector_table.c
index 72a04abe926..65c446ab109 100644
--- a/arch/arm/fsl_frdm_k64f/irq_vector_table.c
+++ b/arch/arm/fsl_frdm_k64f/irq_vector_table.c
@@ -58,7 +58,7 @@ typedef void (*vth)(void); /* Vector Table Handler */
 vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
 	[0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper,
 #if defined(CONFIG_CONSOLE_HANDLER)
-	[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr,
+	[CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
 #endif
 };
 
@@ -71,7 +71,7 @@ extern void _SpuriousIRQ(void);
 vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
 	[0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ,
 #if defined(CONFIG_CONSOLE_HANDLER)
-	[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr,
+	[CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
 #endif
 };
 
diff --git a/arch/arm/ti_lm3s6965/irq_vector_table.c b/arch/arm/ti_lm3s6965/irq_vector_table.c
index 72a04abe926..65c446ab109 100644
--- a/arch/arm/ti_lm3s6965/irq_vector_table.c
+++ b/arch/arm/ti_lm3s6965/irq_vector_table.c
@@ -58,7 +58,7 @@ typedef void (*vth)(void); /* Vector Table Handler */
 vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
 	[0 ...(CONFIG_NUM_IRQS - 1)] = _IsrWrapper,
 #if defined(CONFIG_CONSOLE_HANDLER)
-	[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr,
+	[CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
 #endif
 };
 
@@ -71,7 +71,7 @@ extern void _SpuriousIRQ(void);
 vth __irq_vector_table _IrqVectorTable[CONFIG_NUM_IRQS] = {
 	[0 ...(CONFIG_NUM_IRQS - 1)] = _SpuriousIRQ,
 #if defined(CONFIG_CONSOLE_HANDLER)
-	[CONFIG_UART_CONSOLE_IRQ] = (vth)console_uart_isr,
+	[CONFIG_UART_CONSOLE_IRQ] = (vth)uart_console_isr,
 #endif
 };
 
diff --git a/arch/x86/bsp/driver_static_irq_stubs.s b/arch/x86/bsp/driver_static_irq_stubs.s
index 4361d4803b4..b2a827b6194 100644
--- a/arch/x86/bsp/driver_static_irq_stubs.s
+++ b/arch/x86/bsp/driver_static_irq_stubs.s
@@ -176,7 +176,7 @@ SECTION_FUNC(TEXT, _bluetooth_uart_stub)
 SECTION_FUNC(TEXT, _console_uart_stub)
 	call	_IntEnt			/* Inform kernel interrupt has begun */
 	pushl	$0			/* Push dummy parameter */
-	call	console_uart_isr	/* Call actual interrupt handler */
+	call	uart_console_isr	/* Call actual interrupt handler */
 	call	_i8259_eoi_master	/* Inform the PIC interrupt is done */
 	addl	$4, %esp		/* Clean-up stack from push above */
 	jmp	_IntExit		/* Inform kernel interrupt is done */
@@ -184,7 +184,7 @@ SECTION_FUNC(TEXT, _console_uart_stub)
 SECTION_FUNC(TEXT, _console_uart_stub)
 	call	_IntEnt			/* Inform kernel interrupt has begun */
 	pushl	$0			/* Push dummy parameter */
-	call	console_uart_isr	/* Call actual interrupt handler */
+	call	uart_console_isr	/* Call actual interrupt handler */
 	call	_ioapic_eoi		/* Inform the PIC interrupt is done */
 	addl	$4, %esp		/* Clean-up stack from push above */
 	jmp	_IntExit		/* Inform kernel interrupt is done */
diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c
index a7506bbd8f2..59398bc809f 100644
--- a/drivers/console/uart_console.c
+++ b/drivers/console/uart_console.c
@@ -131,7 +131,7 @@ static int read_uart(int uart, uint8_t *buf, unsigned int size)
 	return rx;
 }
 
-void console_uart_isr(void *unused)
+void uart_console_isr(void *unused)
 {
 	ARG_UNUSED(unused);
 
@@ -170,7 +170,7 @@ static void console_handler_init(void)
 
 	uart_irq_rx_disable(UART);
 	uart_irq_tx_disable(UART);
-	uart_int_connect(UART, console_uart_isr, NULL, NULL);
+	uart_int_connect(UART, uart_console_isr, NULL, NULL);
 
 	/* Drain the fifo */
 	while (uart_irq_rx_ready(UART))
diff --git a/drivers/console/uart_console.h b/drivers/console/uart_console.h
index ef2625ceffd..d85b13292f6 100644
--- a/drivers/console/uart_console.h
+++ b/drivers/console/uart_console.h
@@ -48,7 +48,7 @@ extern void uartConsoleInit(void);
  */
 void uart_register_handler(void (*cb) (const char *string));
 
-void console_uart_isr(void *unused);
+void uart_console_isr(void *unused);
 
 #ifdef __cplusplus
 }