diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/SSLClientUtil.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/SSLClientUtil.java
index b08b3ebe5..db4cd6951 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/SSLClientUtil.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/SSLClientUtil.java
@@ -102,8 +102,7 @@ public class SSLClientUtil {
     private static boolean createKeyStore(File ks, String name, Properties opts, String optPfx) {
         // make a random 48 character password (30 * 8 / 5)
         String keyPassword = KeyStoreUtil.randomString();
-        // and one for the cname
-        String cname = name + ".i2ptunnel.i2p.net";
+        String cname = "localhost";
 
         String keyName = opts.getProperty(optPfx + PROP_KEY_ALIAS);
         boolean success = KeyStoreUtil.createKeys(ks, keyName, cname, "I2PTUNNEL", keyPassword);
@@ -116,7 +115,7 @@ public class SSLClientUtil {
         }
         if (success) {
             logAlways("Created self-signed certificate for " + cname + " in keystore: " + ks.getAbsolutePath() + "\n" +
-                           "The certificate name was generated randomly, and is not associated with your " +
+                           "The certificate was generated randomly, and is not associated with your " +
                            "IP address, host name, router identity, or destination keys.");
         } else {
             error("Failed to create I2PTunnel SSL keystore.\n" +
diff --git a/apps/sam/java/src/net/i2p/sam/SSLUtil.java b/apps/sam/java/src/net/i2p/sam/SSLUtil.java
index f21f8fbc4..496b72d63 100644
--- a/apps/sam/java/src/net/i2p/sam/SSLUtil.java
+++ b/apps/sam/java/src/net/i2p/sam/SSLUtil.java
@@ -88,8 +88,7 @@ class SSLUtil {
     private static boolean createKeyStore(File ks, String name, Properties opts) {
         // make a random 48 character password (30 * 8 / 5)
         String keyPassword = KeyStoreUtil.randomString();
-        // and one for the cname
-        String cname = name + ".sam.i2p.net";
+        String cname = "localhost";
 
         String keyName = opts.getProperty(PROP_KEY_ALIAS);
         boolean success = KeyStoreUtil.createKeys(ks, keyName, cname, "SAM", keyPassword);
@@ -102,7 +101,7 @@ class SSLUtil {
         }
         if (success) {
             logAlways("Created self-signed certificate for " + cname + " in keystore: " + ks.getAbsolutePath() + "\n" +
-                           "The certificate name was generated randomly, and is not associated with your " +
+                           "The certificate was generated randomly, and is not associated with your " +
                            "IP address, host name, router identity, or destination keys.");
         } else {
             error("Failed to create SAM SSL keystore.\n" +
diff --git a/apps/sam/java/src/net/i2p/sam/client/SSLUtil.java b/apps/sam/java/src/net/i2p/sam/client/SSLUtil.java
index d7fb4f354..8f16eb22e 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SSLUtil.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SSLUtil.java
@@ -89,8 +89,7 @@ class SSLUtil {
     private static boolean createKeyStore(File ks, String name, Properties opts) {
         // make a random 48 character password (30 * 8 / 5)
         String keyPassword = KeyStoreUtil.randomString();
-        // and one for the cname
-        String cname = name + ".sam.i2p.net";
+        String cname = "localhost";
 
         String keyName = opts.getProperty(PROP_KEY_ALIAS);
         boolean success = KeyStoreUtil.createKeys(ks, keyName, cname, "SAM", keyPassword);
@@ -103,7 +102,7 @@ class SSLUtil {
         }
         if (success) {
             logAlways("Created self-signed certificate for " + cname + " in keystore: " + ks.getAbsolutePath() + "\n" +
-                           "The certificate name was generated randomly, and is not associated with your " +
+                           "The certificate was generated randomly, and is not associated with your " +
                            "IP address, host name, router identity, or destination keys.");
         } else {
             error("Failed to create SAM SSL keystore.\n" +
diff --git a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java
index 1fb7de3cd..8331e7794 100644
--- a/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java
+++ b/router/java/src/net/i2p/router/client/SSLClientListenerRunner.java
@@ -82,8 +82,7 @@ class SSLClientListenerRunner extends ClientListenerRunner {
     private boolean createKeyStore(File ks) {
         // make a random 48 character password (30 * 8 / 5)
         String keyPassword = KeyStoreUtil.randomString();
-        // and one for the cname
-        String cname = KeyStoreUtil.randomString() + ".i2cp.i2p.net";
+        String cname = "localhost";
 
         boolean success = KeyStoreUtil.createKeys(ks, KEY_ALIAS, cname, "I2CP", keyPassword);
         if (success) {
@@ -97,7 +96,7 @@ class SSLClientListenerRunner extends ClientListenerRunner {
         }
         if (success) {
             _log.logAlways(Log.INFO, "Created self-signed certificate for " + cname + " in keystore: " + ks.getAbsolutePath() + "\n" +
-                           "The certificate name was generated randomly, and is not associated with your " +
+                           "The certificate was generated randomly, and is not associated with your " +
                            "IP address, host name, router identity, or destination keys.");
         } else {
             _log.error("Failed to create I2CP SSL keystore.\n" +