diff --git a/doc/release-notes.md b/doc/release-notes.md
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -4,4 +4,14 @@
 
 This release includes the following features and fixes:
  - Add `getfinalizedblock` rpc to allow node operators to introspec
- the current finalized block.
\ No newline at end of file
+ the current finalized block.
+ - Wallet `getnewaddress` and `addmultisigaddress` RPC `account` named
+   parameters have been renamed to `label` with no change in behavior.
+ - Wallet `getlabeladdress`, `getreceivedbylabel`, `listreceivedbylabel`, and
+   `setlabel` RPCs have been added to replace `getaccountaddress`,
+   `getreceivedbyaccount`, `listreceivedbyaccount`, and `setaccount` RPCs,
+   which are now deprecated. There is no change in behavior between the
+   new RPCs and deprecated RPCs.
+ - Wallet `listreceivedbylabel`, `listreceivedbyaccount` and `listunspent` RPCs
+   add `label` fields to returned JSON objects that previously only had
+   `account` fields.
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -703,10 +703,9 @@
     payment.add_transactions(transaction.data(), transaction.size());
 
     // Create a new refund address, or re-use:
-    QString account = tr("Refund from %1").arg(recipient.authenticatedMerchant);
-    std::string strAccount = account.toStdString();
-    std::set<CTxDestination> refundAddresses =
-        wallet->GetAccountAddresses(strAccount);
+    std::string label =
+        tr("Refund from %1").arg(recipient.authenticatedMerchant).toStdString();
+    std::set<CTxDestination> refundAddresses = wallet->GetLabelAddresses(label);
     if (!refundAddresses.empty()) {
         CScript s = GetScriptForDestination(*refundAddresses.begin());
         payments::Output *refund_to = payment.add_refund_to();
@@ -715,7 +714,7 @@
         CPubKey newKey;
         if (wallet->GetKeyFromPool(newKey)) {
             CKeyID keyID = newKey.GetID();
-            wallet->SetAddressBook(keyID, strAccount, "refund");
+            wallet->SetAddressBook(keyID, label, "refund");
 
             CScript s = GetScriptForDestination(keyID);
             payments::Output *refund_to = payment.add_refund_to();
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -38,13 +38,17 @@
     {"settxfee", 0, "amount"},
     {"getreceivedbyaddress", 1, "minconf"},
     {"getreceivedbyaccount", 1, "minconf"},
+    {"getreceivedbylabel", 1, "minconf"},
     {"listreceivedbyaddress", 0, "minconf"},
     {"listreceivedbyaddress", 1, "include_empty"},
     {"listreceivedbyaddress", 2, "include_watchonly"},
+    {"listreceivedbyaddress", 3, "address_filter"},
     {"listreceivedbyaccount", 0, "minconf"},
     {"listreceivedbyaccount", 1, "include_empty"},
     {"listreceivedbyaccount", 2, "include_watchonly"},
-    {"listreceivedbyaddress", 3, "address_filter"},
+    {"listreceivedbylabel", 0, "minconf"},
+    {"listreceivedbylabel", 1, "include_empty"},
+    {"listreceivedbylabel", 2, "include_watchonly"},
     {"getbalance", 1, "minconf"},
     {"getbalance", 2, "include_watchonly"},
     {"getblockhash", 0, "height"},
diff --git a/src/rpc/protocol.h b/src/rpc/protocol.h
--- a/src/rpc/protocol.h
+++ b/src/rpc/protocol.h
@@ -96,8 +96,8 @@
     RPC_WALLET_ERROR = -4,
     //!< Not enough funds in wallet or account
     RPC_WALLET_INSUFFICIENT_FUNDS = -6,
-    //!< Invalid account name
-    RPC_WALLET_INVALID_ACCOUNT_NAME = -11,
+    //!< Invalid label name
+    RPC_WALLET_INVALID_LABEL_NAME = -11,
     //!< Keypool ran out, call keypoolrefill first
     RPC_WALLET_KEYPOOL_RAN_OUT = -12,
     //!< Enter the wallet passphrase with walletpassphrase first
@@ -114,7 +114,9 @@
     //!< Invalid wallet specified
     RPC_WALLET_NOT_FOUND = -18,
     //!< No wallet specified (error when there are multiple wallets loaded)
-    RPC_WALLET_NOT_SPECIFIED = -19
+    RPC_WALLET_NOT_SPECIFIED = -19,
+    //!< Backwards compatible aliases
+    RPC_WALLET_INVALID_ACCOUNT_NAME = RPC_WALLET_INVALID_LABEL_NAME,
 };
 
 UniValue JSONRPCRequestObj(const std::string &strMethod, const UniValue &params,
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -134,13 +134,12 @@
     }
 }
 
-std::string AccountFromValue(const UniValue &value) {
-    std::string strAccount = value.get_str();
-    if (strAccount == "*") {
-        throw JSONRPCError(RPC_WALLET_INVALID_ACCOUNT_NAME,
-                           "Invalid account name");
+std::string LabelFromValue(const UniValue &value) {
+    std::string label = value.get_str();
+    if (label == "*") {
+        throw JSONRPCError(RPC_WALLET_INVALID_LABEL_NAME, "Invalid label name");
     }
-    return strAccount;
+    return label;
 }
 
 static UniValue getnewaddress(const Config &config,
@@ -152,32 +151,29 @@
 
     if (request.fHelp || request.params.size() > 1) {
         throw std::runtime_error(
-            "getnewaddress ( \"account\" )\n"
+            "getnewaddress ( \"label\" )\n"
             "\nReturns a new Bitcoin address for receiving payments.\n"
-            "If 'account' is specified (DEPRECATED), it is added to the "
-            "address book \n"
-            "so payments received with the address will be credited to "
-            "'account'.\n"
+            "If 'label' is specified, it is added to the address book \n"
+            "so payments received with the address will be associated with "
+            "'label'.\n"
             "\nArguments:\n"
-            "1. \"account\"        (string, optional) DEPRECATED. The account "
-            "name for the address to be linked to. If not provided, the "
-            "default account \"\" is used. It can also be set to the empty "
-            "string \"\" to represent the default account. The account does "
-            "not need to exist, it will be created if there is no account by "
-            "the given name.\n"
+            "1. \"label\"          (string, optional) The label name for the "
+            "address to be linked to. If not provided, the default label \"\" "
+            "is used. It can also be set to the empty string \"\" to represent "
+            "the default label. The label does not need to exist, it will be "
+            "created if there is no label by the given name.\n"
             "\nResult:\n"
             "\"address\"    (string) The new bitcoin address\n"
             "\nExamples:\n" +
-            HelpExampleCli("getnewaddress", "") +
             HelpExampleRpc("getnewaddress", ""));
     }
 
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    // Parse the account first so we don't generate a key if there's an error
-    std::string strAccount;
+    // Parse the label first so we don't generate a key if there's an error
+    std::string label;
     if (request.params.size() > 0) {
-        strAccount = AccountFromValue(request.params[0]);
+        label = LabelFromValue(request.params[0]);
     }
 
     if (!pwallet->IsLocked()) {
@@ -193,15 +189,15 @@
     }
     CKeyID keyID = newKey.GetID();
 
-    pwallet->SetAddressBook(keyID, strAccount, "receive");
+    pwallet->SetAddressBook(keyID, label, "receive");
 
     return EncodeDestination(keyID);
 }
 
-CTxDestination GetAccountAddress(CWallet *const pwallet, std::string strAccount,
-                                 bool bForceNew = false) {
+CTxDestination GetLabelAddress(CWallet *const pwallet, const std::string &label,
+                               bool bForceNew = false) {
     CPubKey pubKey;
-    if (!pwallet->GetAccountPubkey(pubKey, strAccount, bForceNew)) {
+    if (!pwallet->GetLabelAddress(pubKey, label, bForceNew)) {
         throw JSONRPCError(
             RPC_WALLET_KEYPOOL_RAN_OUT,
             "Error: Keypool ran out, please call keypoolrefill first");
@@ -210,8 +206,7 @@
     return pubKey.GetID();
 }
 
-static UniValue getaccountaddress(const Config &config,
-                                  const JSONRPCRequest &request) {
+UniValue getlabeladdress(const Config &config, const JSONRPCRequest &request) {
     CWallet *const pwallet = GetWalletForJSONRPCRequest(request);
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
@@ -219,32 +214,31 @@
 
     if (request.fHelp || request.params.size() != 1) {
         throw std::runtime_error(
-            "getaccountaddress \"account\"\n"
-            "\nDEPRECATED. Returns the current Bitcoin address for receiving "
-            "payments to this account.\n"
+            "getlabeladdress \"label\"\n"
+            "\nReturns the current Bitcoin address for receiving payments to "
+            "this label.\n"
             "\nArguments:\n"
-            "1. \"account\"       (string, required) The account name for the "
+            "1. \"label\"         (string, required) The label name for the "
             "address. It can also be set to the empty string \"\" to represent "
-            "the default account. The account does not need to exist, it will "
-            "be created and a new address created  if there is no account by "
-            "the given name.\n"
+            "the default label. The label does not need to exist, it will be "
+            "created and a new address created  if there is no label by the "
+            "given name.\n"
             "\nResult:\n"
-            "\"address\"          (string) The account bitcoin address\n"
+            "\"address\"          (string) The label bitcoin address\n"
             "\nExamples:\n" +
-            HelpExampleCli("getaccountaddress", "") +
-            HelpExampleCli("getaccountaddress", "\"\"") +
-            HelpExampleCli("getaccountaddress", "\"myaccount\"") +
-            HelpExampleRpc("getaccountaddress", "\"myaccount\""));
+            HelpExampleCli("getlabeladdress", "") +
+            HelpExampleCli("getlabeladdress", "\"\"") +
+            HelpExampleCli("getlabeladdress", "\"mylabel\"") +
+            HelpExampleRpc("getlabeladdress", "\"mylabel\""));
     }
-
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    // Parse the account first so we don't generate a key if there's an error
-    std::string strAccount = AccountFromValue(request.params[0]);
+    // Parse the label first so we don't generate a key if there's an error
+    std::string label = LabelFromValue(request.params[0]);
 
     UniValue ret(UniValue::VSTR);
 
-    ret = EncodeDestination(GetAccountAddress(pwallet, strAccount));
+    ret = EncodeDestination(GetLabelAddress(pwallet, label));
     return ret;
 }
 
@@ -288,8 +282,7 @@
     return EncodeDestination(keyID);
 }
 
-static UniValue setaccount(const Config &config,
-                           const JSONRPCRequest &request) {
+UniValue setlabel(const Config &config, const JSONRPCRequest &request) {
     CWallet *const pwallet = GetWalletForJSONRPCRequest(request);
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
@@ -298,22 +291,20 @@
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 2) {
         throw std::runtime_error(
-            "setaccount \"address\" \"account\"\n"
-            "\nDEPRECATED. Sets the account associated with the given "
-            "address.\n"
+            "setlabel \"address\" \"label\"\n"
+            "\nSets the label associated with the given address.\n"
             "\nArguments:\n"
             "1. \"address\"         (string, required) The bitcoin address to "
-            "be associated with an account.\n"
-            "2. \"account\"         (string, required) The account to assign "
-            "the address to.\n"
+            "be associated with a label.\n"
+            "2. \"label\"           (string, required) The label to assign the "
+            "address to.\n"
             "\nExamples:\n" +
-            HelpExampleCli("setaccount",
+            HelpExampleCli("setlabel",
                            "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\" \"tabby\"") +
             HelpExampleRpc(
-                "setaccount",
+                "setlabel",
                 "\"1D1ZrZNe3JUo7ZycKEYQQiQAWd9y54F4XX\", \"tabby\""));
     }
-
     LOCK2(cs_main, pwallet->cs_wallet);
 
     CTxDestination dest =
@@ -323,26 +314,26 @@
                            "Invalid Bitcoin address");
     }
 
-    std::string strAccount;
-    if (request.params.size() > 1) {
-        strAccount = AccountFromValue(request.params[1]);
+    std::string label;
+    if (!request.params[1].isNull()) {
+        label = LabelFromValue(request.params[1]);
     }
 
-    // Only add the account if the address is yours.
+    // Only add the label if the address is yours.
     if (IsMine(*pwallet, dest)) {
-        // Detect when changing the account of an address that is the 'unused
-        // current key' of another account:
+        // Detect when changing the label of an address that is the 'unused
+        // current key' of another label:
         if (pwallet->mapAddressBook.count(dest)) {
-            std::string strOldAccount = pwallet->mapAddressBook[dest].name;
-            if (dest == GetAccountAddress(pwallet, strOldAccount)) {
-                GetAccountAddress(pwallet, strOldAccount, true);
+            std::string old_label = pwallet->mapAddressBook[dest].name;
+            if (dest == GetLabelAddress(pwallet, old_label)) {
+                GetLabelAddress(pwallet, old_label, true);
             }
         }
 
-        pwallet->SetAddressBook(dest, strAccount, "receive");
+        pwallet->SetAddressBook(dest, label, "receive");
     } else {
         throw JSONRPCError(RPC_MISC_ERROR,
-                           "setaccount can only be used with own address");
+                           "setlabel can only be used with own address");
     }
 
     return NullUniValue;
@@ -418,7 +409,7 @@
 
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    std::string strAccount = AccountFromValue(request.params[0]);
+    std::string strAccount = LabelFromValue(request.params[0]);
 
     // Find all addresses that have the given account
     UniValue ret(UniValue::VARR);
@@ -594,15 +585,15 @@
             "    [\n"
             "      \"address\",            (string) The bitcoin address\n"
             "      amount,                 (numeric) The amount in " +
-            CURRENCY_UNIT + "\n"
-                            "      \"account\"             (string, optional) "
-                            "DEPRECATED. The account\n"
-                            "    ]\n"
-                            "    ,...\n"
-                            "  ]\n"
-                            "  ,...\n"
-                            "]\n"
-                            "\nExamples:\n" +
+            CURRENCY_UNIT +
+            "\n"
+            "      \"label\"               (string, optional) The label\n"
+            "    ]\n"
+            "    ,...\n"
+            "  ]\n"
+            "  ,...\n"
+            "]\n"
+            "\nExamples:\n" +
             HelpExampleCli("listaddressgroupings", "") +
             HelpExampleRpc("listaddressgroupings", ""));
     }
@@ -789,8 +780,8 @@
     return ValueFromAmount(nAmount);
 }
 
-static UniValue getreceivedbyaccount(const Config &config,
-                                     const JSONRPCRequest &request) {
+UniValue getreceivedbylabel(const Config &config,
+                            const JSONRPCRequest &request) {
     CWallet *const pwallet = GetWalletForJSONRPCRequest(request);
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
@@ -799,30 +790,29 @@
     if (request.fHelp || request.params.size() < 1 ||
         request.params.size() > 2) {
         throw std::runtime_error(
-            "getreceivedbyaccount \"account\" ( minconf )\n"
-            "\nDEPRECATED. Returns the total amount received by addresses with "
-            "<account> in transactions with at least [minconf] confirmations.\n"
+            "getreceivedbylabel \"label\" ( minconf )\n"
+            "\nReturns the total amount received by addresses with <label> in "
+            "transactions with at least [minconf] confirmations.\n"
             "\nArguments:\n"
-            "1. \"account\"      (string, required) The selected account, may "
-            "be the default account using \"\".\n"
+            "1. \"label\"        (string, required) The selected label, may be "
+            "the default label using \"\".\n"
             "2. minconf          (numeric, optional, default=1) Only include "
             "transactions confirmed at least this many times.\n"
             "\nResult:\n"
             "amount              (numeric) The total amount in " +
-            CURRENCY_UNIT + " received for this account.\n"
+            CURRENCY_UNIT + " received for this label.\n"
                             "\nExamples:\n"
-                            "\nAmount received by the default account with at "
+                            "\nAmount received by the default label with at "
                             "least 1 confirmation\n" +
-            HelpExampleCli("getreceivedbyaccount", "\"\"") +
-            "\nAmount received at the tabby account including unconfirmed "
+            HelpExampleCli("getreceivedbylabel", "\"\"") +
+            "\nAmount received at the tabby label including unconfirmed "
             "amounts with zero confirmations\n" +
-            HelpExampleCli("getreceivedbyaccount", "\"tabby\" 0") +
-            "\nThe amount with at least 6 confirmation, very safe\n" +
-            HelpExampleCli("getreceivedbyaccount", "\"tabby\" 6") +
+            HelpExampleCli("getreceivedbylabel", "\"tabby\" 0") +
+            "\nThe amount with at least 6 confirmations\n" +
+            HelpExampleCli("getreceivedbylabel", "\"tabby\" 6") +
             "\nAs a json rpc call\n" +
-            HelpExampleRpc("getreceivedbyaccount", "\"tabby\", 6"));
+            HelpExampleRpc("getreceivedbylabel", "\"tabby\", 6"));
     }
-
     ObserveSafeMode();
     LOCK2(cs_main, pwallet->cs_wallet);
 
@@ -832,10 +822,9 @@
         nMinDepth = request.params[1].get_int();
     }
 
-    // Get the set of pub keys assigned to account
-    std::string strAccount = AccountFromValue(request.params[0]);
-    std::set<CTxDestination> setAddress =
-        pwallet->GetAccountAddresses(strAccount);
+    // Get the set of pub keys assigned to label
+    std::string label = LabelFromValue(request.params[0]);
+    std::set<CTxDestination> setAddress = pwallet->GetLabelAddresses(label);
 
     // Tally
     Amount nAmount = Amount::zero();
@@ -1007,8 +996,8 @@
     ObserveSafeMode();
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    std::string strFrom = AccountFromValue(request.params[0]);
-    std::string strTo = AccountFromValue(request.params[1]);
+    std::string strFrom = LabelFromValue(request.params[0]);
+    std::string strTo = LabelFromValue(request.params[1]);
     Amount nAmount = AmountFromValue(request.params[2]);
     if (nAmount <= Amount::zero()) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
@@ -1095,7 +1084,7 @@
     ObserveSafeMode();
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    std::string strAccount = AccountFromValue(request.params[0]);
+    std::string label = LabelFromValue(request.params[0]);
     CTxDestination dest =
         DecodeDestination(request.params[1].get_str(), config.GetChainParams());
     if (!IsValidDestination(dest)) {
@@ -1113,7 +1102,7 @@
     }
 
     CWalletTx wtx;
-    wtx.strFromAccount = strAccount;
+    wtx.strFromAccount = label;
     if (request.params.size() > 4 && !request.params[4].isNull() &&
         !request.params[4].get_str().empty()) {
         wtx.mapValue["comment"] = request.params[4].get_str();
@@ -1128,7 +1117,7 @@
 
     // Check funds
     Amount nBalance =
-        pwallet->GetLegacyBalance(ISMINE_SPENDABLE, nMinDepth, &strAccount);
+        pwallet->GetLegacyBalance(ISMINE_SPENDABLE, nMinDepth, &label);
     if (nAmount > nBalance) {
         throw JSONRPCError(RPC_WALLET_INSUFFICIENT_FUNDS,
                            "Account has insufficient funds");
@@ -1227,7 +1216,7 @@
             "Error: Peer-to-peer functionality missing or disabled");
     }
 
-    std::string strAccount = AccountFromValue(request.params[0]);
+    std::string strAccount = LabelFromValue(request.params[0]);
     UniValue sendTo = request.params[1].get_obj();
     int nMinDepth = 1;
     if (request.params.size() > 2) {
@@ -1325,12 +1314,12 @@
     if (request.fHelp || request.params.size() < 2 ||
         request.params.size() > 3) {
         std::string msg =
-            "addmultisigaddress nrequired [\"key\",...] ( \"account\" )\n"
+            "addmultisigaddress nrequired [\"key\",...] ( \"label\" )\n"
             "\nAdd a nrequired-to-sign multisignature address to the wallet. "
             "Requires a new wallet backup.\n"
             "Each key is a Bitcoin address or hex-encoded public key.\n"
-            "If 'account' is specified (DEPRECATED), assign address to that "
-            "account.\n"
+            "If 'label' is specified (DEPRECATED), assign address to that "
+            "label.\n"
 
             "\nArguments:\n"
             "1. nrequired        (numeric, required) The number of required "
@@ -1342,7 +1331,7 @@
             "public key\n"
             "       ...,\n"
             "     ]\n"
-            "3. \"account\"      (string, optional) DEPRECATED. An account to "
+            "3. \"label\"                        (string, optional) A label to "
             "assign the addresses to.\n"
 
             "\nResult:\n"
@@ -1365,9 +1354,9 @@
 
     LOCK2(cs_main, pwallet->cs_wallet);
 
-    std::string strAccount;
-    if (request.params.size() > 2) {
-        strAccount = AccountFromValue(request.params[2]);
+    std::string label;
+    if (!request.params[2].isNull()) {
+        label = LabelFromValue(request.params[2]);
     }
 
     // Construct using pay-to-script-hash:
@@ -1375,7 +1364,7 @@
     CScriptID innerID(inner);
     pwallet->AddCScript(inner);
 
-    pwallet->SetAddressBook(innerID, strAccount, "send");
+    pwallet->SetAddressBook(innerID, label, "send");
     return EncodeDestination(innerID);
 }
 
@@ -1391,28 +1380,28 @@
     }
 };
 
-static UniValue ListReceived(const Config &config, CWallet *const pwallet,
-                             const UniValue &params, bool fByAccounts) {
+UniValue ListReceived(const Config &config, CWallet *const pwallet,
+                      const UniValue &params, bool by_label) {
     // Minimum confirmations
     int nMinDepth = 1;
     if (params.size() > 0) {
         nMinDepth = params[0].get_int();
     }
 
-    // Whether to include empty accounts
+    // Whether to include empty labels
     bool fIncludeEmpty = false;
     if (params.size() > 1) {
         fIncludeEmpty = params[1].get_bool();
     }
 
     isminefilter filter = ISMINE_SPENDABLE;
-    if (params.size() > 2 && params[2].get_bool()) {
+    if (!params[2].isNull() && params[2].get_bool()) {
         filter = filter | ISMINE_WATCH_ONLY;
     }
 
     bool has_filtered_address = false;
     CTxDestination filtered_address = CNoDestination();
-    if (!fByAccounts && params.size() > 3) {
+    if (!by_label && params.size() > 3) {
         if (!IsValidDestinationString(params[3].get_str(),
                                       config.GetChainParams())) {
             throw JSONRPCError(RPC_WALLET_ERROR,
@@ -1467,7 +1456,7 @@
 
     // Reply
     UniValue ret(UniValue::VARR);
-    std::map<std::string, tallyitem> mapAccountTally;
+    std::map<std::string, tallyitem> label_tally;
 
     // Create mapAddressBook iterator
     // If we aren't filtering, go from begin() to end()
@@ -1483,7 +1472,7 @@
 
     for (auto item_it = start; item_it != end; ++item_it) {
         const CTxDestination &address = item_it->first;
-        const std::string &strAccount = item_it->second.name;
+        const std::string &label = item_it->second.name;
         std::map<CTxDestination, tallyitem>::iterator it =
             mapTally.find(address);
         if (it == mapTally.end() && !fIncludeEmpty) {
@@ -1499,8 +1488,8 @@
             fIsWatchonly = (*it).second.fIsWatchonly;
         }
 
-        if (fByAccounts) {
-            tallyitem &_item = mapAccountTally[strAccount];
+        if (by_label) {
+            tallyitem &_item = label_tally[label];
             _item.nAmount += nAmount;
             _item.nConf = std::min(_item.nConf, nConf);
             _item.fIsWatchonly = fIsWatchonly;
@@ -1510,13 +1499,11 @@
                 obj.pushKV("involvesWatchonly", true);
             }
             obj.pushKV("address", EncodeDestination(address));
-            obj.pushKV("account", strAccount);
+            obj.pushKV("account", label);
             obj.pushKV("amount", ValueFromAmount(nAmount));
             obj.pushKV("confirmations",
                        (nConf == std::numeric_limits<int>::max() ? 0 : nConf));
-            if (!fByAccounts) {
-                obj.pushKV("label", strAccount);
-            }
+            obj.pushKV("label", label);
             UniValue transactions(UniValue::VARR);
             if (it != mapTally.end()) {
                 for (const uint256 &_item : (*it).second.txids) {
@@ -1528,20 +1515,19 @@
         }
     }
 
-    if (fByAccounts) {
-        for (std::map<std::string, tallyitem>::iterator it =
-                 mapAccountTally.begin();
-             it != mapAccountTally.end(); ++it) {
-            Amount nAmount = (*it).second.nAmount;
-            int nConf = (*it).second.nConf;
+    if (by_label) {
+        for (const auto &entry : label_tally) {
+            Amount nAmount = entry.second.nAmount;
+            int nConf = entry.second.nConf;
             UniValue obj(UniValue::VOBJ);
-            if ((*it).second.fIsWatchonly) {
+            if (entry.second.fIsWatchonly) {
                 obj.pushKV("involvesWatchonly", true);
             }
-            obj.pushKV("account", (*it).first);
+            obj.pushKV("account", entry.first);
             obj.pushKV("amount", ValueFromAmount(nAmount));
             obj.pushKV("confirmations",
                        (nConf == std::numeric_limits<int>::max() ? 0 : nConf));
+            obj.pushKV("label", entry.first);
             ret.push_back(obj);
         }
     }
@@ -1577,16 +1563,16 @@
             "imported addresses were involved in transaction\n"
             "    \"address\" : \"receivingaddress\",  (string) The receiving "
             "address\n"
-            "    \"account\" : \"accountname\",       (string) DEPRECATED. The "
-            "account of the receiving address. The default account is \"\".\n"
+            "    \"account\" : \"accountname\",       (string) DEPRECATED. "
+            "Backwards compatible alias for label.\n \"\".\n"
             "    \"amount\" : x.xxx,                  (numeric) The total "
             "amount in " +
             CURRENCY_UNIT +
             " received by the address\n"
             "    \"confirmations\" : n,               (numeric) The number of "
             "confirmations of the most recent transaction included\n"
-            "    \"label\" : \"label\",               (string) A comment for "
-            "the address/transaction, if any\n"
+            "    \"label\" : \"label\",               (string) The label of "
+            "the receiving address. The default label is \"\".\n"
             "    \"txids\": [\n"
             "       n,                                (numeric) The ids of "
             "transactions received with the address \n"
@@ -1610,8 +1596,8 @@
     return ListReceived(config, pwallet, request.params, false);
 }
 
-static UniValue listreceivedbyaccount(const Config &config,
-                                      const JSONRPCRequest &request) {
+UniValue listreceivedbylabel(const Config &config,
+                             const JSONRPCRequest &request) {
     CWallet *const pwallet = GetWalletForJSONRPCRequest(request);
     if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
         return NullUniValue;
@@ -1619,13 +1605,13 @@
 
     if (request.fHelp || request.params.size() > 3) {
         throw std::runtime_error(
-            "listreceivedbyaccount ( minconf include_empty include_watchonly)\n"
-            "\nDEPRECATED. List balances by account.\n"
+            "listreceivedbylabel ( minconf include_empty include_watchonly)\n"
+            "\nList received transactions by label.\n"
             "\nArguments:\n"
             "1. minconf           (numeric, optional, default=1) The minimum "
             "number of confirmations before payments are included.\n"
             "2. include_empty     (bool, optional, default=false) Whether to "
-            "include accounts that haven't received any payments.\n"
+            "include labels that haven't received any payments.\n"
             "3. include_watchonly (bool, optional, default=false) Whether to "
             "include watch-only addresses (see 'importaddress').\n"
 
@@ -1634,22 +1620,22 @@
             "  {\n"
             "    \"involvesWatchonly\" : true,   (bool) Only returned if "
             "imported addresses were involved in transaction\n"
-            "    \"account\" : \"accountname\",  (string) The account name of "
-            "the receiving account\n"
+            "    \"account\" : \"accountname\",  (string) DEPRECATED. "
+            "Backwards compatible alias for label.\n"
             "    \"amount\" : x.xxx,             (numeric) The total amount "
-            "received by addresses with this account\n"
+            "received by addresses with this label\n"
             "    \"confirmations\" : n,          (numeric) The number of "
             "confirmations of the most recent transaction included\n"
-            "    \"label\" : \"label\"           (string) A comment for the "
-            "address/transaction, if any\n"
+            "    \"label\" : \"label\"           (string) The label of the "
+            "receiving address. The default label is \"\".\n"
             "  }\n"
             "  ,...\n"
             "]\n"
 
             "\nExamples:\n" +
-            HelpExampleCli("listreceivedbyaccount", "") +
-            HelpExampleCli("listreceivedbyaccount", "6 true") +
-            HelpExampleRpc("listreceivedbyaccount", "6, true, true"));
+            HelpExampleCli("listreceivedbylabel", "") +
+            HelpExampleCli("listreceivedbylabel", "6 true") +
+            HelpExampleRpc("listreceivedbylabel", "6, true, true"));
     }
 
     ObserveSafeMode();
@@ -3140,8 +3126,10 @@
             "    \"txid\" : \"txid\",          (string) the transaction id \n"
             "    \"vout\" : n,               (numeric) the vout value\n"
             "    \"address\" : \"address\",    (string) the bitcoin address\n"
-            "    \"account\" : \"account\",    (string) DEPRECATED. The "
-            "associated account, or \"\" for the default account\n"
+            "    \"label\" : \"label\",        (string) The associated label, "
+            "or \"\" for the default label\n"
+            "    \"account\" : \"account\",    (string) DEPRECATED. Backwards "
+            "compatible alias for label.\n"
             "    \"scriptPubKey\" : \"key\",   (string) the script key\n"
             "    \"amount\" : x.xxx,         (numeric) the transaction output "
             "amount in " +
@@ -3276,6 +3264,7 @@
             entry.pushKV("address", EncodeDestination(address));
 
             if (pwallet->mapAddressBook.count(address)) {
+                entry.pushKV("label", pwallet->mapAddressBook[address].name);
                 entry.pushKV("account", pwallet->mapAddressBook[address].name);
             }
 
@@ -3661,16 +3650,18 @@
     { "rawtransactions",    "fundrawtransaction",       fundrawtransaction,       {"hexstring","options"} },
     { "hidden",             "resendwallettransactions", resendwallettransactions, {} },
     { "wallet",             "abandontransaction",       abandontransaction,       {"txid"} },
-    { "wallet",             "addmultisigaddress",       addmultisigaddress,       {"nrequired","keys","account"} },
+    { "wallet",             "addmultisigaddress",       addmultisigaddress,       {"nrequired","keys","label|account"} },
     { "wallet",             "backupwallet",             backupwallet,             {"destination"} },
     { "wallet",             "encryptwallet",            encryptwallet,            {"passphrase"} },
-    { "wallet",             "getaccountaddress",        getaccountaddress,        {"account"} },
+    { "wallet",             "getaccountaddress",        getlabeladdress,          {"account"} },
+    { "wallet",             "getlabeladdress",          getlabeladdress,          {"label"} },
     { "wallet",             "getaccount",               getaccount,               {"address"} },
     { "wallet",             "getaddressesbyaccount",    getaddressesbyaccount,    {"account"} },
     { "wallet",             "getbalance",               getbalance,               {"account","minconf","include_watchonly"} },
-    { "wallet",             "getnewaddress",            getnewaddress,            {"account"} },
+    { "wallet",             "getnewaddress",            getnewaddress,            {"label|account"} },
     { "wallet",             "getrawchangeaddress",      getrawchangeaddress,      {} },
-    { "wallet",             "getreceivedbyaccount",     getreceivedbyaccount,     {"account","minconf"} },
+    { "wallet",             "getreceivedbylabel",       getreceivedbylabel,       {"label","minconf"} },
+    { "wallet",             "getreceivedbyaccount",     getreceivedbylabel,       {"account","minconf"} },
     { "wallet",             "getreceivedbyaddress",     getreceivedbyaddress,     {"address","minconf"} },
     { "wallet",             "gettransaction",           gettransaction,           {"txid","include_watchonly"} },
     { "wallet",             "getunconfirmedbalance",    getunconfirmedbalance,    {} },
@@ -3679,7 +3670,8 @@
     { "wallet",             "listaccounts",             listaccounts,             {"minconf","include_watchonly"} },
     { "wallet",             "listaddressgroupings",     listaddressgroupings,     {} },
     { "wallet",             "listlockunspent",          listlockunspent,          {} },
-    { "wallet",             "listreceivedbyaccount",    listreceivedbyaccount,    {"minconf","include_empty","include_watchonly"} },
+    { "wallet",             "listreceivedbylabel",      listreceivedbylabel,      {"minconf","include_empty","include_watchonly"} },
+    { "wallet",             "listreceivedbyaccount",    listreceivedbylabel,      {"minconf","include_empty","include_watchonly"} },
     { "wallet",             "listreceivedbyaddress",    listreceivedbyaddress,    {"minconf","include_empty","include_watchonly","address_filter"} },
     { "wallet",             "listsinceblock",           listsinceblock,           {"blockhash","target_confirmations","include_watchonly"} },
     { "wallet",             "listtransactions",         listtransactions,         {"account","count","skip","include_watchonly"} },
@@ -3691,7 +3683,8 @@
     { "wallet",             "sendfrom",                 sendfrom,                 {"fromaccount","toaddress","amount","minconf","comment","comment_to"} },
     { "wallet",             "sendmany",                 sendmany,                 {"fromaccount","amounts","minconf","comment","subtractfeefrom"} },
     { "wallet",             "sendtoaddress",            sendtoaddress,            {"address","amount","comment","comment_to","subtractfeefromamount"} },
-    { "wallet",             "setaccount",               setaccount,               {"address","account"} },
+    { "wallet",             "setlabel",                 setlabel,                 {"address","label"} },
+    { "wallet",             "setaccount",               setlabel,                 {"address","account"} },
     { "wallet",             "settxfee",                 settxfee,                 {"amount"} },
     { "wallet",             "signmessage",              signmessage,              {"address","message"} },
     { "wallet",             "walletlock",               walletlock,               {} },
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -890,8 +890,8 @@
     DBErrors ReorderTransactions();
     bool AccountMove(std::string strFrom, std::string strTo,
                      const Amount nAmount, std::string strComment = "");
-    bool GetAccountPubkey(CPubKey &pubKey, std::string strAccount,
-                          bool bForceNew = false);
+    bool GetLabelAddress(CPubKey &pubKey, const std::string &label,
+                         bool bForceNew = false);
 
     void MarkDirty();
     bool AddToWallet(const CWalletTx &wtxIn, bool fFlushOnClose = true);
@@ -985,8 +985,7 @@
     std::set<std::set<CTxDestination>> GetAddressGroupings();
     std::map<CTxDestination, Amount> GetAddressBalances();
 
-    std::set<CTxDestination>
-    GetAccountAddresses(const std::string &strAccount) const;
+    std::set<CTxDestination> GetLabelAddresses(const std::string &label) const;
 
     isminetype IsMine(const CTxIn &txin) const;
     /**
@@ -1018,7 +1017,7 @@
 
     bool DelAddressBook(const CTxDestination &address);
 
-    const std::string &GetAccountName(const CScript &scriptPubKey) const;
+    const std::string &GetLabelName(const CScript &scriptPubKey) const;
 
     void Inventory(const uint256 &hash) override {
         LOCK(cs_wallet);
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -887,12 +887,12 @@
     return walletdb.TxnCommit();
 }
 
-bool CWallet::GetAccountPubkey(CPubKey &pubKey, std::string strAccount,
-                               bool bForceNew) {
+bool CWallet::GetLabelAddress(CPubKey &pubKey, const std::string &label,
+                              bool bForceNew) {
     CWalletDB walletdb(*dbw);
 
     CAccount account;
-    walletdb.ReadAccount(strAccount, account);
+    walletdb.ReadAccount(label, account);
 
     if (!bForceNew) {
         if (!account.vchPubKey.IsValid()) {
@@ -919,8 +919,8 @@
             return false;
         }
 
-        SetAddressBook(account.vchPubKey.GetID(), strAccount, "receive");
-        walletdb.WriteAccount(strAccount, account);
+        SetAddressBook(account.vchPubKey.GetID(), label, "receive");
+        walletdb.WriteAccount(label, account);
     }
 
     pubKey = account.vchPubKey;
@@ -2205,7 +2205,7 @@
                 debit -= out.nValue;
             } else if (IsMine(out) & filter && depth >= minDepth &&
                        (!account ||
-                        *account == GetAccountName(out.scriptPubKey))) {
+                        *account == GetLabelName(out.scriptPubKey))) {
                 balance += out.nValue;
             }
         }
@@ -3264,7 +3264,7 @@
     return CWalletDB(*dbw).EraseName(address);
 }
 
-const std::string &CWallet::GetAccountName(const CScript &scriptPubKey) const {
+const std::string &CWallet::GetLabelName(const CScript &scriptPubKey) const {
     CTxDestination address;
     if (ExtractDestination(scriptPubKey, address) &&
         !scriptPubKey.IsUnspendable()) {
@@ -3274,9 +3274,9 @@
         }
     }
     // A scriptPubKey that doesn't have an entry in the address book is
-    // associated with the default account ("").
-    const static std::string DEFAULT_ACCOUNT_NAME;
-    return DEFAULT_ACCOUNT_NAME;
+    // associated with the default label ("").
+    const static std::string DEFAULT_LABEL_NAME;
+    return DEFAULT_LABEL_NAME;
 }
 
 /**
@@ -3662,14 +3662,14 @@
 }
 
 std::set<CTxDestination>
-CWallet::GetAccountAddresses(const std::string &strAccount) const {
+CWallet::GetLabelAddresses(const std::string &label) const {
     LOCK(cs_wallet);
     std::set<CTxDestination> result;
     for (const std::pair<CTxDestination, CAddressBookData> &item :
          mapAddressBook) {
         const CTxDestination &address = item.first;
         const std::string &strName = item.second.name;
-        if (strName == strAccount) {
+        if (strName == label) {
             result.insert(address);
         }
     }
diff --git a/test/functional/import-rescan.py b/test/functional/import-rescan.py
--- a/test/functional/import-rescan.py
+++ b/test/functional/import-rescan.py
@@ -81,7 +81,7 @@
 
         if txid is not None:
             tx, = [tx for tx in txs if tx["txid"] == txid]
-            assert_equal(tx["account"], self.label)
+            assert_equal(tx["label"], self.label)
             assert_equal(tx["address"], self.address["address"])
             assert_equal(tx["amount"], amount)
             assert_equal(tx["category"], "receive")
diff --git a/test/functional/receivedby.py b/test/functional/receivedby.py
--- a/test/functional/receivedby.py
+++ b/test/functional/receivedby.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2014-2016 The Bitcoin Core developers
+# Copyright (c) 2014-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -33,17 +33,16 @@
                             {"address": addr},
                             {},
                             True)
-
         # Bury Tx under 10 block so it will be returned by listreceivedbyaddress
         self.nodes[1].generate(10)
         self.sync_all()
         assert_array_result(self.nodes[1].listreceivedbyaddress(),
                             {"address": addr},
-                            {"address": addr, "account": "", "amount": Decimal("0.1"), "confirmations": 10, "txids": [txid, ]})
+                            {"address": addr, "label": "", "amount": Decimal("0.1"), "confirmations": 10, "txids": [txid, ]})
         # With min confidence < 10
         assert_array_result(self.nodes[1].listreceivedbyaddress(5),
                             {"address": addr},
-                            {"address": addr, "account": "", "amount": Decimal("0.1"), "confirmations": 10, "txids": [txid, ]})
+                            {"address": addr, "label": "", "amount": Decimal("0.1"), "confirmations": 10, "txids": [txid, ]})
         # With min confidence > 10, should not find Tx
         assert_array_result(self.nodes[1].listreceivedbyaddress(11), {
                             "address": addr}, {}, True)
@@ -52,11 +51,11 @@
         empty_addr = self.nodes[1].getnewaddress()
         assert_array_result(self.nodes[1].listreceivedbyaddress(0, True),
                             {"address": empty_addr},
-                            {"address": empty_addr, "account": "", "amount": 0, "confirmations": 0, "txids": []})
+                            {"address": empty_addr, "label": "", "amount": 0, "confirmations": 0, "txids": []})
 
         # Test Address filtering
         # Only on addr
-        expected = {"address": addr, "account": "", "amount": Decimal(
+        expected = {"address": addr, "label": "", "amount": Decimal(
             "0.1"), "confirmations": 10, "txids": [txid, ]}
         res = self.nodes[1].listreceivedbyaddress(
             minconf=0, include_empty=True, include_watchonly=True, address_filter=addr)
@@ -73,13 +72,13 @@
         self.nodes[0].generate(1)
         self.sync_all()
         # Same test as above should still pass
-        expected = {"address": addr, "account": "", "amount": Decimal(
+        expected = {"address": addr, "label": "", "amount": Decimal(
             "0.1"), "confirmations": 11, "txids": [txid, ]}
         res = self.nodes[1].listreceivedbyaddress(0, True, True, addr)
         assert_array_result(res, {"address": addr}, expected)
         assert_equal(len(res), 1)
         # Same test as above but with other_addr should still pass
-        expected = {"address": other_addr, "account": "", "amount": Decimal(
+        expected = {"address": other_addr, "label": "", "amount": Decimal(
             "0.1"), "confirmations": 1, "txids": [txid2, ]}
         res = self.nodes[1].listreceivedbyaddress(0, True, True, other_addr)
         assert_array_result(res, {"address": other_addr}, expected)
@@ -119,50 +118,48 @@
         assert_raises_rpc_error(-4, "Address not found in wallet",
                                 self.nodes[0].getreceivedbyaddress, addr)
 
-        self.log.info("listreceivedbyaccount + getreceivedbyaccount Test")
+        self.log.info("listreceivedbylabel + getreceivedbylabel Test")
 
         # set pre-state
         addrArr = self.nodes[1].getnewaddress()
-        account = self.nodes[1].getaccount(addrArr)
-        received_by_account_json = [
-            r for r in self.nodes[1].listreceivedbyaccount() if r["account"] == account][0]
-        balance_by_account = self.nodes[1].getreceivedbyaccount(account)
+        label = self.nodes[1].getaccount(addrArr)
+        received_by_label_json = [
+            r for r in self.nodes[1].listreceivedbylabel() if r["label"] == label][0]
+        balance_by_label = self.nodes[1].getreceivedbylabel(label)
 
         txid = self.nodes[0].sendtoaddress(addr, 0.1)
         self.sync_all()
 
-        # listreceivedbyaccount should return received_by_account_json because
-        # of 0 confirmations
-        assert_array_result(self.nodes[1].listreceivedbyaccount(),
-                            {"account": account},
-                            received_by_account_json)
+        # listreceivedbylabel should return received_by_label_json because of 0 confirmations
+        assert_array_result(self.nodes[1].listreceivedbylabel(),
+                            {"label": label},
+                            received_by_label_json)
 
-        # getreceivedbyaddress should return same balance because of 0
-        # confirmations
-        balance = self.nodes[1].getreceivedbyaccount(account)
-        assert_equal(balance, balance_by_account)
+        # getreceivedbyaddress should return same balance because of 0 confirmations
+        balance = self.nodes[1].getreceivedbylabel(label)
+        assert_equal(balance, balance_by_label)
 
         self.nodes[1].generate(10)
         self.sync_all()
-        # listreceivedbyaccount should return updated account balance
-        assert_array_result(self.nodes[1].listreceivedbyaccount(),
-                            {"account": account},
-                            {"account": received_by_account_json["account"], "amount": (received_by_account_json["amount"] + Decimal("0.1"))})
+        # listreceivedbylabel should return updated received list
+        assert_array_result(self.nodes[1].listreceivedbylabel(),
+                            {"label": label},
+                            {"label": received_by_label_json["label"], "amount": (received_by_label_json["amount"] + Decimal("0.1"))})
 
-        # getreceivedbyaddress should return updates balance
-        balance = self.nodes[1].getreceivedbyaccount(account)
-        assert_equal(balance, balance_by_account + Decimal("0.1"))
+        # getreceivedbylabel should return updated receive total
+        balance = self.nodes[1].getreceivedbylabel(label)
+        assert_equal(balance, balance_by_label + Decimal("0.1"))
 
-        # Create a new account named "mynewaccount" that has a 0 balance
-        self.nodes[1].getaccountaddress("mynewaccount")
-        received_by_account_json = [r for r in self.nodes[1].listreceivedbyaccount(
-            0, True) if r["account"] == "mynewaccount"][0]
+        # Create a new label named "mynewlabel" that has a 0 balance
+        self.nodes[1].getlabeladdress("mynewlabel")
+        received_by_label_json = [r for r in self.nodes[1].listreceivedbylabel(
+            0, True) if r["label"] == "mynewlabel"][0]
 
-        # Test includeempty of listreceivedbyaccount
-        assert_equal(received_by_account_json["amount"], Decimal("0.0"))
+        # Test includeempty of listreceivedbylabel
+        assert_equal(received_by_label_json["amount"], Decimal("0.0"))
 
-        # Test getreceivedbyaccount for 0 amount accounts
-        balance = self.nodes[1].getreceivedbyaccount("mynewaccount")
+        # Test getreceivedbylabel for 0 amount labels
+        balance = self.nodes[1].getreceivedbylabel("mynewlabel")
         assert_equal(balance, Decimal("0.0"))
 
 
diff --git a/test/functional/wallet-accounts.py b/test/functional/wallet-accounts.py
--- a/test/functional/wallet-accounts.py
+++ b/test/functional/wallet-accounts.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
-# Copyright (c) 2016 The Bitcoin Core developers
+# Copyright (c) 2016-2017 The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
-"""Test account RPCs.
+"""Test label RPCs.
 
 RPCs tested are:
-    - getaccountaddress
+    - getlabeladdress
     - getaddressesbyaccount
     - listaddressgroupings
-    - setaccount
+    - setlabel
     - sendfrom (with account arguments)
     - move (with account arguments)
 """
@@ -17,7 +17,7 @@
 from test_framework.util import assert_equal
 
 
-class WalletAccountsTest(BitcoinTestFramework):
+class WalletLabelsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
@@ -71,106 +71,93 @@
 
         amount_to_send = 1.0
 
-        # Create accounts and make sure subsequent account API calls
-        # recognize the account/address associations.
-        accounts = [Account(name) for name in ("a", "b", "c", "d", "e")]
-        for account in accounts:
-            account.add_receive_address(node.getaccountaddress(account.name))
-            account.verify(node)
+        # Create labels and make sure subsequent label API calls
+        # recognize the label/address associations.
+        labels = [Label(name) for name in ("a", "b", "c", "d", "e")]
+        for label in labels:
+            label.add_receive_address(node.getlabeladdress(label.name))
+            label.verify(node)
 
-        # Send a transaction to each account, and make sure this forces
-        # getaccountaddress to generate a new receiving address.
-        for account in accounts:
-            node.sendtoaddress(account.receive_address, amount_to_send)
-            account.add_receive_address(node.getaccountaddress(account.name))
-            account.verify(node)
+        # Send a transaction to each label, and make sure this forces
+        # getlabeladdress to generate a new receiving address.
+        for label in labels:
+            node.sendtoaddress(label.receive_address, amount_to_send)
+            label.add_receive_address(node.getlabeladdress(label.name))
+            label.verify(node)
 
         # Check the amounts received.
         node.generate(1)
-        for account in accounts:
+        for label in labels:
             assert_equal(
-                node.getreceivedbyaddress(account.addresses[0]), amount_to_send)
-            assert_equal(node.getreceivedbyaccount(
-                account.name), amount_to_send)
-
-        # Check that sendfrom account reduces listaccounts balances.
-        for i, account in enumerate(accounts):
-            to_account = accounts[(i+1) % len(accounts)]
-            node.sendfrom(
-                account.name, to_account.receive_address, amount_to_send)
+                node.getreceivedbyaddress(label.addresses[0]), amount_to_send)
+            assert_equal(node.getreceivedbylabel(label.name), amount_to_send)
+
+        # Check that sendfrom label reduces listaccounts balances.
+        for i, label in enumerate(labels):
+            to_label = labels[(i+1) % len(labels)]
+            node.sendfrom(label.name, to_label.receive_address, amount_to_send)
         node.generate(1)
-        for account in accounts:
-            account.add_receive_address(node.getaccountaddress(account.name))
-            account.verify(node)
-            assert_equal(node.getreceivedbyaccount(account.name), 2)
-            node.move(account.name, "", node.getbalance(account.name))
-            account.verify(node)
+        for label in labels:
+            label.add_receive_address(node.getlabeladdress(label.name))
+            label.verify(node)
+            assert_equal(node.getreceivedbylabel(label.name), 2)
+            node.move(label.name, "", node.getbalance(label.name))
+            label.verify(node)
         node.generate(101)
-
-        # the "" account has what's expected, plus exactly the fee amount as
-        # that's been mined and matures in the next 100 blocks.
         expected_account_balances = {"": 5200 + fee}
-        for account in accounts:
-            expected_account_balances[account.name] = 0
+        for label in labels:
+            expected_account_balances[label.name] = 0
         assert_equal(node.listaccounts(), expected_account_balances)
-        # the "" account has what's expected, plus exactly the fee amount as
-        # that's been mined and matures in the next 100 blocks.
         assert_equal(node.getbalance(""), 5200 + fee)
 
-        # Check that setaccount can assign an account to a new unused address.
-        for account in accounts:
-            address = node.getaccountaddress("")
-            node.setaccount(address, account.name)
-            account.add_address(address)
-            account.verify(node)
+        # Check that setlabel can assign a label to a new unused address.
+        for label in labels:
+            address = node.getlabeladdress("")
+            node.setlabel(address, label.name)
+            label.add_address(address)
+            label.verify(node)
             assert(address not in node.getaddressesbyaccount(""))
 
-        # Check that addmultisigaddress can assign accounts.
-        for account in accounts:
+        # Check that addmultisigaddress can assign labels.
+        for label in labels:
             addresses = []
             for x in range(10):
                 addresses.append(node.getnewaddress())
             multisig_address = node.addmultisigaddress(
-                5, addresses, account.name)
-            account.add_address(multisig_address)
-            account.verify(node)
+                5, addresses, label.name)
+            label.add_address(multisig_address)
+            label.verify(node)
             node.sendfrom("", multisig_address, 50)
-
         node.generate(101)
+        for label in labels:
+            assert_equal(node.getbalance(label.name), 50)
 
-        for account in accounts:
-            assert_equal(node.getbalance(account.name), 50)
-
-        # Check that setaccount can change the account of an address from a
-        # different account.
-        change_account(
-            node, accounts[0].addresses[0], accounts[0], accounts[1])
+        # Check that setlabel can change the label of an address from a
+        # different label.
+        change_label(node, labels[0].addresses[0], labels[0], labels[1])
 
-        # Check that setaccount can change the account of an address which
-        # is the receiving address of a different account.
-        change_account(
-            node, accounts[0].receive_address, accounts[0], accounts[1])
+        # Check that setlabel can change the label of an address which
+        # is the receiving address of a different label.
+        change_label(node, labels[0].receive_address, labels[0], labels[1])
 
-        # Check that setaccount can set the account of an address already
-        # in the account. This is a no-op.
-        change_account(
-            node, accounts[2].addresses[0], accounts[2], accounts[2])
+        # Check that setlabel can set the label of an address already
+        # in the label. This is a no-op.
+        change_label(node, labels[2].addresses[0], labels[2], labels[2])
 
-        # Check that setaccount can set the account of an address which is
-        # already the receiving address of the account. It would probably make
+        # Check that setlabel can set the label of an address which is
+        # already the receiving address of the label. It would probably make
         # sense for this to be a no-op, but right now it resets the receiving
-        # address, causing getaccountaddress to return a brand new address.
-        change_account(
-            node, accounts[2].receive_address, accounts[2], accounts[2])
+        # address, causing getlabeladdress to return a brand new address.
+        change_label(node, labels[2].receive_address, labels[2], labels[2])
 
 
-class Account:
+class Label:
     def __init__(self, name):
-        # Account name
+        # Label name
         self.name = name
-        # Current receiving address associated with this account.
+        # Current receiving address associated with this label.
         self.receive_address = None
-        # List of all addresses assigned with this account
+        # List of all addresses assigned with this label
         self.addresses = []
 
     def add_address(self, address):
@@ -184,8 +171,7 @@
     def verify(self, node):
         if self.receive_address is not None:
             assert self.receive_address in self.addresses
-            assert_equal(node.getaccountaddress(
-                self.name), self.receive_address)
+            assert_equal(node.getlabeladdress(self.name), self.receive_address)
 
         for address in self.addresses:
             assert_equal(node.getaccount(address), self.name)
@@ -194,26 +180,26 @@
             set(node.getaddressesbyaccount(self.name)), set(self.addresses))
 
 
-def change_account(node, address, old_account, new_account):
-    assert_equal(address in old_account.addresses, True)
-    node.setaccount(address, new_account.name)
+def change_label(node, address, old_label, new_label):
+    assert_equal(address in old_label.addresses, True)
+    node.setlabel(address, new_label.name)
 
-    old_account.addresses.remove(address)
-    new_account.add_address(address)
+    old_label.addresses.remove(address)
+    new_label.add_address(address)
 
-    # Calling setaccount on an address which was previously the receiving
-    # address of a different account should reset the receiving address of
-    # the old account, causing getaccountaddress to return a brand new
+    # Calling setlabel on an address which was previously the receiving
+    # address of a different label should reset the receiving address of
+    # the old label, causing getlabeladdress to return a brand new
     # address.
-    if address == old_account.receive_address:
-        new_address = node.getaccountaddress(old_account.name)
-        assert_equal(new_address not in old_account.addresses, True)
-        assert_equal(new_address not in new_account.addresses, True)
-        old_account.add_receive_address(new_address)
+    if address == old_label.receive_address:
+        new_address = node.getlabeladdress(old_label.name)
+        assert_equal(new_address not in old_label.addresses, True)
+        assert_equal(new_address not in new_label.addresses, True)
+        old_label.add_receive_address(new_address)
 
-    old_account.verify(node)
-    new_account.verify(node)
+    old_label.verify(node)
+    new_label.verify(node)
 
 
 if __name__ == '__main__':
-    WalletAccountsTest().main()
+    WalletLabelsTest().main()