diff --git a/contracts/enumivolib/rpc.dox b/contracts/enumivolib/rpc.dox
index 299f8f9f571..30310d229d3 100644
--- a/contracts/enumivolib/rpc.dox
+++ b/contracts/enumivolib/rpc.dox
@@ -37,9 +37,9 @@ Before you can query `enudaemon` you must first enable the necessary API plugin(
 plugin = enumivo::chain_api_plugin // Enable Chain API
 plugin = enumivo::wallet_api_plugin // Enable Wallet API
 ```
-Alternatively, for Wallet API, you can also have the wallet functionality separate from `enudaemon`, by running `eos-walletd` separately.
+Alternatively, for Wallet API, you can also have the wallet functionality separate from `enudaemon`, by running `enuwalletd` separately.
 
-For the following guide, we will assume that we have `enudaemon` running on `127.0.0.1:8888` (Chain API Plugin enabled, Wallet API Plugin disabled) and `eos-walletd` running on `127.0.0.1:8889`.
+For the following guide, we will assume that we have `enudaemon` running on `127.0.0.1:8888` (Chain API Plugin enabled, Wallet API Plugin disabled) and `enuwalletd` running on `127.0.0.1:8889`.
 
 ===
 
diff --git a/plugins/wallet_plugin/wallet_manager.cpp b/plugins/wallet_plugin/wallet_manager.cpp
index 0ad69ff230b..d3aba261063 100644
--- a/plugins/wallet_plugin/wallet_manager.cpp
+++ b/plugins/wallet_plugin/wallet_manager.cpp
@@ -53,7 +53,7 @@ std::string wallet_manager::create(const std::string& name) {
    wallet->unlock(password);
    
    // If we have name in our map then remove it since we want the emplace below to replace.
-   // This can happen if the wallet file is removed while enu-walletd is running.
+   // This can happen if the wallet file is removed while enuwalletd is running.
    auto it = wallets.find(name);
    if (it != wallets.end()) {
       wallets.erase(it);
@@ -74,7 +74,7 @@ void wallet_manager::open(const std::string& name) {
    }
 
    // If we have name in our map then remove it since we want the emplace below to replace.
-   // This can happen if the wallet file is added while enu-walletd is running.
+   // This can happen if the wallet file is added while enuwalletd is running.
    auto it = wallets.find(name);
    if (it != wallets.end()) {
       wallets.erase(it);
diff --git a/programs/enucli/eosc.pot b/programs/enucli/eosc.pot
index bf826afe32a..1256fa87c3a 100644
--- a/programs/enucli/eosc.pot
+++ b/programs/enucli/eosc.pot
@@ -136,10 +136,10 @@ msgstr ""
 msgid "the port where enudaemon is running"
 msgstr ""
 
-msgid "the host where enu-walletd is running"
+msgid "the host where enuwalletd is running"
 msgstr ""
 
-msgid "the port where enu-walletd is running"
+msgid "the port where enuwalletd is running"
 msgstr ""
 
 msgid "output verbose messages on error"
@@ -499,7 +499,7 @@ msgstr ""
 msgid "Failed to connect to enu at ${ip}:${port}; is enudaemon running?"
 msgstr ""
 
-msgid "Failed to connect to enu-walletd at ${ip}:${port}; is enu-walletd running?"
+msgid "Failed to connect to enuwalletd at ${ip}:${port}; is enuwalletd running?"
 msgstr ""
 
 msgid "Failed to connect"
diff --git a/tests/consensus-validation-malicious-producers.py b/tests/consensus-validation-malicious-producers.py
index 18e94705e72..b739d4dd2ea 100755
--- a/tests/consensus-validation-malicious-producers.py
+++ b/tests/consensus-validation-malicious-producers.py
@@ -236,7 +236,7 @@ def error(msg="", errorCode=1):
 def myTest(transWillEnterBlock):
     testSuccessful=False
 
-    cluster=testUtils.Cluster(walletd=True, staging=True)
+    cluster=testUtils.Cluster(enuwalletd=True, staging=True)
     walletMgr=testUtils.WalletMgr(True)
 
     try:
@@ -261,9 +261,9 @@ def myTest(transWillEnterBlock):
         currencyAccount=accounts[0]
         currencyAccount.name="currency0000"
 
-        Print("Stand up walletd")
+        Print("Stand up enuwalletd")
         if walletMgr.launch() is False:
-            error("Failed to stand up enu walletd.")
+            error("Failed to stand up enuwalletd.")
             return False
 
         testWalletName="test"
diff --git a/tests/distributed-transactions-test.py b/tests/distributed-transactions-test.py
index ff6634689f2..8ab1deb984a 100755
--- a/tests/distributed-transactions-test.py
+++ b/tests/distributed-transactions-test.py
@@ -46,7 +46,7 @@ def errorExit(msg="", errorCode=1):
 testSuccessful=False
 
 random.seed(seed) # Use a fixed seed for repeatability.
-cluster=testUtils.Cluster(walletd=True)
+cluster=testUtils.Cluster(enuwalletd=True)
 walletMgr=testUtils.WalletMgr(True)
 
 try:
diff --git a/tests/enunode_run_test.py b/tests/enunode_run_test.py
index b982ca33685..7370cd51914 100755
--- a/tests/enunode_run_test.py
+++ b/tests/enunode_run_test.py
@@ -68,13 +68,13 @@ def cmdError(name, cmdCode=0, exitNow=False):
 
 testUtils.Utils.Debug=debug
 localTest=True if server == LOCAL_HOST else False
-cluster=testUtils.Cluster(walletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
+cluster=testUtils.Cluster(enuwalletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
 walletMgr=testUtils.WalletMgr(True)
 testSuccessful=False
 killEnuInstances=not dontKill
 killWallet=not dontKill
 
-WalletdName="enuwallet"
+EnuWalletDName="enuwallet"
 ClientName="enucli"
 # testUtils.Utils.setMongoSyncTime(50)
 
@@ -127,12 +127,12 @@ def cmdError(name, cmdCode=0, exitNow=False):
     exchangeAccount.ownerPrivateKey=PRV_KEY2
     exchangeAccount.ownerPublicKey=PUB_KEY2
 
-    Print("Stand up walletd")
+    Print("Stand up enuwalletd")
     walletMgr.killall()
     walletMgr.cleanup()
     if walletMgr.launch() is False:
-        cmdError("%s" % (WalletdName))
-        errorExit("Failed to stand up enu walletd.")
+        cmdError("%s" % (EnuWalletDName))
+        errorExit("Failed to stand up enuwalletd.")
 
     testWalletName="test"
     Print("Creating wallet \"%s\"." % (testWalletName))
diff --git a/tests/nodeos_run_test.py b/tests/nodeos_run_test.py
index 50ed0fa4754..dff7d03627f 100644
--- a/tests/nodeos_run_test.py
+++ b/tests/nodeos_run_test.py
@@ -68,13 +68,13 @@ def cmdError(name, cmdCode=0, exitNow=False):
 
 testUtils.Utils.Debug=debug
 localTest=True if server == LOCAL_HOST else False
-cluster=testUtils.Cluster(walletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
+cluster=testUtils.Cluster(enuwalletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey)
 walletMgr=testUtils.WalletMgr(True)
 testSuccessful=False
 killEnuInstances=not dontKill
 killWallet=not dontKill
 
-WalletdName="enuwallet"
+EnuWalletDName="enuwallet"
 ClientName="enucli"
 # testUtils.Utils.setMongoSyncTime(50)
 
@@ -124,12 +124,12 @@ def cmdError(name, cmdCode=0, exitNow=False):
     exchangeAccount.ownerPrivateKey=PRV_KEY2
     exchangeAccount.ownerPublicKey=PUB_KEY2
 
-    Print("Stand up walletd")
+    Print("Stand up enuwalletd")
     walletMgr.killall()
     walletMgr.cleanup()
     if walletMgr.launch() is False:
-        cmdError("%s" % (WalletdName))
-        errorExit("Failed to stand up enu walletd.")
+        cmdError("%s" % (EnuWalletDName))
+        errorExit("Failed to stand up enuwalletd.")
 
     testWalletName="test"
     Print("Creating wallet \"%s\"." % (testWalletName))
diff --git a/tests/p2p_network_test.py b/tests/p2p_network_test.py
index 4d52cf051ad..56ed861b136 100755
--- a/tests/p2p_network_test.py
+++ b/tests/p2p_network_test.py
@@ -39,7 +39,7 @@
 parser.add_argument("--impaired_network", help="test impaired network", action='store_true')
 parser.add_argument("--lossy_network", help="test lossy network", action='store_true')
 parser.add_argument("--stress_network", help="test load/stress network", action='store_true')
-parser.add_argument("--not_kill_wallet", help="not killing walletd", action='store_true')
+parser.add_argument("--not_kill_wallet", help="not killing enuwalletd", action='store_true')
 
 args = parser.parse_args()
 testOutputFile=args.output
@@ -58,7 +58,7 @@
 else:
     errorExit("one of impaired_network, lossy_network or stress_network must be set. Please also check peer configs in p2p_test_peers.py.")
 
-cluster=testUtils.Cluster(walletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey, walletHost=args.wallet_host, walletPort=args.wallet_port)
+cluster=testUtils.Cluster(enuwalletd=True, enableMongo=enableMongo, defproduceraPrvtKey=defproduceraPrvtKey, defproducerbPrvtKey=defproducerbPrvtKey, walletHost=args.wallet_host, walletPort=args.wallet_port)
 
 print("BEGIN")
 print("TEST_OUTPUT: %s" % (testOutputFile))
@@ -107,10 +107,10 @@
 exchangeAccount.ownerPrivateKey=PRV_KEY2
 exchangeAccount.ownerPublicKey=PUB_KEY2
 
-print("Stand up walletd")
+print("Stand up enuwalletd")
 if walletMgr.launch() is False:
-    cmdError("%s" % (WalletdName))
-    errorExit("Failed to stand up enu walletd.")
+    cmdError("%s" % (EnuWalletDName))
+    errorExit("Failed to stand up enuwalletd.")
 
 testWalletName="test"
 Print("Creating wallet \"%s\"." % (testWalletName))
diff --git a/tests/testUtils.py b/tests/testUtils.py
index 44b1c716358..65d5a664354 100755
--- a/tests/testUtils.py
+++ b/tests/testUtils.py
@@ -1064,9 +1064,9 @@ class WalletMgr(object):
     __walletDataDir="test_wallet_0"
 
     # pylint: disable=too-many-arguments
-    # walletd [True|False] True=Launch wallet(enuwallet) process; False=Manage launch process externally.
-    def __init__(self, walletd, enunodePort=8888, enunodeHost="localhost", port=8899, host="localhost"):
-        self.walletd=walletd
+    # enuwalletd [True|False] True=Launch wallet(enuwallet) process; False=Manage launch process externally.
+    def __init__(self, enuwalletd, enunodePort=8888, enunodeHost="localhost", port=8899, host="localhost"):
+        self.enuwalletd=enuwalletd
         self.enunodePort=enunodePort
         self.enunodeHost=enunodeHost
         self.port=port
@@ -1075,12 +1075,12 @@ def __init__(self, walletd, enunodePort=8888, enunodeHost="localhost", port=8899
         self.__walletPid=None
         self.endpointArgs="--url http://%s:%d" % (self.enunodeHost, self.enunodePort)
         self.walletEndpointArgs=""
-        if self.walletd:
+        if self.enuwalletd:
             self.walletEndpointArgs += " --wallet-url http://%s:%d" % (self.host, self.port)
             self.endpointArgs += self.walletEndpointArgs
 
     def launch(self):
-        if not self.walletd:
+        if not self.enuwalletd:
             Utils.Print("ERROR: Wallet Manager wasn't configured to launch enuwallet")
             return False
 
@@ -1244,10 +1244,10 @@ class Cluster(object):
     __BiosPort=8788
     
     # pylint: disable=too-many-arguments
-    # walletd [True|False] Is enuwallet running. If not load the wallet plugin
-    def __init__(self, walletd=False, localCluster=True, host="localhost", port=8888, walletHost="localhost", walletPort=8899, enableMongo=False, mongoHost="localhost", mongoPort=27017, mongoDb="ENUtest", defproduceraPrvtKey=None, defproducerbPrvtKey=None, staging=False):
+    # enuwalletd [True|False] Is enuwallet running. If not load the wallet plugin
+    def __init__(self, enuwalletd=False, localCluster=True, host="localhost", port=8888, walletHost="localhost", walletPort=8899, enableMongo=False, mongoHost="localhost", mongoPort=27017, mongoDb="ENUtest", defproduceraPrvtKey=None, defproducerbPrvtKey=None, staging=False):
         """Cluster container.
-        walletd [True|False] Is wallet enuwallet running. If not load the wallet plugin
+        enuwalletd [True|False] Is wallet enuwallet running. If not load the wallet plugin
         localCluster [True|False] Is cluster local to host.
         host: enu server host
         port: enu server port
@@ -1263,7 +1263,7 @@ def __init__(self, walletd=False, localCluster=True, host="localhost", port=8888
         self.nodes={}
         self.localCluster=localCluster
         self.wallet=None
-        self.walletd=walletd
+        self.enuwalletd=enuwalletd
         self.enableMongo=enableMongo
         self.mongoHost=mongoHost
         self.mongoPort=mongoPort
@@ -1274,7 +1274,7 @@ def __init__(self, walletd=False, localCluster=True, host="localhost", port=8888
         self.walletHost=walletHost
         self.walletPort=walletPort
         self.walletEndpointArgs=""
-        if self.walletd:
+        if self.enuwalletd:
             self.walletEndpointArgs += " --wallet-url http://%s:%d" % (self.walletHost, self.walletPort)
         self.mongoEndpointArgs=""
         self.mongoUri=""
@@ -1328,7 +1328,7 @@ def launch(self, pnodes=1, totalNodes=1, prodCount=1, topo="mesh", delay=1, only
             cmdArr.append("--nogen")
 
         enunodeArgs="--max-transaction-time 5000"
-        if not self.walletd:
+        if not self.enuwalletd:
             enunodeArgs += " --plugin enumivo::wallet_api_plugin"
         if self.enableMongo:
             enunodeArgs += " --plugin enumivo::mongo_db_plugin --resync --mongodb-uri %s" % self.mongoUri