diff --git a/include/async_mqtt/impl/endpoint_misc.ipp b/include/async_mqtt/impl/endpoint_misc.ipp
index 39c7ffed..4c98cfe0 100644
--- a/include/async_mqtt/impl/endpoint_misc.ipp
+++ b/include/async_mqtt/impl/endpoint_misc.ipp
@@ -136,7 +136,7 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::set_pingreq_send_interval(
     for (auto& event : events) {
         std::visit(
             overload {
-                [&](event::timer const& ev) {
+                [&](async_mqtt::event::timer const& ev) {
                     if (ev.get_kind() == timer_kind::pingreq_send) {
                         switch (ev.get_op()) {
                         case timer_op::set:
@@ -300,7 +300,7 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::set_pingreq_recv_timer(
                                 auto& event = *it++;
                                 std::visit(
                                     overload {
-                                        [&](event::timer const& ev) {
+                                        [&](async_mqtt::event::timer const& ev) {
                                             if (ev.get_kind() == timer_kind::pingreq_recv) {
                                                 switch (ev.get_op()) {
                                                 case timer_op::set:
@@ -318,13 +318,13 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::set_pingreq_recv_timer(
                                                 BOOST_ASSERT(false);
                                             }
                                         },
-                                        [&](event::basic_send<PacketIdBytes>& ev) {
+                                        [&](async_mqtt::event::basic_send<PacketIdBytes>& ev) {
                                             auto pv{force_move(ev.get())};
                                             BOOST_ASSERT(pv.template get_if<v5::disconnect_packet>());
                                             BOOST_ASSERT(it != events.end());
                                             auto& ev_close = *it++;
                                             BOOST_ASSERT(it == events.end());
-                                            BOOST_ASSERT(std::get_if<event::close>(&ev_close));
+                                            BOOST_ASSERT(std::get_if<async_mqtt::event::close>(&ev_close));
                                             ep->stream_.async_write_packet(
                                                 force_move(pv),
                                                 [ep]
@@ -336,7 +336,7 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::set_pingreq_recv_timer(
                                                 }
                                             );
                                         },
-                                        [&](event::close const&) {
+                                        [&](async_mqtt::event::close const&) {
                                             async_close(ep, as::detached);
                                         },
                                         [&](auto const&) {
@@ -397,7 +397,7 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::reset_pingresp_recv_timer(
                                 auto& event = *it++;
                                 std::visit(
                                     overload {
-                                        [&](event::timer const& ev) {
+                                        [&](async_mqtt::event::timer const& ev) {
                                             if (ev.get_kind() == timer_kind::pingresp_recv) {
                                                 switch (ev.get_op()) {
                                                 case timer_op::set:
@@ -415,13 +415,13 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::reset_pingresp_recv_timer(
                                                 BOOST_ASSERT(false);
                                             }
                                         },
-                                        [&](event::basic_send<PacketIdBytes>& ev) {
+                                        [&](async_mqtt::event::basic_send<PacketIdBytes>& ev) {
                                             auto pv{force_move(ev.get())};
                                             BOOST_ASSERT(pv.template get_if<v5::disconnect_packet>());
                                             BOOST_ASSERT(it != events.end());
                                             auto& ev_close = *it++;
                                             BOOST_ASSERT(it == events.end());
-                                            BOOST_ASSERT(std::get_if<event::close>(&ev_close));
+                                            BOOST_ASSERT(std::get_if<async_mqtt::event::close>(&ev_close));
                                             ep->stream_.async_write_packet(
                                                 force_move(pv),
                                                 [ep]
@@ -433,7 +433,7 @@ basic_endpoint_impl<Role, PacketIdBytes, NextLayer>::reset_pingresp_recv_timer(
                                                 }
                                             );
                                         },
-                                        [&](event::close const&) {
+                                        [&](async_mqtt::event::close const&) {
                                             async_close(ep, as::detached);
                                         },
                                         [&](auto const&) {
diff --git a/include/async_mqtt/impl/endpoint_recv.hpp b/include/async_mqtt/impl/endpoint_recv.hpp
index 8c967569..0e14b640 100644
--- a/include/async_mqtt/impl/endpoint_recv.hpp
+++ b/include/async_mqtt/impl/endpoint_recv.hpp
@@ -38,7 +38,7 @@ recv_op {
                     decided_error.emplace(ec);
                     return true;
                 },
-                [&](event::basic_send<PacketIdBytes>& ev) {
+                [&](async_mqtt::event::basic_send<PacketIdBytes>& ev) {
                     state = sent;
                     auto ep_copy{ep};
                     async_send(
@@ -49,12 +49,12 @@ recv_op {
                     BOOST_ASSERT(!ev.get_release_packet_id_if_send_error());
                     return false;
                 },
-                [&](event::basic_packet_id_released<PacketIdBytes> ev) {
+                [&](async_mqtt::event::basic_packet_id_released<PacketIdBytes> ev) {
                     a_ep.notify_release_pid(ev.get());
                     try_resend_from_queue = true;
                     return true;
                 },
-                [&](event::basic_packet_received<PacketIdBytes> ev) {
+                [&](async_mqtt::event::basic_packet_received<PacketIdBytes> ev) {
                     if (recv_packet) {
                         // rest events would be processed the next async_recv call
                         // back the event to the recv_events_ for the next async_recv
@@ -71,7 +71,7 @@ recv_op {
                     }
                     return true;
                 },
-                [&](event::timer ev) {
+                [&](async_mqtt::event::timer ev) {
                     switch (ev.get_kind()) {
                     case timer_kind::pingreq_send:
                         // receive server keep alive property in connack
@@ -109,7 +109,7 @@ recv_op {
                     }
                     return true;
                 },
-                [&](event::close) {
+                [&](async_mqtt::event::close) {
                     state = complete;
                     auto ep_copy{ep};
                     async_close(
diff --git a/include/async_mqtt/impl/endpoint_release_packet_id.hpp b/include/async_mqtt/impl/endpoint_release_packet_id.hpp
index cca8d56f..e1f2fdcf 100644
--- a/include/async_mqtt/impl/endpoint_release_packet_id.hpp
+++ b/include/async_mqtt/impl/endpoint_release_packet_id.hpp
@@ -40,8 +40,7 @@ release_packet_id_op {
             for (auto& event : events) {
                 std::visit(
                     overload {
-                        [&](event::basic_packet_id_released<PacketIdBytes> const& ev) {
-                            // TBD naming? notify_packet_id_released
+                        [&](async_mqtt::event::basic_packet_id_released<PacketIdBytes> const& ev) {
                             a_ep.notify_release_pid(ev.get());
                         },
                         [](auto const&) {
diff --git a/include/async_mqtt/impl/endpoint_send.hpp b/include/async_mqtt/impl/endpoint_send.hpp
index e1373cb5..9f47397f 100644
--- a/include/async_mqtt/impl/endpoint_send.hpp
+++ b/include/async_mqtt/impl/endpoint_send.hpp
@@ -61,7 +61,7 @@ send_op {
                     decided_error.emplace(ec);
                     return true;
                 },
-                [&](event::timer const& ev) {
+                [&](async_mqtt::event::timer const& ev) {
                     switch (ev.get_kind()) {
                     case timer_kind::pingreq_send:
                         if (ev.get_op() == timer_op::reset) {
@@ -85,11 +85,11 @@ send_op {
                     }
                     return true;
                 },
-                [&](event::basic_packet_id_released<PacketIdBytes> const& ev) {
+                [&](async_mqtt::event::basic_packet_id_released<PacketIdBytes> const& ev) {
                     a_ep.notify_release_pid(ev.get());
                     return true;
                 },
-                [&](event::basic_send<PacketIdBytes>& ev) {
+                [&](async_mqtt::event::basic_send<PacketIdBytes>& ev) {
                     state = sent;
                     disconnect_sent_just_before = ev.get().type() == control_packet_type::disconnect;
                     a_ep.stream_.async_write_packet(
@@ -101,7 +101,7 @@ send_op {
                     );
                     return false;
                 },
-                [&](event::close) {
+                [&](async_mqtt::event::close) {
                     state = close;
                     if (disconnect_sent_just_before &&
                         a_ep.duration_close_by_disconnect_ != std::chrono::milliseconds::zero()