diff --git a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
index 1da9cd4c6..08b6c1694 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/MetaInfo.java
@@ -856,7 +856,7 @@ public class MetaInfo
       String announce = null;
       List<String> url_list = null;
       String comment = null;
-      Getopt g = new Getopt("Storage", args, "a:c:m:w:");
+      Getopt g = new Getopt("MetaInfo", args, "a:c:m:w:");
       try {
           int c;
           while ((c = g.getopt()) != -1) {
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
index a96a9e9f1..2b7fa66f6 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
@@ -95,7 +95,7 @@ public class I2Ping extends I2PTunnelClientBase {
       int remotePort = 0;
       boolean error = false;
       String[] argv = DataHelper.split(cmd, " ");
-      Getopt g = new Getopt("ping", argv, "t:m:n:chl:f:p:");
+      Getopt g = new Getopt("i2ping", argv, "t:m:n:chl:f:p:");
       int c;
       while ((c = g.getopt()) != -1) {
         switch (c) {
diff --git a/core/java/src/net/i2p/data/PrivateKeyFile.java b/core/java/src/net/i2p/data/PrivateKeyFile.java
index f8f0a3e36..d5c7aeef2 100644
--- a/core/java/src/net/i2p/data/PrivateKeyFile.java
+++ b/core/java/src/net/i2p/data/PrivateKeyFile.java
@@ -119,7 +119,7 @@ public class PrivateKeyFile {
         double days = 365;
         int mode = 0;
         boolean error = false;
-        Getopt g = new Getopt("pkf", args, "t:nuxhse:c:a:o:d:r:p:b:y:z:w:");
+        Getopt g = new Getopt("PrivateKeyFile", args, "t:nuxhse:c:a:o:d:r:p:b:y:z:w:v:V:");
         int c;
         while ((c = g.getopt()) != -1) {
           switch (c) {
diff --git a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
index 74e816aaa..a7a32fdc0 100644
--- a/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
+++ b/installer/tools/java/src/net/i2p/router/networkdb/kademlia/BundleRouterInfos.java
@@ -46,7 +46,7 @@ import net.i2p.util.FileUtil;
 public class BundleRouterInfos {
 
     /**
-     *  Usage: PersistentDataStore -i configDir -o toDir -c count
+     *  Usage: BundleRouterInfos -i configDir -o toDir -c count
      *
      *  Copy a random selection of 'count' router infos from configDir/netDb
      *  to 'toDir'. Skip your own router info, and old, hidden, unreachable, and
@@ -55,7 +55,7 @@ public class BundleRouterInfos {
      *  @since 0.9.15
      */
     public static void main(String[] args) {
-        Getopt g = new Getopt("PersistentDataStore", args, "i:o:c:");
+        Getopt g = new Getopt("BundleRouterInfos", args, "i:o:c:");
         String in = System.getProperty("user.home") + "/.i2p";
         String out = "netDb";
         int count = 200;
diff --git a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
index f4df6139d..c55f0095f 100644
--- a/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
+++ b/router/java/test/junit/net/i2p/router/client/LocalClientManager.java
@@ -116,7 +116,7 @@ class LocalClientManager extends ClientManager {
         int dropX1000 = 0, jitter = 0, latency = 0;
         int port = ClientManagerFacadeImpl.DEFAULT_PORT;
         boolean error = false;
-        Getopt g = new Getopt("router", args, "d:j:l:p:");
+        Getopt g = new Getopt("LocalClientManager", args, "d:j:l:p:");
         try {
             int c;
             while ((c = g.getopt()) != -1) {