diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
index 7804cbc08..bb9aeb580 100644
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -86,7 +86,7 @@ static bool AppInitRPC(int argc, char* argv[])
     // Parameters
     //
     ParseParameters(argc, argv);
-    komodo_args();
+    komodo_args(argv[0]);
     if (argc<2 || mapArgs.count("-?") || mapArgs.count("-h") || mapArgs.count("-help") || mapArgs.count("-version")) {
         std::string strUsage = _("Komodo RPC client version") + " " + FormatFullVersion() + "\n" + PrivacyInfo();
         if (!mapArgs.count("-version")) {
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
index 7679fa961..8a840a343 100644
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -106,9 +106,9 @@ bool AppInit(int argc, char* argv[])
 
     try
     {
-        void komodo_args();
-        komodo_args();
-        fprintf(stderr,"call komodo_args NOTARY_PUBKEY.(%s)\n",NOTARY_PUBKEY.c_str());
+        void komodo_args(char *argv0);
+        komodo_args(argv[0]);
+        fprintf(stderr,"call komodo_args.(%s) NOTARY_PUBKEY.(%s)\n",argv[0],NOTARY_PUBKEY.c_str());
         while ( ASSETCHAIN_INIT == 0 )
         {
             //if ( komodo_is_issuer() != 0 )
diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 28e91b540..9a0a3bb16 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1468,10 +1468,20 @@ int32_t komodo_whoami(char *pubkeystr,int32_t height)
     return(notaryid);
 }
 
-void komodo_args()
+char *argv0suffix[] =
+{
+    (char *)"mnzd", (char *)"mnz-cli", (char *)"mnzd.exe", (char *)"mnz-cli.exe"
+};
+
+char *argv0names[] =
+{
+    (char *)"MNZ", (char *)"MNZ", (char *)"MNZ", (char *)"MNZ"
+};
+
+void komodo_args(char *argv0)
 {
     extern int64_t MAX_MONEY;
-    std::string name,addn; char *dirname,fname[512],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len;
+    std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4]; FILE *fp; int32_t i,baseid,len,n;
     IS_KOMODO_NOTARY = GetBoolArg("-notary", false);
     if ( (KOMODO_EXCHANGEWALLET= GetBoolArg("-exchange", false)) != 0 )
         fprintf(stderr,"KOMODO_EXCHANGEWALLET mode active\n");
@@ -1482,6 +1492,20 @@ void komodo_args()
         KOMODO_PAX = 1;
     } else KOMODO_PAX = GetArg("-pax",0);
     name = GetArg("-ac_name","");
+    if ( argv0 != 0 )
+    {
+        len = (int32_t)strlen(argv0);
+        for (i=0; i<sizeof(argv0suffix)/sizeof(*argv0suffix); i++)
+        {
+            n = (int32_t)strlen(argv0suffix[i]);
+            if ( strcmp(&argv0[len - n],argv0suffix[i]) == 0 )
+            {
+                printf("ARGV0.(%s) -> matches suffix (%s) -> ac_name.(%s)\n",argv0,argv0suffix[i],argv0names[i]);
+                name = argv0names[i];
+                break;
+            }
+        }
+    }
     if ( (KOMODO_REWIND= GetArg("-rewind",0)) != 0 )
     {
         printf("KOMODO_REWIND %d\n",KOMODO_REWIND);