diff --git a/libuavcan/include/uavcan/internal/node/scheduler.hpp b/libuavcan/include/uavcan/internal/node/scheduler.hpp
index ebf674b7dd..fa3d0d458b 100644
--- a/libuavcan/include/uavcan/internal/node/scheduler.hpp
+++ b/libuavcan/include/uavcan/internal/node/scheduler.hpp
@@ -27,7 +27,7 @@ protected:
     virtual ~MonotonicDeadlineHandler() { stop(); }
 
 public:
-    virtual void onMonotonicDeadline(uint64_t monotonic_timestamp) = 0;
+    virtual void handleMonotonicDeadline(uint64_t monotonic_timestamp) = 0;
 
     void startWithDeadline(uint64_t monotonic_deadline);
     void startWithDelay(uint64_t delay_usec);
diff --git a/libuavcan/include/uavcan/timer.hpp b/libuavcan/include/uavcan/timer.hpp
index 34f6d747b8..743cbd0870 100644
--- a/libuavcan/include/uavcan/timer.hpp
+++ b/libuavcan/include/uavcan/timer.hpp
@@ -33,7 +33,7 @@ class Timer : private MonotonicDeadlineHandler
 {
     uint64_t period_;
 
-    void onMonotonicDeadline(uint64_t monotonic_timestamp);
+    void handleMonotonicDeadline(uint64_t monotonic_timestamp);
 
 public:
     static const uint64_t InfinitePeriod = 0xFFFFFFFFFFFFFFFFUL;
@@ -54,7 +54,7 @@ public:
 
     uint64_t getPeriod() const { return period_; }
 
-    virtual void onTimerEvent(const TimerEvent& event) = 0;
+    virtual void handleTimerEvent(const TimerEvent& event) = 0;
 };
 
 
@@ -77,7 +77,7 @@ public:
     const Callback& getCallback() const { return callback_; }
     void setCallback(const Callback& callback) { callback_ = callback; }
 
-    void onTimerEvent(const TimerEvent& event)
+    void handleTimerEvent(const TimerEvent& event)
     {
         if (try_implicit_cast<bool>(callback_, true))
             callback_(event);
diff --git a/libuavcan/src/scheduler.cpp b/libuavcan/src/scheduler.cpp
index b98b13b90e..3b56660513 100644
--- a/libuavcan/src/scheduler.cpp
+++ b/libuavcan/src/scheduler.cpp
@@ -98,7 +98,7 @@ uint64_t MonotonicDeadlineScheduler::pollAndGetMonotonicTimestamp(ISystemClock&
             return ts;
 
         handlers_.remove(mdh);
-        mdh->onMonotonicDeadline(ts);   // This handler can be re-registered immediately
+        mdh->handleMonotonicDeadline(ts);   // This handler can be re-registered immediately
     }
     assert(0);
     return 0;
diff --git a/libuavcan/src/timer.cpp b/libuavcan/src/timer.cpp
index f58925acca..0d01b5bed9 100644
--- a/libuavcan/src/timer.cpp
+++ b/libuavcan/src/timer.cpp
@@ -10,7 +10,7 @@ namespace uavcan
 
 const uint64_t Timer::InfinitePeriod;
 
-void Timer::onMonotonicDeadline(uint64_t monotonic_timestamp)
+void Timer::handleMonotonicDeadline(uint64_t monotonic_timestamp)
 {
     assert(!isRunning());
 
@@ -18,7 +18,7 @@ void Timer::onMonotonicDeadline(uint64_t monotonic_timestamp)
         startWithDeadline(getMonotonicDeadline() + period_);
 
     // Application can re-register the timer with different params, it's OK
-    onTimerEvent(TimerEvent(this, getMonotonicDeadline(), monotonic_timestamp));
+    handleTimerEvent(TimerEvent(this, getMonotonicDeadline(), monotonic_timestamp));
 }
 
 void Timer::startOneShotWithDeadline(uint64_t monotonic_deadline_usec)