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 52328fd23d..8452ab985a 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
@@ -13,8 +13,8 @@
 #include <uavcan/node/publisher.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 // UAVCAN types
 #include <uavcan/protocol/dynamic_node_id/server/Discovery.hpp>
 
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 85be7d6e4b..6a023d919c 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
@@ -8,8 +8,8 @@
 #include <uavcan/build_config.hpp>
 #include <uavcan/debug.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 namespace uavcan
 {
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 580bab219c..371abcd704 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
@@ -8,9 +8,9 @@
 #include <uavcan/build_config.hpp>
 #include <uavcan/debug.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/storage_marshaller.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 namespace uavcan
 {
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 b83f9621ee..aeb6bd060a 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
@@ -12,9 +12,9 @@
 #include <uavcan/node/service_server.hpp>
 #include <uavcan/node/service_client.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 // UAVCAN types
 #include <uavcan/protocol/dynamic_node_id/server/AppendEntries.hpp>
 #include <uavcan/protocol/dynamic_node_id/server/RequestVote.hpp>
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
index d61b1f761e..e98838bf2e 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/server.hpp
@@ -9,11 +9,11 @@
 #include <uavcan/debug.hpp>
 #include <uavcan/node/timer.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/raft_core.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/allocation_request_manager.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/node_id_selector.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/node_discoverer.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 namespace uavcan
 {
diff --git a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/event.hpp b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp
similarity index 94%
rename from libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/event.hpp
rename to libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp
index a82c100ab3..566c9a7ed7 100644
--- a/libuavcan/include/uavcan/protocol/dynamic_node_id_server/distributed/event.hpp
+++ b/libuavcan/include/uavcan/protocol/dynamic_node_id_server/event.hpp
@@ -2,8 +2,8 @@
  * Copyright (C) 2015 Pavel Kirienko <pavel.kirienko@gmail.com>
  */
 
-#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_EVENT_HPP_INCLUDED
-#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_DISTRIBUTED_EVENT_HPP_INCLUDED
+#ifndef UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_EVENT_HPP_INCLUDED
+#define UAVCAN_PROTOCOL_DYNAMIC_NODE_ID_SERVER_EVENT_HPP_INCLUDED
 
 #include <uavcan/build_config.hpp>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/types.hpp>
@@ -12,8 +12,6 @@ namespace uavcan
 {
 namespace dynamic_node_id_server
 {
-namespace distributed
-{
 /**
  * @ref IEventTracer.
  * Event codes cannot be changed, only new ones can be added.
@@ -109,7 +107,6 @@ public:
 
     /**
      * The server invokes this method every time it believes that a noteworthy event has happened.
-     * The table of event codes can be found in the server sources.
      * It is guaranteed that event code values will never change, but new ones can be added in future. This ensures
      * full backward compatibility.
      * @param event_code        Event code, see the sources for the enum with values.
@@ -120,7 +117,6 @@ public:
     virtual ~IEventTracer() { }
 };
 
-}
 }
 }
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/cluster_manager.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/cluster_manager.cpp
index 1cc9c1e885..679386087a 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/cluster_manager.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/cluster_manager.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/cluster_manager.hpp>
-#include "event_tracer.hpp"
+#include "../event_tracer.hpp"
 #include "../../helpers.hpp"
 #include "../memory_storage_backend.hpp"
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/log.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/log.cpp
index a836c90302..e5d7339410 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/log.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/log.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/log.hpp>
-#include "event_tracer.hpp"
+#include "../event_tracer.hpp"
 #include "../../helpers.hpp"
 #include "../memory_storage_backend.hpp"
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/persistent_state.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/persistent_state.cpp
index 94cad3a11a..a47fa81585 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/persistent_state.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/persistent_state.cpp
@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 #include <uavcan/protocol/dynamic_node_id_server/distributed/persistent_state.hpp>
-#include "event_tracer.hpp"
+#include "../event_tracer.hpp"
 #include "../memory_storage_backend.hpp"
 
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
index 1d08cdc00c..d2780d3c53 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/distributed/server.cpp
@@ -11,7 +11,7 @@
 #include <memory>
 #include <uavcan/protocol/dynamic_node_id_server/distributed.hpp>
 #include <uavcan/protocol/dynamic_node_id_client.hpp>
-#include "event_tracer.hpp"
+#include "../event_tracer.hpp"
 #include "../../helpers.hpp"
 #include "../memory_storage_backend.hpp"
 
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/event.cpp b/libuavcan/test/protocol/dynamic_node_id_server/event.cpp
similarity index 90%
rename from libuavcan/test/protocol/dynamic_node_id_server/distributed/event.cpp
rename to libuavcan/test/protocol/dynamic_node_id_server/event.cpp
index 40033726e5..8aea0e56c0 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/event.cpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/event.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <gtest/gtest.h>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 
 TEST(DynamicNodeIDServer, EventCodeToString)
diff --git a/libuavcan/test/protocol/dynamic_node_id_server/distributed/event_tracer.hpp b/libuavcan/test/protocol/dynamic_node_id_server/event_tracer.hpp
similarity index 58%
rename from libuavcan/test/protocol/dynamic_node_id_server/distributed/event_tracer.hpp
rename to libuavcan/test/protocol/dynamic_node_id_server/event_tracer.hpp
index 20f8f024c6..0b8f89c533 100644
--- a/libuavcan/test/protocol/dynamic_node_id_server/distributed/event_tracer.hpp
+++ b/libuavcan/test/protocol/dynamic_node_id_server/event_tracer.hpp
@@ -6,14 +6,14 @@
 
 #include <iostream>
 #include <string>
-#include <uavcan/protocol/dynamic_node_id_server/distributed/event.hpp>
+#include <uavcan/protocol/dynamic_node_id_server/event.hpp>
 
 
-class EventTracer : public uavcan::dynamic_node_id_server::distributed::IEventTracer
+class EventTracer : public uavcan::dynamic_node_id_server::IEventTracer
 {
     const std::string id_;
 
-    virtual void onEvent(uavcan::dynamic_node_id_server::distributed::TraceCode code, uavcan::int64_t argument)
+    virtual void onEvent(uavcan::dynamic_node_id_server::TraceCode code, uavcan::int64_t argument)
     {
         std::cout << "EVENT [" << id_ << "]\t" << code << "\t" << getEventName(code) << "\t" << argument << std::endl;
     }