diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
index 41106a49badc4040be895aaee1c21eb1d30e8004..0deb8ae51597578c9284d2ff2e9ed8feabd61d36 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java
@@ -113,7 +113,9 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     protected static I2PSocketManager buildSocketManager() {
         Properties props = new Properties();
         props.putAll(System.getProperties());
-        return I2PSocketManagerFactory.createManager(I2PTunnel.host, Integer.parseInt(I2PTunnel.port), props);
+        I2PSocketManager sockManager = I2PSocketManagerFactory.createManager(I2PTunnel.host, Integer.parseInt(I2PTunnel.port), props);
+        sockManager.setName("Client");
+        return sockManager;
     }
 
     public final int getLocalPort() {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
index 4f2407467297832b5075d58f38dee6f734719283..5b9f8eb529e96b8516ebb7a6da32d5907b95c5e3 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java
@@ -79,6 +79,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable {
                                                             props);
 
         }
+        sockMgr.setName("Server");
         l.log("Ready!");
         notifyEvent("openServerResult", "ok");
         open = true;