diff --git a/miosix/arch/arm7_lpc2000/lpc2138_miosix_board/interfaces-impl/portability.cpp b/miosix/arch/arm7_lpc2000/lpc2138_miosix_board/interfaces-impl/portability.cpp
index a5487a3343d644441e6b14a91016b1a525f7037d..9335dde59108ba5d1b0061b3af2a667c8dae9fd9 100644
--- a/miosix/arch/arm7_lpc2000/lpc2138_miosix_board/interfaces-impl/portability.cpp
+++ b/miosix/arch/arm7_lpc2000/lpc2138_miosix_board/interfaces-impl/portability.cpp
@@ -34,7 +34,7 @@
 #include "miosix.h"
 #include "portability_impl.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include "board_settings.h"
 #include <algorithm>
 
@@ -55,8 +55,7 @@ void ISR_preempt()
 	T0IR=0x1;//Clear interrupt
     VICVectAddr=0xff;//Restart VIC
     
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();
+    miosix::IRQtimerInterrupt();
 }
 
 /**
diff --git a/miosix/arch/cortexM3_efm32gg/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM3_efm32gg/common/interfaces-impl/portability.cpp
index fe82af9e6f2f77a68d2aaaf50bb197d288336c2b..c5312bebf740cec4a4776b4ee1ff2f884c5e30ac 100644
--- a/miosix/arch/cortexM3_efm32gg/common/interfaces-impl/portability.cpp
+++ b/miosix/arch/cortexM3_efm32gg/common/interfaces-impl/portability.cpp
@@ -31,7 +31,7 @@
 #include "kernel/error.h"
 #include "interfaces/bsp.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include <algorithm>
 
 /**
@@ -97,8 +97,7 @@ namespace miosix_private {
 void ISR_preempt() __attribute__((noinline));
 void ISR_preempt()
 {
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();
+    miosix::IRQtimerInterrupt();
 }
 
 /**
diff --git a/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp
index 0ff10b47e516daa8ca9db72e159248eaeb1ca654..7b5b2098f0ca94489da2c7ce2ca247518103cbe4 100644
--- a/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp
+++ b/miosix/arch/cortexM3_stm32/common/interfaces-impl/portability.cpp
@@ -31,7 +31,7 @@
 #include "kernel/error.h"
 #include "interfaces/bsp.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include <algorithm>
 
 /**
@@ -97,8 +97,7 @@ namespace miosix_private {
 void ISR_preempt() __attribute__((noinline));
 void ISR_preempt()
 {
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();
+    miosix::IRQtimerInterrupt();
 }
 
 /**
diff --git a/miosix/arch/cortexM3_stm32f2/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM3_stm32f2/common/interfaces-impl/portability.cpp
index 7aedfb824fc19982d2fc29e6123f79186d6e4370..c7f4c9e96e54a53f78f8f4a2accb884e0d29ae5e 100644
--- a/miosix/arch/cortexM3_stm32f2/common/interfaces-impl/portability.cpp
+++ b/miosix/arch/cortexM3_stm32f2/common/interfaces-impl/portability.cpp
@@ -31,7 +31,7 @@
 #include "kernel/error.h"
 #include "interfaces/bsp.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include "core/interrupts.h"
 #include "kernel/process.h"
 #include <algorithm>
@@ -102,8 +102,7 @@ namespace miosix_private {
 void ISR_preempt() __attribute__((noinline));
 void ISR_preempt()
 {
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();  
+    miosix::IRQtimerInterrupt();  
 }
 
 /**
diff --git a/miosix/arch/cortexM3_stm32l1/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM3_stm32l1/common/interfaces-impl/portability.cpp
index b408798c3bf76b9da059fd4671f37f1ef534abcb..a3a9cd1bffdf874558c023ce200274b80516e0e7 100644
--- a/miosix/arch/cortexM3_stm32l1/common/interfaces-impl/portability.cpp
+++ b/miosix/arch/cortexM3_stm32l1/common/interfaces-impl/portability.cpp
@@ -31,7 +31,7 @@
 #include "kernel/error.h"
 #include "interfaces/bsp.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include <algorithm>
 
 /**
@@ -97,8 +97,7 @@ namespace miosix_private {
 void ISR_preempt() __attribute__((noinline));
 void ISR_preempt()
 {
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();
+    miosix::IRQtimerInterrupt();
 }
 
 /**
diff --git a/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/cstimer.cpp b/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/cstimer.cpp
index 1416065633aab43641837e758839bc06d7d9e642..8bbbce9c8d8b07e5ae74fc40dcb6a2139cc696a3 100644
--- a/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/cstimer.cpp
+++ b/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/cstimer.cpp
@@ -3,7 +3,7 @@
 #include "interfaces/portability.h"
 #include "kernel/kernel.h"
 #include "kernel/logging.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include <cstdlib>
 
 using namespace miosix;
@@ -80,7 +80,7 @@ void __attribute__((used)) cstirqhnd()
                 csRecord.wakeup_time += CST_QUANTUM;
                 IRQaddToSleepingList(&csRecord); //It would also set the next timer interrupt
             }
-            IRQtickInterrupt();
+            IRQtimerInterrupt();
         }
 
     }
diff --git a/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/portability.cpp b/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/portability.cpp
index b1d5c2c057b493888d5de7ebc16928069ad176b4..3fe65752b17e7c497e222f427162ca3a6fcc9d7a 100644
--- a/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/portability.cpp
+++ b/miosix/arch/cortexM4_stm32f4/common/interfaces-impl/portability.cpp
@@ -31,7 +31,7 @@
 #include "kernel/error.h"
 #include "interfaces/bsp.h"
 #include "kernel/scheduler/scheduler.h"
-#include "kernel/scheduler/tick_interrupt.h"
+#include "kernel/scheduler/timer_interrupt.h"
 #include "core/interrupts.h"
 #include "kernel/process.h"
 #include <algorithm>
@@ -106,8 +106,7 @@ namespace miosix_private {
 void ISR_preempt() __attribute__((noinline));
 void ISR_preempt()
 {
-    IRQstackOverflowCheck();
-    miosix::IRQtickInterrupt();
+    miosix::IRQtimerInterrupt();
 }
 #endif //USE_CSTIMER
 
diff --git a/miosix/kernel/scheduler/tick_interrupt.h b/miosix/kernel/scheduler/timer_interrupt.h
similarity index 96%
rename from miosix/kernel/scheduler/tick_interrupt.h
rename to miosix/kernel/scheduler/timer_interrupt.h
index 0a2bbf2a476573a9d69cf826d1aa287c7f7eb4bb..bd0d94ce84b89a4b1106a6dfafa197688c0f5930 100644
--- a/miosix/kernel/scheduler/tick_interrupt.h
+++ b/miosix/kernel/scheduler/timer_interrupt.h
@@ -25,8 +25,8 @@
  *   along with this program; if not, see <http://www.gnu.org/licenses/>   *
  ***************************************************************************/
 
-#ifndef TICK_INTERRUPT_H
-#define	TICK_INTERRUPT_H
+#ifndef TIMER_INTERRUPT_H
+#define	TIMER_INTERRUPT_H
 
 #include "config/miosix_settings.h"
 #include "interfaces/portability.h"
@@ -42,11 +42,9 @@ extern volatile bool tick_skew;///\internal Do not use outside the kernel
 extern volatile Thread *cur;///\internal Do not use outside the kernel
 extern bool IRQwakeThreads();///\internal Do not use outside the kernel
 
-inline void IRQtickInterrupt()
+inline void IRQtimerInterrupt()
 {
-    #ifdef USE_CSTIMER
     miosix_private::IRQstackOverflowCheck();
-    #endif //USE_CSTIMER
     bool woken=IRQwakeThreads();//Increment tick and wake threads,if any
     (void)woken; //Avoid unused variable warning.
 
@@ -78,4 +76,4 @@ inline void IRQtickInterrupt()
 
 }
 
-#endif //TICK_INTERRUPT_H
+#endif //TIMER_INTERRUPT_H