diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp
index 9d955a5..e5fb500 100644
--- a/src/connectionmanager.cpp
+++ b/src/connectionmanager.cpp
@@ -1680,4 +1680,4 @@
     return pimpl_->config_;
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/fileutils.cpp b/src/fileutils.cpp
index 565263c..b6194d2 100644
--- a/src/fileutils.cpp
+++ b/src/fileutils.cpp
@@ -580,7 +580,7 @@
                 return false;
             }
         }
-    } // namespace jami
+    } // namespace dhtnet
     return true;
 }
 
@@ -863,4 +863,4 @@
 }
 
 } // namespace fileutils
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/ice_transport.cpp b/src/ice_transport.cpp
index 0318a3d..602347d 100644
--- a/src/ice_transport.cpp
+++ b/src/ice_transport.cpp
@@ -1896,4 +1896,4 @@
         ice_transport_->setDefaultRemoteAddress(compId_, addr);
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/ip_utils.cpp b/src/ip_utils.cpp
index abc706c..91df414 100644
--- a/src/ip_utils.cpp
+++ b/src/ip_utils.cpp
@@ -496,4 +496,4 @@
         return false;
     }
 }
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/multiplexed_socket.cpp b/src/multiplexed_socket.cpp
index aea9954..7b58922 100644
--- a/src/multiplexed_socket.cpp
+++ b/src/multiplexed_socket.cpp
@@ -1204,4 +1204,4 @@
     return {};
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index a2c0615..42bfbc0 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -444,4 +444,4 @@
     return {};
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/peer_connection.h b/src/peer_connection.h
index 962e8d0..143ca70 100644
--- a/src/peer_connection.h
+++ b/src/peer_connection.h
@@ -134,4 +134,4 @@
     std::unique_ptr<Impl> pimpl_;
 };
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp
index 865493b..2ef05e4 100644
--- a/src/security/certstore.cpp
+++ b/src/security/certstore.cpp
@@ -665,4 +665,4 @@
 }
 
 } // namespace tls
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/security/diffie-hellman.cpp b/src/security/diffie-hellman.cpp
index e15e418..78f901f 100644
--- a/src/security/diffie-hellman.cpp
+++ b/src/security/diffie-hellman.cpp
@@ -131,4 +131,4 @@
 }
 
 } // namespace tls
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/security/threadloop.cpp b/src/security/threadloop.cpp
index ab570f2..3686991 100644
--- a/src/security/threadloop.cpp
+++ b/src/security/threadloop.cpp
@@ -128,4 +128,4 @@
     ThreadLoop::stop();
     cv_.notify_one();
 }
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/security/threadloop.h b/src/security/threadloop.h
index 5852424..7e18e1b 100644
--- a/src/security/threadloop.h
+++ b/src/security/threadloop.h
@@ -126,4 +126,4 @@
     std::condition_variable cv_;
 };
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/security/tls_session.cpp b/src/security/tls_session.cpp
index ef85637..027067e 100644
--- a/src/security/tls_session.cpp
+++ b/src/security/tls_session.cpp
@@ -1780,4 +1780,4 @@
 }
 
 } // namespace tls
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/sip_utils.h b/src/sip_utils.h
index 67238fa..0f02255 100644
--- a/src/sip_utils.h
+++ b/src/sip_utils.h
@@ -167,4 +167,4 @@
 static constexpr int TRANSPORT_INFO_LENGTH {64};
 
 } // namespace sip_utils
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/string_utils.cpp b/src/string_utils.cpp
index e3141ae..d970011 100644
--- a/src/string_utils.cpp
+++ b/src/string_utils.cpp
@@ -159,4 +159,4 @@
     return output;
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/transport/peer_channel.h b/src/transport/peer_channel.h
index 62dd76e..8608a08 100644
--- a/src/transport/peer_channel.h
+++ b/src/transport/peer_channel.h
@@ -104,4 +104,4 @@
     bool stop_ {false};
 };
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/turn/turn_cache.cpp b/src/turn/turn_cache.cpp
index 12dfe8b..f351347 100644
--- a/src/turn/turn_cache.cpp
+++ b/src/turn/turn_cache.cpp
@@ -236,4 +236,4 @@
     }
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/turn/turn_transport.cpp b/src/turn/turn_transport.cpp
index bf114c7..c847e28 100644
--- a/src/turn/turn_transport.cpp
+++ b/src/turn/turn_transport.cpp
@@ -216,4 +216,4 @@
     pimpl_->shutdown();
 }
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/turn/turn_transport.h b/src/turn/turn_transport.h
index da9404e..1802073 100644
--- a/src/turn/turn_transport.h
+++ b/src/turn/turn_transport.h
@@ -52,4 +52,4 @@
     std::unique_ptr<Impl> pimpl_;
 };
 
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/igd.cpp b/src/upnp/protocol/igd.cpp
index 2b0b289..bd31a71 100644
--- a/src/upnp/protocol/igd.cpp
+++ b/src/upnp/protocol/igd.cpp
@@ -67,4 +67,4 @@
 }
 
 } // namespace upnp
-} // namespace jami
\ No newline at end of file
+} // namespace dhtnet
\ No newline at end of file
diff --git a/src/upnp/protocol/igd.h b/src/upnp/protocol/igd.h
index 5ee5549..8e8e5a9 100644
--- a/src/upnp/protocol/igd.h
+++ b/src/upnp/protocol/igd.h
@@ -104,4 +104,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp
index bcd53b5..3aa24b3 100644
--- a/src/upnp/protocol/mapping.cpp
+++ b/src/upnp/protocol/mapping.cpp
@@ -339,4 +339,4 @@
 #endif
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/natpmp/nat_pmp.cpp b/src/upnp/protocol/natpmp/nat_pmp.cpp
index b0aa78c..599205e 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.cpp
+++ b/src/upnp/protocol/natpmp/nat_pmp.cpp
@@ -765,6 +765,6 @@
 }
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
 
 #endif //-- #if HAVE_LIBNATPMP
diff --git a/src/upnp/protocol/natpmp/nat_pmp.h b/src/upnp/protocol/natpmp/nat_pmp.h
index b62b2f5..30642a0 100644
--- a/src/upnp/protocol/natpmp/nat_pmp.h
+++ b/src/upnp/protocol/natpmp/nat_pmp.h
@@ -166,4 +166,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/natpmp/pmp_igd.cpp b/src/upnp/protocol/natpmp/pmp_igd.cpp
index e43c0c6..915f492 100644
--- a/src/upnp/protocol/natpmp/pmp_igd.cpp
+++ b/src/upnp/protocol/natpmp/pmp_igd.cpp
@@ -54,4 +54,4 @@
 }
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/natpmp/pmp_igd.h b/src/upnp/protocol/natpmp/pmp_igd.h
index 84a042b..df1c44b 100644
--- a/src/upnp/protocol/natpmp/pmp_igd.h
+++ b/src/upnp/protocol/natpmp/pmp_igd.h
@@ -46,4 +46,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/pupnp/pupnp.cpp b/src/upnp/protocol/pupnp/pupnp.cpp
index ad6ef9e..e6ad85d 100644
--- a/src/upnp/protocol/pupnp/pupnp.cpp
+++ b/src/upnp/protocol/pupnp/pupnp.cpp
@@ -1589,4 +1589,4 @@
 }
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/pupnp/pupnp.h b/src/upnp/protocol/pupnp/pupnp.h
index 268846f..d45fdde 100644
--- a/src/upnp/protocol/pupnp/pupnp.h
+++ b/src/upnp/protocol/pupnp/pupnp.h
@@ -262,4 +262,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/pupnp/upnp_igd.cpp b/src/upnp/protocol/pupnp/upnp_igd.cpp
index 6e36a9b..8c8a580 100644
--- a/src/upnp/protocol/pupnp/upnp_igd.cpp
+++ b/src/upnp/protocol/pupnp/upnp_igd.cpp
@@ -65,4 +65,4 @@
 }
 
 } // namespace upnp
-} // namespace jami
\ No newline at end of file
+} // namespace dhtnet
\ No newline at end of file
diff --git a/src/upnp/protocol/pupnp/upnp_igd.h b/src/upnp/protocol/pupnp/upnp_igd.h
index 077f071..9f33505 100644
--- a/src/upnp/protocol/pupnp/upnp_igd.h
+++ b/src/upnp/protocol/pupnp/upnp_igd.h
@@ -97,4 +97,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/protocol/upnp_protocol.h b/src/upnp/protocol/upnp_protocol.h
index d960d3e..ce891e1 100644
--- a/src/upnp/protocol/upnp_protocol.h
+++ b/src/upnp/protocol/upnp_protocol.h
@@ -96,4 +96,4 @@
 };
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/upnp_context.cpp b/src/upnp/upnp_context.cpp
index c4344cf..93af971 100644
--- a/src/upnp/upnp_context.cpp
+++ b/src/upnp/upnp_context.cpp
@@ -1343,4 +1343,4 @@
 #endif
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet
diff --git a/src/upnp/upnp_control.cpp b/src/upnp/upnp_control.cpp
index 77db1ce..6c58c21 100644
--- a/src/upnp/upnp_control.cpp
+++ b/src/upnp/upnp_control.cpp
@@ -135,4 +135,4 @@
 }
 
 } // namespace upnp
-} // namespace jami
+} // namespace dhtnet