diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
index 87db11082..c2bf45e1e 100644
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -1577,8 +1577,8 @@ void ThreadTopUpKeyPool(void* parg)
 
 void ThreadCleanWalletPassphrase(void* parg)
 {
-    // Make this thread recognisable as the wallet unlocking thread
-    RenameThread("bitcoin-unlo-wa");
+    // Make this thread recognisable as the wallet relocking thread
+    RenameThread("bitcoin-lock-wa");
 
     int64 nMyWakeTime = GetTimeMillis() + *((int64*)parg) * 1000;
 
diff --git a/src/main.cpp b/src/main.cpp
index bcc5e60d7..c4472c455 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3595,7 +3595,7 @@ void static BitcoinMiner(CWallet *pwallet)
     SetThreadPriority(THREAD_PRIORITY_LOWEST);
 
     // Make this thread recognisable as the mining thread
-    RenameThread("bitcoin [miner]");
+    RenameThread("bitcoin-miner");
 
     // Each thread has its own key and counter
     CReserveKey reservekey(pwallet);
diff --git a/src/net.cpp b/src/net.cpp
index 000a10d85..78b5a752d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -641,7 +641,7 @@ void ThreadSocketHandler(void* parg)
     IMPLEMENT_RANDOMIZE_STACK(ThreadSocketHandler(parg));
 
     // Make this thread recognisable as the networking thread
-    RenameThread("bitcoind [net]");
+    RenameThread("bitcoin-net");
 
     try
     {
@@ -997,7 +997,7 @@ void ThreadMapPort(void* parg)
     IMPLEMENT_RANDOMIZE_STACK(ThreadMapPort(parg));
 
     // Make this thread recognisable as the UPnP thread
-    RenameThread("bitcoind [UPnP]");
+    RenameThread("bitcoin-UPnP");
 
     try
     {
@@ -1884,7 +1884,7 @@ void static Discover()
 void StartNode(void* parg)
 {
     // Make this thread recognisable as the startup thread
-    RenameThread("bitcoin [start]");
+    RenameThread("bitcoin-start");
 
     if (semOutbound == NULL) {
         // initialize semaphore