diff --git a/arch/x86/timer/loApicTimer.c b/arch/x86/timer/loApicTimer.c
index f249baa697..3fba9d4163 100644
--- a/arch/x86/timer/loApicTimer.c
+++ b/arch/x86/timer/loApicTimer.c
@@ -137,7 +137,7 @@ static uint32_t idle_original_count = 0;
 static uint32_t __noinit max_system_ticks;
 static uint32_t idle_original_ticks = 0;
 static uint32_t __noinit max_load_value;
-static uint32_t __noinit _TimerIdleSkew;
+static uint32_t __noinit timer_idle_skew;
 static unsigned char _TimerMode = TIMER_MODE_PERIODIC;
 #endif /* TIMER_SUPPORTS_TICKLESS */
 
@@ -422,7 +422,7 @@ static void _loApicTimerTicklessIdleSkew(void)
 	volatile uint32_t dummy; /* used to replicate the 'skew time' */
 
 	/* Timer must be running for this to work */
-	_TimerIdleSkew = _loApicTimerGetRemaining();
+	timer_idle_skew = _loApicTimerGetRemaining();
 
 	_loApicTimerStart(); /* This is normally a stop operation */
 	dummy = _loApicTimerGetRemaining(); /*_loApicTimerSetCount
@@ -432,7 +432,7 @@ static void _loApicTimerTicklessIdleSkew(void)
 	_TimerMode = TIMER_MODE_PERIODIC;
 
 	/* Down counter */
-	_TimerIdleSkew -= _loApicTimerGetRemaining();
+	timer_idle_skew -= _loApicTimerGetRemaining();
 }
 
 /*******************************************************************************
@@ -457,7 +457,7 @@ void _timer_idle_enter(int32_t ticks /* system ticks */
 	 * timer. So we read the count out of it and add it to the requested
 	 * time out
 	 */
-	idle_original_count = _loApicTimerGetRemaining() - _TimerIdleSkew;
+	idle_original_count = _loApicTimerGetRemaining() - timer_idle_skew;
 
 	if ((ticks == -1) || (ticks > max_system_ticks)) {
 		/*
diff --git a/drivers/timer/i8253.c b/drivers/timer/i8253.c
index 29911b8153..52891e9b6c 100644
--- a/drivers/timer/i8253.c
+++ b/drivers/timer/i8253.c
@@ -142,7 +142,7 @@ static uint16_t idle_original_count = 0;
 static uint16_t idle_original_ticks = 0;
 static uint16_t __noinit max_system_ticks;
 static uint16_t __noinit max_load_value;
-static uint16_t __noinit _TimerIdleSkew;
+static uint16_t __noinit timer_idle_skew;
 
 /* Used to determine if the timer ISR should place the timer in periodic mode */
 static unsigned char _TimerMode = TIMER_MODE_PERIODIC;
@@ -367,7 +367,7 @@ static void _i8253TicklessIdleInit(void)
 static void _i8253TicklessIdleSkew(void)
 {
 	/* TBD */
-	_TimerIdleSkew = 0;
+	timer_idle_skew = 0;
 }
 
 /*******************************************************************************
@@ -414,7 +414,7 @@ void _timer_idle_enter(int32_t ticks /* system ticks */
 		newCount += idle_original_ticks * counterLoadVal;
 	}
 
-	idle_original_count = newCount - _TimerIdleSkew;
+	idle_original_count = newCount - timer_idle_skew;
 
 	/* Stop/start the timer instead of disabling/enabling the interrupt? */
 	irq_disable(PIT_INT_LVL);