diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp
index 3166962276..79ec57e1ac 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp
@@ -128,13 +128,14 @@ private:
         /*
          * Broadcasting
          */
-        UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager", "Broadcasting Discovery message; known nodes: %d of %d",
+        UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager",
+                     "Broadcasting Discovery message; known nodes: %d of %d",
                      int(msg.known_nodes.size()), int(cluster_size_));
 
         const int res = discovery_pub_.broadcast(msg);
         if (res < 0)
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager", "Discovery broadcst failed: %d", res);
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager", "Discovery broadcst failed: %d", res);
             getNode().registerInternalFailure("Raft discovery broadcast");
         }
 
@@ -143,7 +144,8 @@ private:
          */
         if (isClusterDiscovered())
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager", "Discovery broadcasting timer stopped");
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager",
+                         "Discovery broadcasting timer stopped");
             stop();
         }
     }
@@ -237,13 +239,13 @@ public:
             int res = io.get(getStorageKeyForClusterSize(), value);
             if (res < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager",
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager",
                              "Cluster size is neither configured nor stored in the storage");
                 return res;
             }
             if ((value == 0) || (value > MaxClusterSize))
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager", "Cluster size is invalid");
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager", "Cluster size is invalid");
                 return -ErrFailure;
             }
             cluster_size_ = static_cast<uint8_t>(value);
@@ -262,7 +264,7 @@ public:
             int res = io.setAndGetBack(getStorageKeyForClusterSize(), value);
             if ((res < 0) || (value != init_cluster_size))
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::ClusterManager", "Failed to store cluster size");
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::ClusterManager", "Failed to store cluster size");
                 return -ErrFailure;
             }
         }
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
index 8b1e1668e3..85be7d6e4b 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/log.hpp
@@ -168,13 +168,13 @@ public:
             {
                 if (storage_.get(getLastIndexKey()).empty())
                 {
-                    UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "Initializing empty storage");
+                    UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "Initializing empty storage");
                     return initEmptyLogStorage();
                 }
                 else
                 {
                     // There's some data in the storage, but it cannot be parsed - reporting an error
-                    UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "Failed to read last index");
+                    UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "Failed to read last index");
                     return -ErrFailure;
                 }
             }
@@ -193,13 +193,13 @@ public:
             const int result = readEntryFromStorage(index, entries_[index]);
             if (result < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "Failed to read entry at index %u: %d",
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "Failed to read entry at index %u: %d",
                              unsigned(index), result);
                 return result;
             }
         }
 
-        UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "Restored %u log entries", unsigned(last_index_));
+        UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "Restored %u log entries", unsigned(last_index_));
         return 0;
     }
 
@@ -238,7 +238,7 @@ public:
         entries_[new_last_index] = entry;
         last_index_ = Index(new_last_index);
 
-        UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "New entry, index %u, node ID %u, term %u",
+        UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "New entry, index %u, node ID %u, term %u",
                      unsigned(last_index_), unsigned(entry.node_id), unsigned(entry.term));
         return 0;
     }
@@ -272,7 +272,7 @@ public:
             {
                 return -ErrFailure;
             }
-            UAVCAN_TRACE("dynamic_node_id_server_impl::Log", "Entries removed, last index %u --> %u",
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::Log", "Entries removed, last index %u --> %u",
                          unsigned(last_index_), unsigned(new_last_index));
             last_index_ = Index(new_last_index);
         }
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
index 33eb4673cd..580bab219c 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp
@@ -50,7 +50,7 @@ public:
         int res = log_.init();
         if (res < 0)
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState", "Log init failed: %d", res);
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState", "Log init failed: %d", res);
             return res;
         }
 
@@ -75,7 +75,8 @@ public:
             res = io.setAndGetBack(getCurrentTermKey(), current_term_);
             if (res < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState", "Failed to init current term: %d", res);
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState",
+                             "Failed to init current term: %d", res);
                 return res;
             }
             if (current_term_ != 0)
@@ -89,7 +90,8 @@ public:
             res = io.get(getCurrentTermKey(), current_term_);
             if (res < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState", "Failed to read current term: %d", res);
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState",
+                             "Failed to read current term: %d", res);
                 return res;
             }
         }
@@ -98,7 +100,7 @@ public:
 
         if (current_term_ < last_entry->term)
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState",
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState",
                          "Persistent storage is damaged: current term is less than term of the last log entry (%u < %u)",
                          unsigned(current_term_), unsigned(last_entry->term));
             return -ErrLogic;
@@ -115,7 +117,8 @@ public:
             res = io.setAndGetBack(getVotedForKey(), stored_voted_for);
             if (res < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState", "Failed to init votedFor: %d", res);
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState",
+                             "Failed to init votedFor: %d", res);
                 return res;
             }
             if (stored_voted_for != 0)
@@ -130,7 +133,8 @@ public:
             res = io.get(getVotedForKey(), stored_voted_for);
             if (res < 0)
             {
-                UAVCAN_TRACE("dynamic_node_id_server_impl::PersistentState", "Failed to read votedFor: %d", res);
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::PersistentState",
+                             "Failed to read votedFor: %d", res);
                 return res;
             }
             if (stored_voted_for > NodeID::Max)
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
index 87fa73dd65..dcf4c534e1 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp
@@ -165,7 +165,7 @@ class RaftCore : private TimerBase
         {
             const bool won = num_votes_received_in_this_campaign_ >= cluster_.getQuorumSize();
 
-            UAVCAN_TRACE("dynamic_node_id_server_impl::RaftCore", "Election complete, won: %d", int(won));
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::RaftCore", "Election complete, won: %d", int(won));
 
             switchState(won ? ServerStateLeader : ServerStateFollower);       // Start over or become leader
         }
@@ -202,7 +202,8 @@ class RaftCore : private TimerBase
                     break;
                 }
 
-                UAVCAN_TRACE("dynamic_node_id_server_impl::RaftCore", "Requesting vote from %d", int(node_id.get()));
+                UAVCAN_TRACE("dynamic_node_id_server::distributed::RaftCore",
+                             "Requesting vote from %d", int(node_id.get()));
                 trace(TraceRaftVoteRequestInitiation, node_id.get());
 
                 res = request_vote_clients_[i]->call(node_id, req);
@@ -276,7 +277,7 @@ class RaftCore : private TimerBase
     {
         if (server_state_ != new_state)
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::RaftCore", "State switch: %d --> %d",
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::RaftCore", "State switch: %d --> %d",
                          int(server_state_), int(new_state));
             trace(TraceRaftStateSwitch, new_state);
 
@@ -305,7 +306,7 @@ class RaftCore : private TimerBase
     {
         if (active_mode_ != new_active)
         {
-            UAVCAN_TRACE("dynamic_node_id_server_impl::RaftCore", "Active switch: %d --> %d",
+            UAVCAN_TRACE("dynamic_node_id_server::distributed::RaftCore", "Active switch: %d --> %d",
                          int(active_mode_), int(new_active));
             trace(TraceRaftActiveSwitch, new_active);