diff --git a/libuavcan_drivers/linux/include/uavcan_linux/clock.hpp b/libuavcan_drivers/linux/include/uavcan_linux/clock.hpp
index e923dec0c1..638b2a6a68 100644
--- a/libuavcan_drivers/linux/include/uavcan_linux/clock.hpp
+++ b/libuavcan_drivers/linux/include/uavcan_linux/clock.hpp
@@ -21,7 +21,7 @@ enum class ClockAdjustmentMode
 };
 
 
-class SystemClockDriver : public uavcan::ISystemClock
+class SystemClock : public uavcan::ISystemClock
 {
     uavcan::UtcDuration private_adj_;
     uavcan::UtcDuration gradual_adj_limit_;
@@ -57,7 +57,7 @@ class SystemClockDriver : public uavcan::ISystemClock
     }
 
 public:
-    SystemClockDriver(ClockAdjustmentMode adj_mode = ClockAdjustmentMode::SystemWide)
+    SystemClock(ClockAdjustmentMode adj_mode = ClockAdjustmentMode::SystemWide)
         : gradual_adj_limit_(uavcan::UtcDuration::fromMSec(4000))
         , adj_mode_(adj_mode)
         , step_adj_cnt_(0)
diff --git a/libuavcan_drivers/linux/test/test_clock.cpp b/libuavcan_drivers/linux/test/test_clock.cpp
index b2eca22eae..85e91388d3 100644
--- a/libuavcan_drivers/linux/test/test_clock.cpp
+++ b/libuavcan_drivers/linux/test/test_clock.cpp
@@ -19,7 +19,7 @@ int main()
     std::cout << "Enter system time adjustment in seconds (fractions allowed): " << std::endl;
     std::cin >> sec;
 
-    uavcan_linux::SystemClockDriver clock;
+    uavcan_linux::SystemClock clock;
 
     const auto before = std::chrono::system_clock::now();
     try