diff --git a/include/upnp/mapping.h b/include/upnp/mapping.h
index a781022..ebcbdaa 100644
--- a/include/upnp/mapping.h
+++ b/include/upnp/mapping.h
@@ -30,7 +30,7 @@
 #include <mutex>
 #include <memory>
 
-namespace jami {
+namespace dhtnet {
 namespace upnp {
 
 using sys_clock = std::chrono::system_clock;
diff --git a/include/upnp/upnp_context.h b/include/upnp/upnp_context.h
index b9a5d26..57b45d6 100644
--- a/include/upnp/upnp_context.h
+++ b/include/upnp/upnp_context.h
@@ -56,11 +56,11 @@
 
 using IgdFoundCallback = std::function<void()>;
 
-namespace jami {
+namespace dhtnet {
 class IpAddr;
 }
 
-namespace jami {
+namespace dhtnet {
 namespace upnp {
 
 class UPnPProtocol;
diff --git a/include/upnp/upnp_control.h b/include/upnp/upnp_control.h
index e68cada..c9949b4 100644
--- a/include/upnp/upnp_control.h
+++ b/include/upnp/upnp_control.h
@@ -28,11 +28,11 @@
 #include <memory>
 #include <chrono>
 
-namespace jami {
+namespace dhtnet {
 class IpAddr;
 }
 
-namespace jami {
+namespace dhtnet {
 namespace upnp {
 
 class UPnPContext;
diff --git a/include/upnp/upnp_thread_util.h b/include/upnp/upnp_thread_util.h
index 6bc5271..564a6eb 100644
--- a/include/upnp/upnp_thread_util.h
+++ b/include/upnp/upnp_thread_util.h
@@ -13,7 +13,7 @@
         /*JAMI_ERR() << "The calling thread " << getCurrentThread() \
                    << " is not the expected thread: " << threadId_;*/
 
-namespace jami {
+namespace dhtnet {
 namespace upnp {
 
 class UpnpThreadUtil