Merge pull request #1041

011e42f fix nigglies, as pointed out by moneromooo-monero (Riccardo Spagni)
df63e07 fix remaining bitmonero and simplewallet bits (Riccardo Spagni)
04b120f fix blockchain utilities readme (Riccardo Spagni)
f1d4e4a readme fixes, small Docker fix (Riccardo Spagni)
9a525e0 rename systemd bits to monero (Riccardo Spagni)
011c94c change CMake project name (Riccardo Spagni)
50dc4fb update Dockerfile bitmonero refs (Riccardo Spagni)

5 files changed, 24 insertions, 56 deletions

diff --git a/src/blockchain_utilities/README.md b/src/blockchain_utilities/README.md
index 7df6937ad..809df3bfa 100644
--- a/src/blockchain_utilities/README.md
+++ b/src/blockchain_utilities/README.md
@@ -4,41 +4,24 @@ Copyright (c) 2014-2016, The Monero Project
 
 ## Introduction
 
-The blockchain utilities allow one to convert an old style blockchain.bin file
-to a new style database. There are two ways to upgrade an old style blockchain:
-The recommended way is to run a `blockchain_export`, then `blockchain_import`.
-The other way is to run `blockchain_converter`. In both cases, you will be left
-with a new style blockchain.
-
-For importing into the LMDB database, compile with `DATABASE=lmdb`
-
-e.g.
-
-`DATABASE=lmdb make release`
-
-This is also the default compile setting on the master branch.
-
-The exporter will use the LMDB database as its source.
-If you are still using an old style in-memory database (blockchain.bin), you will
-have to either resync from scratch, or use an older version of the tools to export
-it and import it.
+The blockchain utilities allow one to import and export the blockchain.
 
 ## Usage:
 
 See also each utility's "--help" option.
 
-### Export an existing in-memory database
+### Export an existing blockchain database
 
-`$ blockchain_export`
+`$ monero-blockchain-export`
 
-This loads the existing blockchain, for whichever database type it was compiled for, and exports it to `$MONERO_DATA_DIR/export/blockchain.raw`
+This loads the existing blockchain and exports it to `$MONERO_DATA_DIR/export/blockchain.raw`
 
 ### Import the exported file
 
-`$ blockchain_import`
+`$ monero-blockchain-import`
 
-This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the `blockchain_export` tool as described above)
-into the current database.
+This imports blocks from `$MONERO_DATA_DIR/export/blockchain.raw` (exported using the
+`monero-blockchain-export` tool as described above) into the current database.
 
 Defaults: `--batch on`, `--batch size 20000`, `--verify on`
 
@@ -47,14 +30,14 @@ Batch size refers to number of blocks and can be adjusted for performance based
 Verification should only be turned off if importing from a trusted blockchain.
 
 If you encounter an error like "resizing not supported in batch mode", you can just re-run
-the `blockchain_import` command again, and it will restart from where it left off.
+the `monero-blockchain-import` command again, and it will restart from where it left off.
 
 ```bash
 ## use default settings to import blockchain.raw into database
-$ blockchain_import
+$ monero-blockchain-import
 
 ## fast import with large batch size, database mode "fastest", verification off
-$ blockchain_import --batch-size 20000 --database lmdb#fastest --verify off
+$ monero-blockchain-import --batch-size 20000 --database lmdb#fastest --verify off
 
 ```
 
@@ -77,7 +60,7 @@ stop at block number
 
 `--database <database type>#<flag(s)>`
 
-database type: `lmdb, berkeley, memory`
+database type: `lmdb, memory`
 
 flags:
 
@@ -94,27 +77,12 @@ LMDB flags (more than one may be specified):
 
 `nosync, nometasync, writemap, mapasync, nordahead`
 
-BerkeleyDB flags (takes one):
-
-`txn_write_nosync, txn_nosync, txn_sync`
-
-```
 ## Examples:
-$ blockchain_import --database lmdb#fastest
-$ blockchain_import --database berkeley#fastest
-
-$ blockchain_import --database lmdb#nosync
-$ blockchain_import --database lmdb#nosync,nometasync
 
-$ blockchain_import --database berkeley#txn_nosync
 ```
+$ monero-blockchain-import --database lmdb#fastest
 
+$ monero-blockchain-import --database lmdb#nosync
 
-### Blockchain converter with batching
-`blockchain_converter` has also been updated and includes batching for faster writes. However, on lower RAM systems, this will be slower than using the exporter and importer utilities. The converter needs to keep the blockchain in memory for the duration of the conversion, like the original bitmonerod, thus leaving less memory available to the destination database to operate.
-
-Due to higher resource use, it is recommended to use the importer with an exported file instead of the converter.
-
-```bash
-$ blockchain_converter --batch on --batch-size 20000
+$ monero-blockchain-import --database lmdb#nosync,nometasync
 ```
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp
index f5445b48a..c289f297b 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-export and monero-blockchain-import 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