diff --git a/arch/x86/bsp/i8259Boi.s b/arch/x86/bsp/i8259Boi.s
index 45f9da12f9e..c0762d8f104 100644
--- a/arch/x86/bsp/i8259Boi.s
+++ b/arch/x86/bsp/i8259Boi.s
@@ -56,7 +56,7 @@ a real IRQ has been inserted.
  	/* externs */
 
 	GTEXT(_IntExit)
-	GDATA(_I8259SpuriousIntCount)
+	GDATA(_i8259_spurious_interrupt_count)
 
 
 /*******************************************************************************
@@ -144,7 +144,7 @@ BRANCH_LABEL(check_isr)
 
 BRANCH_LABEL(spur_isr)
     /* An actual spurious interrupt. Increment counter and short circuit */
-    incl    _I8259SpuriousIntCount
+    incl    _i8259_spurious_interrupt_count
 
     /* Pop the return address */
     addl    $4, %esp
diff --git a/drivers/interrupt_controller/i8259.c b/drivers/interrupt_controller/i8259.c
index 3f4ce2bfaf1..6b624f73c47 100644
--- a/drivers/interrupt_controller/i8259.c
+++ b/drivers/interrupt_controller/i8259.c
@@ -103,7 +103,7 @@ the last level acknowledged and serviced.
 /* globals */
 
 #ifndef CONFIG_SHUTOFF_PIC
-unsigned int _I8259SpuriousIntCount =
+unsigned int _i8259_spurious_interrupt_count =
 	0; /* track # of spurious interrupts */
 
 /*