diff --git a/src/modules/motion.cpp b/src/modules/motion.cpp
index b358149..8500b06 100644
--- a/src/modules/motion.cpp
+++ b/src/modules/motion.cpp
@@ -100,7 +100,7 @@ st_timer_t Motion::Step() {
     return next;
 }
 
-void ISR() {}
+void Isr() {}
 
 } // namespace motion
 } // namespace modules
diff --git a/src/modules/motion.h b/src/modules/motion.h
index 2c0b311..a577dc6 100644
--- a/src/modules/motion.h
+++ b/src/modules/motion.h
@@ -203,7 +203,7 @@ private:
 };
 
 /// ISR stepping routine
-extern void ISR();
+extern void Isr();
 
 extern Motion motion;
 
diff --git a/src/modules/timebase.cpp b/src/modules/timebase.cpp
index a55ebbe..3db6852 100644
--- a/src/modules/timebase.cpp
+++ b/src/modules/timebase.cpp
@@ -9,7 +9,7 @@ Timebase timebase;
 void Timebase::Init() {
 }
 
-void Timebase::ISR() {
+void Timebase::Isr() {
 }
 
 uint16_t Timebase::Millis() const {
diff --git a/src/modules/timebase.h b/src/modules/timebase.h
index 8c29c0b..0241e42 100644
--- a/src/modules/timebase.h
+++ b/src/modules/timebase.h
@@ -23,7 +23,7 @@ public:
 
 private:
     uint16_t ms;
-    static void ISR();
+    static void Isr();
 };
 
 /// The one and only instance of Selector in the FW
diff --git a/tests/unit/modules/stubs/stub_timebase.cpp b/tests/unit/modules/stubs/stub_timebase.cpp
index 04267fe..d4e57f9 100644
--- a/tests/unit/modules/stubs/stub_timebase.cpp
+++ b/tests/unit/modules/stubs/stub_timebase.cpp
@@ -10,7 +10,7 @@ uint16_t millis = 0;
 
 void Timebase::Init() {}
 
-void Timebase::ISR() {}
+void Timebase::Isr() {}
 
 uint16_t Timebase::Millis() const {
     return millis;