diff --git a/downloads/index.md b/downloads/index.md
index ad59ec5..0ff9587 100644
--- a/downloads/index.md
+++ b/downloads/index.md
@@ -11,7 +11,7 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 
 ### Monero Core
 
-Monero Core consists of several applications, including bitmonerod (the daemon used if running a @full-node, as it maintains the connection to the Monero network) and simplewallet (a Monero @account manager application), as well as several other helper applications.
+Monero Core consists of several applications, including bitmonerod (the daemon used if running a @full-node, as it maintains the connection to the Monero network) and monero-wallet-cli (a Monero @account manager application), as well as several other helper applications.
 
 If you are using Monero Core for the first time you can simply download an appropriate release, and run bitmonerod to get synced up to the network.
 
diff --git a/getting-started/accepting.md b/getting-started/accepting.md
index 89986da..7712788 100644
--- a/getting-started/accepting.md
+++ b/getting-started/accepting.md
@@ -17,9 +17,9 @@ However, because Monero has @stealth-addresses there is no need to have separate
 
 A @payment-ID is a hexadecimal string that is 64 characters long, and is normally randomly created by the merchant. An example of a payment ID is: <span class="long-term">666c75666679706f6e7920697320746865206265737420706f6e792065766572</span>
 
-### Checking for a Payment in simplewallet
+### Checking for a Payment in monero-wallet-cli
 
-If you want to check for a payment using simplewallet you can use the "payments" command followed by the payment ID or payment IDs you want to check. For example:
+If you want to check for a payment using monero-wallet-cli you can use the "payments" command followed by the payment ID or payment IDs you want to check. For example:
 
 {:.cli-code}
 <span style="color: yellow;">[wallet 49VNLa]:</span> payments 666c75666679706f6e7920697320746865206265737420706f6e792065766572
@@ -33,7 +33,7 @@ If you need to check for payments programmatically, then details follow the next
 
 <i class="fa fa-level-up fa-rotate-90 fa-lg instruction-list"></i> Generate a random 64 character hexadecimal string for the payment  
 <i class="fa fa-level-up fa-rotate-90 fa-lg instruction-list"></i> Communicate the payment ID and Monero address to the individual who is making payment  
-<i class="fa fa-level-up fa-rotate-90 fa-lg instruction-list"></i> Check for the payment using the "payments" command in simplewallet
+<i class="fa fa-level-up fa-rotate-90 fa-lg instruction-list"></i> Check for the payment using the "payments" command in monero-wallet-cli
 
 ### Checking for a Payment Programatically
 
diff --git a/knowledge-base/developer-guides/wallet-rpc.md b/knowledge-base/developer-guides/wallet-rpc.md
index 3a2d0d4..bff253c 100644
--- a/knowledge-base/developer-guides/wallet-rpc.md
+++ b/knowledge-base/developer-guides/wallet-rpc.md
@@ -11,9 +11,9 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 
 ## Introduction
 
-This is a list of the simplewallet RPC calls, their inputs and outputs, and examples of each.
+This is a list of the monero-wallet-cli RPC calls, their inputs and outputs, and examples of each.
 
-All simplewallet methods use the same JSON RPC interface. For example:
+All monero-wallet-cli methods use the same JSON RPC interface. For example:
 
     IP=127.0.0.1
     PORT=18082
@@ -55,7 +55,7 @@ Inputs: *None*.
 
 Outputs:
 
-* *balance* - unsigned int; The total balance of the current simplewallet in session.
+* *balance* - unsigned int; The total balance of the current monero-wallet-cli in session.
 * *unlocked_balance* - unsigned int; Unlocked funds are those funds that are sufficiently deep enough in the Monero blockchain to be considered safe to spend.
 
 Example:
@@ -80,7 +80,7 @@ Inputs: *None*.
 
 Outputs:
 
-* *address* - string; The 95-character hex address string of the simplewallet in session.
+* *address* - string; The 95-character hex address string of the monero-wallet-cli in session.
 
 Example:
 
@@ -103,7 +103,7 @@ Inputs: *None*.
 
 Outputs:
 
-* *height* - string; The current simplewallet's blockchain height. If the wallet has been offline for a long time, it may need to catch up with the daemon.
+* *height* - string; The current monero-wallet-cli's blockchain height. If the wallet has been offline for a long time, it may need to catch up with the daemon.
 
 Example:
 
diff --git a/knowledge-base/moneropedia/account.md b/knowledge-base/moneropedia/account.md
index c15295c..8b871fa 100644
--- a/knowledge-base/moneropedia/account.md
+++ b/knowledge-base/moneropedia/account.md
@@ -44,7 +44,7 @@ view key: 4130fa26463d9451781771a8baa5d0b8085c47c4500cefe4746bab48f1d15903
 Your wallet has been generated.
 To start synchronizing with the daemon use "refresh" command.
 Use "help" command to see the list of available commands.
-Always use "exit" command when closing simplewallet to save
+Always use "exit" command when closing monero-wallet-cli to save
 current session's state. Otherwise, you will possibly need to synchronize 
 your wallet again. Your wallet key is NOT under risk anyway.<br>
 <span style="color: lime;">PLEASE NOTE: the following 25 words can be used to recover access to your wallet. Please write them down and store them somewhere safe and secure. Please do not store them in your email or on file storage services outside of your immediate control.</span><br>
diff --git a/knowledge-base/user-guides/Offline_Backup.md b/knowledge-base/user-guides/Offline_Backup.md
index fb09663..4a3a929 100644
--- a/knowledge-base/user-guides/Offline_Backup.md
+++ b/knowledge-base/user-guides/Offline_Backup.md
@@ -27,7 +27,7 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
  
 - Copy the Monero binaries to to a RAM disk (/dev/shm in Linux, Windows bootable ISOs normally have a Z: drive or something)
  
-- Don't run the Monero daemon. Instead, using the command line, use simplewallet to create a new Monero @account
+- Don't run the Monero daemon. Instead, using the command line, use monero-wallet-cli to create a new Monero @account
  
 - When prompted for a name, give it any name, it doesn't really matter
  
diff --git a/knowledge-base/user-guides/create_wallet.md b/knowledge-base/user-guides/create_wallet.md
index 9849185..e2668d7 100644
--- a/knowledge-base/user-guides/create_wallet.md
+++ b/knowledge-base/user-guides/create_wallet.md
@@ -16,7 +16,7 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 ![image1](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/1.png)
 ![image2](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/2.png)
 
-- Extract the files with the archive manager (same as Winzip on Windows). Note the path where the files "bitmonerod" and "simplewallet" are
+- Extract the files with the archive manager (same as Winzip on Windows). Note the path where the files "bitmonerod" and "monero-wallet-cli" are
 
 ![image3](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/3.png)
 ![image4](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/4.png)
@@ -39,7 +39,7 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 ![image10](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/10.png)
 ![image11](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/11.png)
 
-- Once bitmonerod is synchronised with the network, open a new terminal, change the directory (cf. step 5), and launch simplewallet by typing "*./simplewallet*"
+- Once bitmonerod is synchronised with the network, open a new terminal, change the directory (cf. step 5), and launch monero-wallet-cli by typing "*./monero-wallet-cli*"
 
 ![image12](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/12.png)
 
@@ -66,8 +66,8 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 ![image22](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/22.png)
 ![image23](https://github.com/luuul/monero-site/blob/master/knowledge-base/user-guides/png/create_wallet/23.png)
 
-- To exit bitmonerod or simplewallet just type "*exit*" in the associated terminal
+- To exit bitmonerod or monero-wallet-cli just type "*exit*" in the associated terminal
 
-Now to access the portfolio you have just created you will have to launch bitmonerod, wait for it to be synchronised with the network, launch simplewallet, and type the name of your portfolio and your password.
+Now to access the portfolio you have just created you will have to launch bitmonerod, wait for it to be synchronised with the network, launch monero-wallet-cli, and type the name of your portfolio and your password.
 
 
diff --git a/knowledge-base/user-guides/howto_fix_stuck_funds.md b/knowledge-base/user-guides/howto_fix_stuck_funds.md
index 6fedd6f..b25165f 100644
--- a/knowledge-base/user-guides/howto_fix_stuck_funds.md
+++ b/knowledge-base/user-guides/howto_fix_stuck_funds.md
@@ -11,7 +11,7 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 
 Sometimes, your funds will become stuck - you will have some locked funds that never become unlocked. This is how you fix it.
 
-- Load your wallet in simplewallet. 
+- Load your wallet in monero-wallet-cli.
 
 - Type
 
@@ -19,23 +19,23 @@ Sometimes, your funds will become stuck - you will have some locked funds that n
 
 into the command prompt. Write down your 25 word seed, if you haven't already. This is the best way to make sure you don't loose access to your funds.
 
-- Close simplewallet by typing
+- Close monero-wallet-cli by typing
 
 > exit
 
 - Backup all of your wallet related files. These include:
 
-> yourwalletname.bin  
-> yourwalletname.bin.keys  
-> yourwalletname.bin.address.txt  
+> yourwalletname.bin
+> yourwalletname.bin.keys
+> yourwalletname.bin.address.txt
 
-This can be done by copying the files to a new folder. 
+This can be done by copying the files to a new folder.
 
 Sometimes, when creating your wallet, you might have named it something without the .bin part. In that case, the wallet file will be called yourwalletname without the .bin at the end.
 
 - Delete yourwallet.bin
 
-- Load simplewallet, type in the name of the wallet you just deleted
+- Load monero-wallet-cli, type in the name of the wallet you just deleted
 
-- Enter password. The wallet will now refresh and hopefully your locked funds will now become unlocked. 
+- Enter password. The wallet will now refresh and hopefully your locked funds will now become unlocked.
 
diff --git a/knowledge-base/user-guides/index.md b/knowledge-base/user-guides/index.md
index e7e7a28..e2e08e4 100644
--- a/knowledge-base/user-guides/index.md
+++ b/knowledge-base/user-guides/index.md
@@ -17,4 +17,4 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 <div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="view_only"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to make a view only wallet</span></h2></a></div>
 <div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="vps_run_node"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">How to run a node on VPS</span></h2></a></div>
 <div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="monero_tools"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Monero tools</span></h2></a></div>
-<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="simplewallet"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Getting started with simplewallet</span></h2></a></div>
+<div class="text-left" style="padding-bottom: 15px;"><a style="color: #505050;" href="monero-wallet-cli"><img src="//static.getmonero.org/images/icon_client.svg" class="title-icon"><h2 class="inline"><span class="green-kicks">Getting started with monero-wallet-cli</span></h2></a></div>
diff --git a/knowledge-base/user-guides/simplewallet.md b/knowledge-base/user-guides/monero-wallet-cli.md
similarity index 91%
rename from knowledge-base/user-guides/simplewallet.md
rename to knowledge-base/user-guides/monero-wallet-cli.md
index 375a45e..706a6d3 100644
--- a/knowledge-base/user-guides/simplewallet.md
+++ b/knowledge-base/user-guides/monero-wallet-cli.md
@@ -8,20 +8,20 @@ kick-class: "purple-kicks"
 icon: "icon_userguides"
 attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->"
 ---
-# simplewallet
+# monero-wallet-cli
 
-`simplewallet` is the wallet software that ships with the Monero tree. It is a console program,
+`monero-wallet-cli` is the wallet software that ships with the Monero tree. It is a console program,
 and manages an account. While a bitcoin wallet manages both an account and the blockchain,
-Monero separates these: `bitmonerod` handles the blockchain, and `simplewallet` handles the account.
+Monero separates these: `bitmonerod` handles the blockchain, and `monero-wallet-cli` handles the account.
 
-This guide will show how to perform various operations from the `simplewallet` UI. The guide assumes you are using the most recent version of the Monero Core software *(currently 0.9.0.0 Hydrogen Helix)*, and have already created an account according to the other guides.
+This guide will show how to perform various operations from the `monero-wallet-cli` UI. The guide assumes you are using the most recent version of the Monero Core software *(currently 0.9.0.0 Hydrogen Helix)*, and have already created an account according to the other guides.
 
 
 ## Checking your balance
 
-Since the blockchain handling and the wallet are separate programs, many uses of `simplewallet`
+Since the blockchain handling and the wallet are separate programs, many uses of `monero-wallet-cli`
 need to work with the daemon. This includes looking for incoming transactions to your address.
-Once you are running both `simplewallet` and `bitmonerod`, enter `balance`.
+Once you are running both `monero-wallet-cli` and `bitmonerod`, enter `balance`.
 
 Example:
 
@@ -116,7 +116,7 @@ to an address), then you can check this way:
     check_tx_key TXID TXKEY ADDRESS
 
 Replace `TXID`, `TXKEY` and `ADDRESS` with the transaction ID, per-transaction key, and destination
-address which were supplied to you, respectively. simplewallet will check that transaction
+address which were supplied to you, respectively. monero-wallet-cli will check that transaction
 and let you know how much monero this transaction paid to the given address.
 
 
diff --git a/knowledge-base/user-guides/restore_account.md b/knowledge-base/user-guides/restore_account.md
index 23a5502..f9ead4b 100644
--- a/knowledge-base/user-guides/restore_account.md
+++ b/knowledge-base/user-guides/restore_account.md
@@ -30,3 +30,4 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 -  You will then be prompted with "Restore from specific blockchain height (optional, default 0):" Default will start the restore process from the beginning of the Monero blockchain. If you don't know the specific blockchain height, just hit enter. (Specifying a specific blockchain height will start the restore process from that specific height. This will save a bit of time in scanning, if you know what starting blockchain height your initial funds were transacted for this specific account.)
 
 After you have entered the 25 word mnemonic seed and have chosen your specific blockchain height, monero-wallet-cli will generate the same public address and view key as your old wallet and begin the refresh process automatically. (Please be patient as the refresh process may take a while.)
+
diff --git a/knowledge-base/user-guides/view_only.md b/knowledge-base/user-guides/view_only.md
index 65ccc89..01775df 100644
--- a/knowledge-base/user-guides/view_only.md
+++ b/knowledge-base/user-guides/view_only.md
@@ -13,9 +13,9 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 
 Note : In order to create a viewonly wallet you need first to compile the last source available on [Github](https://github.com/monero-project/bitmonero) as this functionality is not yet included in the official binaries (Sept. 2015).
 
-- To create a view only wallet you will need to first create a "normal" wallet and get the associated viewkey and address. You can get them once logged in simplewallet by typing "*viewkey*" and "*address*". Note each of them carefully and exit simplewallet.
+- To create a view only wallet you will need to first create a "normal" wallet and get the associated viewkey and address. You can get them once logged in monero-wallet-cli by typing "*viewkey*" and "*address*". Note each of them carefully and exit monero-wallet-cli.
 
-- Launch a new instance of simplewallet by typing "`./simplewallet --generate-from-view-key yourAddress:yourViewKey:nameOfTheViewOnlyWallet`" where *yourViewKey* is the view key you got from step 1 and *yourAddress* the associated address. The last part of the command is the name you want to give to you view only portfolio.
+- Launch a new instance of monero-wallet-cli by typing "`./monero-wallet-cli --generate-from-view-key yourAddress:yourViewKey:nameOfTheViewOnlyWallet`" where *yourViewKey* is the view key you got from step 1 and *yourAddress* the associated address. The last part of the command is the name you want to give to you view only portfolio.
 
 - Follow the instructions from the terminal. To see the balance of your portfolio type "*refresh*" (bitmonerod need to be synchronised with the network first). 
 
diff --git a/knowledge-base/user-guides/vps_run_node.md b/knowledge-base/user-guides/vps_run_node.md
index 613fe0d..3d3c32b 100644
--- a/knowledge-base/user-guides/vps_run_node.md
+++ b/knowledge-base/user-guides/vps_run_node.md
@@ -10,9 +10,9 @@ attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and
 ---
 # bitmonerod
 
-`bitmonerod` is the daemon software that ships with the Monero tree. It is a console program, and manages the blockchain. While a bitcoin wallet manages both an account and the blockchain, Monero separates these: `bitmonerod` handles the blockchain, and `simplewallet` handles the account.
+`bitmonerod` is the daemon software that ships with the Monero tree. It is a console program, and manages the blockchain. While a bitcoin wallet manages both an account and the blockchain, Monero separates these: `bitmonerod` handles the blockchain, and `monero-wallet-cli` handles the account.
 
-This guide assumes you have already set up your VPS account and are using SSH to tunnel into the server console. 
+This guide assumes you have already set up your VPS account and are using SSH to tunnel into the server console.
 
 ## Linux, 64-bit (Ubuntu 14.04)
 
@@ -23,19 +23,19 @@ Example if using `ufw`: `sudo ufw allow 18080`
 Example if using `iptables`: `sudo iptables -A INPUT -p tcp --dport 18080 -j ACCEPT`
 
 ### Download the current Monero Core binaries
-    
+
     wget https://downloads.getmonero.org/linux64
 
 ### Make a directory and extract the files.
-    
+
     mkdir bitmonero
     tar -xjvf linux64 -C bitmonero
 
 ### Launch the daemon
-    
+
     cd bitmonero
     ./bitmonerod
-    
+
 ### Options:
 
 Show list of all options and settings:
@@ -45,9 +45,9 @@ Show list of all options and settings:
 Launch the daemon as a background process:
 
     ./bitmonerod --detach
-    
+
 Monitor the output of `bitmonerod` if running as daemon:
 
     tail -f ~/.bitmonero/bitmonero.log
 
-    
\ No newline at end of file
+