fix remaining bitmonero and simplewallet bits

4 files changed, 10 insertions, 10 deletions

diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index f5445b48a..7a4feeac4 100644
--- a/src/cryptonote_core/cryptonote_core.cpp
+++ b/src/cryptonote_core/cryptonote_core.cpp
@@ -280,8 +280,8 @@ namespace cryptonote
       {
         LOG_PRINT_RED_L0("Found old-style blockchain.bin in " << old_files.string());
         LOG_PRINT_RED_L0("Monero now uses a new format. You can either remove blockchain.bin to start syncing");
-        LOG_PRINT_RED_L0("the blockchain anew, or use blockchain_export and blockchain_import to convert your");
-        LOG_PRINT_RED_L0("existing blockchain.bin to the new format. See README.md for instructions.");
+        LOG_PRINT_RED_L0("the blockchain anew, or use monero-blockchain-import and monero-blockchain-export to");
+        LOG_PRINT_RED_L0("convert your existing blockchain.bin to the new format. See README.md for instructions.");
         return false;
       }
     }
diff --git a/src/cryptonote_protocol/cryptonote_protocol_handler.inl b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
index 81d96d5bf..f16dad281 100644
--- a/src/cryptonote_protocol/cryptonote_protocol_handler.inl
+++ b/src/cryptonote_protocol/cryptonote_protocol_handler.inl
@@ -706,7 +706,7 @@ namespace cryptonote
     if(m_synchronized.compare_exchange_strong(val_expected, true))
     {
       LOG_PRINT_L0(ENDL << "**********************************************************************" << ENDL
-        << "You are now synchronized with the network. You may now start simplewallet." << ENDL
+        << "You are now synchronized with the network. You may now start monero-wallet-cli." << ENDL
         << ENDL
         << "Please note, that the blockchain will be saved only after you quit the daemon with \"exit\" command or if you use \"save\" command." << ENDL
         << "Otherwise, you will possibly need to synchronize the blockchain again." << ENDL
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index fba3e5398..f10a5a3a6 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -923,10 +923,10 @@ bool t_rpc_command_executor::print_status()
   bool daemon_is_alive = m_rpc_client->check_connection();
 
   if(daemon_is_alive) {
-    tools::success_msg_writer() << "bitmonerod is running";
+    tools::success_msg_writer() << "monerod is running";
   }
   else {
-    tools::fail_msg_writer() << "bitmonerod is NOT running";
+    tools::fail_msg_writer() << "monerod is NOT running";
   }
 
   return true;
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp
index c1b0a2a95..421d1f53a 100644
--- a/src/simplewallet/simplewallet.cpp
+++ b/src/simplewallet/simplewallet.cpp
@@ -1598,7 +1598,7 @@ bool simple_wallet::new_wallet(const std::string &wallet_file, const std::string
     tr("Your wallet has been generated!\n"
     "To start synchronizing with the daemon, use \"refresh\" command.\n"
     "Use \"help\" command to see the list of available commands.\n"
-    "Always use \"exit\" command when closing simplewallet to save your\n"
+    "Always use \"exit\" command when closing monero-wallet-cli to save your\n"
     "current session's state. Otherwise, you might need to synchronize \n"
     "your wallet again (your wallet keys are NOT at risk in any case).\n")
   ;
@@ -3746,7 +3746,7 @@ int main(int argc, char* argv[])
       return false;
     }
     // epee didn't find path to executable from argv[0], so use this default file name.
-    log_file_name = "simplewallet.log";
+    log_file_name = "monero-wallet-cli.log";
     // The full path will use cwd because epee also returned an empty default log folder.
   }
   default_log /= log_file_name;
@@ -3779,7 +3779,7 @@ int main(int argc, char* argv[])
     if (command_line::get_arg(vm, command_line::arg_help))
     {
       success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
-      success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
+      success_msg_writer() << sw::tr("Usage:") << " monero-wallet-cli [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
       success_msg_writer() << desc_all;
       return false;
     }
@@ -3798,8 +3798,8 @@ int main(int argc, char* argv[])
     return 0;
 
   // log_file_path
-  //   default: < argv[0] directory >/simplewallet.log
-  //     so if ran as "simplewallet" (no path), log file will be in cwd
+  //   default: < argv[0] directory >/monero-wallet-cli.log
+  //     so if ran as "monero-wallet-cli" (no path), log file will be in cwd
   //
   //   if log-file argument given:
   //     absolute path