diff --git a/libuavcan/test/dsdl_test/dsdl_const_1.cpp b/libuavcan/test/dsdl_test/dsdl_const_1.cpp
index 1816e2aa69..1eb0e5ed3b 100644
--- a/libuavcan/test/dsdl_test/dsdl_const_1.cpp
+++ b/libuavcan/test/dsdl_test/dsdl_const_1.cpp
@@ -3,18 +3,17 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/FigureOfMerit.hpp>
+#include <uavcan/Timestamp.hpp>
 
 /*
  * Objective of this test is to make sure that the generated types are being linked correcly.
  * This test requests the address of some static const member variables to make sure that there
  * will be no duplicated symbol linking errors.
  */
-TEST(DsdlConst1, FigureOfMerit)
+TEST(DsdlConst1, Timestamp)
 {
-    using uavcan::FigureOfMerit;
+    using uavcan::Timestamp;
 
-    std::cout << &FigureOfMerit::MAX << std::endl;
-    std::cout << &FigureOfMerit::MIN << std::endl;
-    std::cout << &FigureOfMerit::UNKNOWN << std::endl;
+    std::cout << &Timestamp::USEC_PER_LSB << std::endl;
+    std::cout << &Timestamp::UNKNOWN << std::endl;
 }
diff --git a/libuavcan/test/dsdl_test/dsdl_const_2.cpp b/libuavcan/test/dsdl_test/dsdl_const_2.cpp
index 93524490a4..62096c2af6 100644
--- a/libuavcan/test/dsdl_test/dsdl_const_2.cpp
+++ b/libuavcan/test/dsdl_test/dsdl_const_2.cpp
@@ -3,14 +3,13 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/FigureOfMerit.hpp>
+#include <uavcan/Timestamp.hpp>
 
 
-TEST(DsdlConst2, FigureOfMerit)
+TEST(DsdlConst2, Timestamp)
 {
-    using uavcan::FigureOfMerit;
+    using uavcan::Timestamp;
 
-    std::cout << &FigureOfMerit::MAX << std::endl;
-    std::cout << &FigureOfMerit::MIN << std::endl;
-    std::cout << &FigureOfMerit::UNKNOWN << std::endl;
+    std::cout << &Timestamp::USEC_PER_LSB << std::endl;
+    std::cout << &Timestamp::UNKNOWN << std::endl;
 }
diff --git a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
index 4506151dc9..9e1b2cf804 100644
--- a/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
+++ b/libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
@@ -7,7 +7,6 @@
 #include <uavcan/helpers/ostream.hpp>
 
 #include <uavcan/Timestamp.hpp>
-#include <uavcan/FigureOfMerit.hpp>
 #include <uavcan/mavlink/Message.hpp>
 #include <uavcan/protocol/ComputeAggregateTypeSignature.hpp>
 #include <uavcan/protocol/GetTransportStats.hpp>