diff --git a/arch/x86/bsp/driver_static_irq_stubs.s b/arch/x86/bsp/driver_static_irq_stubs.s
index b03127f000..1f59ada8b6 100644
--- a/arch/x86/bsp/driver_static_irq_stubs.s
+++ b/arch/x86/bsp/driver_static_irq_stubs.s
@@ -61,7 +61,7 @@ by x86 BSPs.
 #endif
 
 #if defined (CONFIG_PIT)
-	GTEXT(_i8253IntStub)
+	GTEXT(_i8253_interrupt_stub)
 #endif
 
 #if defined(CONFIG_BLUETOOTH_UART)
@@ -141,7 +141,7 @@ SECTION_FUNC(TEXT, _slaveStrayIntStub)
 #endif /* CONFIG_PIC */
 
 #if defined(CONFIG_PIT)
-SECTION_FUNC(TEXT, _i8253IntStub)
+SECTION_FUNC(TEXT, _i8253_interrupt_stub)
 	call    _IntEnt			/* Inform kernel interrupt has begun */
 	pushl   $0			/* Push dummy parameter */
 	call    _timer_int_handler	/* Call actual interrupt handler */
diff --git a/drivers/timer/i8253.c b/drivers/timer/i8253.c
index 07421c900c..29cc3fda57 100644
--- a/drivers/timer/i8253.c
+++ b/drivers/timer/i8253.c
@@ -126,10 +126,10 @@ extern int32_t _sys_idle_elapsed_ticks;
 /* interrupt stub memory for irq_connect() */
 
 #ifndef CONFIG_DYNAMIC_INT_STUBS
-extern void *_i8253IntStub;
-SYS_INT_REGISTER(_i8253IntStub, PIT_INT_LVL, PIT_INT_PRI);
+extern void *_i8253_interrupt_stub;
+SYS_INT_REGISTER(_i8253_interrupt_stub, PIT_INT_LVL, PIT_INT_PRI);
 #else
-static NANO_CPU_INT_STUB_DECL(_i8253IntStub);
+static NANO_CPU_INT_STUB_DECL(_i8253_interrupt_stub);
 #endif
 
 static uint16_t __noinit counterLoadVal; /* computed counter */
@@ -526,7 +526,7 @@ void timer_driver(int priority /* priority parameter ignored by this driver */
 				PIT_INT_PRI,
 				_i8253IntHandlerPeriodic,
 				0,
-				_i8253IntStub);
+				_i8253_interrupt_stub);
 #endif /* CONFIG_DYNAMIC_INT_STUBS */
 
 	_i8253TicklessIdleSkew();