diff --git a/docs/account.rst b/docs/account.rst
index 8a617dfe2b317f055cf14827cd569c9ceac31f69..c01405cfe366b3d197ec4879d2789f9be661a728 100644
--- a/docs/account.rst
+++ b/docs/account.rst
@@ -5,13 +5,13 @@ Obtaining data of an account.
 
 .. code-block:: python
 
-   from bitshares.account import Account
+   from steem.account import Account
    account = Account("xeroc")
    print(account)
    print(account.balances)
 
-.. autoclass:: bitshares.account.Account
+.. autoclass:: steem.account.Account
    :members:
 
-.. autoclass:: bitshares.account.AccountUpdate
+.. autoclass:: steem.account.AccountUpdate
    :members:
diff --git a/docs/amount.rst b/docs/amount.rst
index 503ed82ce15058d529560a6054f89701719e51f4..361b3efcb91699e70eab384d4de5b1ae0ceef1ea 100644
--- a/docs/amount.rst
+++ b/docs/amount.rst
@@ -5,8 +5,8 @@ For the sake of easier handling of Assets on the blockchain
 
 .. code-block:: python
 
-   from bitshares.amount import Amount
-   from bitshares.asset import Asset
+   from steem.amount import Amount
+   from steem.asset import Asset
    a = Amount("1 USD")
    b = Amount(1, "USD")
    c = Amount("20", Asset("USD"))
@@ -15,5 +15,5 @@ For the sake of easier handling of Assets on the blockchain
    a += b
    a /= 2.0
 
-.. autoclass:: bitshares.amount.Amount
+.. autoclass:: steem.amount.Amount
    :members:
diff --git a/docs/asset.rst b/docs/asset.rst
index 108af474404ec415fddd7bf45bf61432f50d57fc..eec9e2f9fa9efc562f90291eda43fe504f48c3ca 100644
--- a/docs/asset.rst
+++ b/docs/asset.rst
@@ -1,5 +1,5 @@
 Asset
 ~~~~~~
 
-.. autoclass:: bitshares.asset.Asset
+.. autoclass:: steem.asset.Asset
    :members:
diff --git a/docs/bitshares.rst b/docs/bitshares.rst
index 8797ac2fcb390d2d7c6cede3d6b1a7d1e3778f47..40de6bb58f1ac80d6187e8e67ae833e2a1a97c76 100644
--- a/docs/bitshares.rst
+++ b/docs/bitshares.rst
@@ -7,5 +7,5 @@ the related blockchain technology and cryptography. This library can be
 used to do anything that is allowed according to the BitShares
 blockchain protocol.
 
-.. autoclass:: bitshares.bitshares.BitShares
+.. autoclass:: steem.steem.BitShares
    :members:
diff --git a/docs/block.rst b/docs/block.rst
index 6230d39604ddb5134d44e0a5d27194cad10440ea..1a4105a2548faf51185049ecb6d6fd221fa1af8c 100644
--- a/docs/block.rst
+++ b/docs/block.rst
@@ -5,9 +5,9 @@ Easily read data in a Block
 
 .. code-block:: python
 
-   from bitshares.block import Block
+   from steem.block import Block
    from pprint import pprint
    pprint(Block(1))
 
-.. autoclass:: bitshares.block.Block
+.. autoclass:: steem.block.Block
    :members:
diff --git a/docs/blockchain.rst b/docs/blockchain.rst
index 896a858742ec5f1314c8bffeb7d5e8efe8e1c8cb..ec67d4cb8fdf092221aa68bb1e2002aece434d61 100644
--- a/docs/blockchain.rst
+++ b/docs/blockchain.rst
@@ -5,7 +5,7 @@ Read blockchain related data-
 
 .. code-block:: python
 
-   from bitshares.blockchain import Blockchain
+   from steem.blockchain import Blockchain
    chain = Blockchain()
 
 Read current block and blockchain info
@@ -29,5 +29,5 @@ Monitor for new blocks ..
    for operations in chain.ops():
        print(operations)
 
-.. autoclass:: bitshares.blockchain.Blockchain
+.. autoclass:: steem.blockchain.Blockchain
    :members:
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 13db5458a7a21b2e3bfef8bd09e4d2cd761fa633..c4e07dfd9c8dd400361242f24a01e3f4454902fb 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -2,7 +2,7 @@
 Configuration
 *************
 
-The pybitshares library comes with its own local configuration database
+The pysteem library comes with its own local configuration database
 that stores information like
 
 * API node URL
@@ -15,20 +15,20 @@ You can access those variables like a regular dictionary by using
 
 .. code-block:: python
 
-    from bitshares import BitShares
-    bitshares = BitShares()
-    print(bitshares.config.items())
+    from steem import BitShares
+    steem = BitShares()
+    print(steem.config.items())
 
 Keys can be added and changed like they are for regular dictionaries.
 
-If you don't want to load the :class:`bitshares.BitShares` class, you
+If you don't want to load the :class:`steem.BitShares` class, you
 can load the configuration directly by using:
 
 .. code-block:: python
 
-    from bitshares.storage import configStorage as config
+    from steem.storage import configStorage as config
 
 API
 ---
-.. autoclass:: bitshares.storage.Configuration
+.. autoclass:: steem.storage.Configuration
    :members:
diff --git a/docs/contribute.rst b/docs/contribute.rst
index 0eaa10b45a6a9eef790a26f38f4e50777f2a337a..a133dbfe3fc6cd6560f65826ebb71189b727ca4a 100644
--- a/docs/contribute.rst
+++ b/docs/contribute.rst
@@ -1,4 +1,4 @@
-Contributing to python-bitshares 
+Contributing to python-steem 
 ================================
 
 We welcome your contributions to our project.
@@ -6,9 +6,9 @@ We welcome your contributions to our project.
 Repository
 ----------
 
-The *main* repository of python-bitshares is currently located at:
+The *main* repository of python-steem is currently located at:
 
-    https://github.com/xeroc/python-bitshares
+    https://github.com/xeroc/python-steem
 
 Flow
 ----
diff --git a/docs/dex.rst b/docs/dex.rst
index 5a2c83bc87d90e75579d6bcfd3834e39dee6ce3b..22d3a43888183e15b616f864ab4274a81e971b4b 100644
--- a/docs/dex.rst
+++ b/docs/dex.rst
@@ -1,5 +1,5 @@
 Dex
 ~~~
 
-.. autoclass:: bitshares.dex.Dex
+.. autoclass:: steem.dex.Dex
     :members:
diff --git a/docs/exceptions.rst b/docs/exceptions.rst
index 634bd564cb64582a42af403423e08dd835ddc028..e4bfb29521d4a1e54c3fa6bf8ede3cd92eed3e6b 100644
--- a/docs/exceptions.rst
+++ b/docs/exceptions.rst
@@ -1,8 +1,8 @@
 Exceptions
 ~~~~~~~~~~
 
-.. autoclass:: bitshares.exceptions
+.. autoclass:: steem.exceptions
    :members:
 
-.. autoclass:: bitsharesapi.exceptions
+.. autoclass:: steemapi.exceptions
    :members:
diff --git a/docs/index.rst b/docs/index.rst
index a25518c8fc33bf79ef3563ab0645b75781db747f..26ee7ebd9ecbe1908e595de33b583848cb9e8972 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,4 +1,4 @@
-.. python-bitshares documentation master file, created by
+.. python-steem documentation master file, created by
    sphinx-quickstart on Fri Jun  5 14:06:38 2015.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
@@ -9,7 +9,7 @@
    http://openalea.gforge.inria.fr/doc/openalea/doc/_build/html/source/sphinx/rest_syntax.html
    http://rest-sphinx-memo.readthedocs.org/en/latest/ReST.html
 
-Welcome to pybitshares's documentation!
+Welcome to pysteem's documentation!
 ===============================================
 
 BitShares is a **blockchain-based autonomous company** (i.e. a DAC) that
@@ -24,7 +24,7 @@ assets as well as customized on-chain smart contracts.
 About this Library
 ------------------
 
-The purpose of *pybitshares* is to simplify development of products and
+The purpose of *pysteem* is to simplify development of products and
 services that use the BitShares blockchain. It comes with
 
 * it's own (bip32-encrypted) wallet
@@ -52,26 +52,26 @@ Quickstart
 
 .. code-block:: python
 
-   from bitshares import BitShares
-   bitshares = BitShares()
-   bitshares.wallet.unlock("wallet-passphrase")
-   bitshares.transfer("<to>", "<amount>", "<asset>", "[<memo>]", account="<from>")
+   from steem import BitShares
+   steem = BitShares()
+   steem.wallet.unlock("wallet-passphrase")
+   steem.transfer("<to>", "<amount>", "<asset>", "[<memo>]", account="<from>")
 
 .. code-block:: python
 
-   from bitshares.blockchain import Blockchain
+   from steem.blockchain import Blockchain
    blockchain = Blockchain()
    for op in Blockchain.ops():
        print(op)
 
 .. code-block:: python
 
-   from bitshares.block import Block
+   from steem.block import Block
    print(Block(1))
 
 .. code-block:: python
 
-   from bitshares.account import Account
+   from steem.account import Account
    account = Account("init0")
    print(account.balances)
    print(account.openorders)
@@ -80,17 +80,17 @@ Quickstart
 
 .. code-block:: python
 
-   from bitshares.market import Market
+   from steem.market import Market
    market = Market("USD:BTS")
    print(market.ticker())
-   market.bitshares.wallet.unlock("wallet-passphrase")
+   market.steem.wallet.unlock("wallet-passphrase")
    print(market.sell(300, 100)  # sell 100 USD for 300 BTS/USD
 
 .. code-block:: python
 
-   from bitshares.dex import Dex
+   from steem.dex import Dex
    dex = Dex()
-   dex.bitshares.wallet.unlock("wallet-passphrase")
+   dex.steem.wallet.unlock("wallet-passphrase")
    dex.adjust_collateral_ratio("SILVER", 3.5)
    
 
@@ -112,7 +112,7 @@ Python-BitShares Libraries
 .. toctree::
    :maxdepth: 1
 
-   bitshares
+   steem
    instances
    account
    amount
diff --git a/docs/installation.rst b/docs/installation.rst
index 2577754021c71dcd7936b66eb521485a9b7672b5..0613324158f4e6d27a4f395ca923e59ec71faf11 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -10,14 +10,14 @@ Install with `pip`:
 ::
 
     $ sudo apt-get install libffi-dev libssl-dev python-dev
-    $ pip3 install bitshares
+    $ pip3 install steem
 
 Manual installation:
 
 ::
 
-    $ git clone https://github.com/xeroc/python-bitshares/
-    $ cd python-bitshares
+    $ git clone https://github.com/xeroc/python-steem/
+    $ cd python-steem
     $ python3 setup.py install --user
 
 Upgrade
diff --git a/docs/instances.rst b/docs/instances.rst
index ccc324a3c95d14a7e8eb15324cc4ad693cd55a93..c4b3981b53168b624eb877ad7a06a4430e79974f 100644
--- a/docs/instances.rst
+++ b/docs/instances.rst
@@ -1,16 +1,16 @@
 Instances
 ~~~~~~~~~
 
-Default instance to be used when no ``bitshares_instance`` is given to
+Default instance to be used when no ``steem_instance`` is given to
 the Objects!
 
 .. code-block:: python
 
-   from bitshares.instance import shared_bitshares_instance
+   from steem.instance import shared_steem_instance
 
    account = Account("xeroc")
    # is equivalent with 
-   account = Account("xeroc", bitshares_instance=shared_bitshares_instance())
+   account = Account("xeroc", steem_instance=shared_steem_instance())
 
-.. automethod:: bitshares.instance.shared_bitshares_instance
-.. automethod:: bitshares.instance.set_shared_bitshares_instance
+.. automethod:: steem.instance.shared_steem_instance
+.. automethod:: steem.instance.set_shared_steem_instance
diff --git a/docs/market.rst b/docs/market.rst
index b9d2ed8b70d4df13ec96f9e91ab044089ae253ed..32b96d8d8c6c23abe8c1ad084d5e24116b959479 100644
--- a/docs/market.rst
+++ b/docs/market.rst
@@ -1,5 +1,5 @@
 Market
 ~~~~~~~
 
-.. autoclass:: bitshares.market.Market
+.. autoclass:: steem.market.Market
     :members:
diff --git a/docs/memo.rst b/docs/memo.rst
index c4992887d169b4e48a36d25e02af6ea113961257..a72b9f7d439e5d65c522779d885a08a3837c9df1 100644
--- a/docs/memo.rst
+++ b/docs/memo.rst
@@ -53,13 +53,13 @@ Example
 Encrypting a memo
 ~~~~~~~~~~~~~~~~~
 
-The high level memo class makes use of the pybitshares wallet to obtain keys
+The high level memo class makes use of the pysteem wallet to obtain keys
 for the corresponding accounts.
 
 .. code-block:: python
 
-    from bitshares.memo import Memo
-    from bitshares.account import Account
+    from steem.memo import Memo
+    from steem.account import Account
 
     memoObj = Memo(
         from_account=Account(from_account),
@@ -73,8 +73,8 @@ Decoding of a received memo
 .. code-block:: python
 
      from getpass import getpass
-     from bitshares.block import Block
-     from bitshares.memo import Memo
+     from steem.block import Block
+     from steem.memo import Memo
 
      # Obtain a transfer from the blockchain
      block = Block(23755086)                   # block
@@ -96,5 +96,5 @@ Decoding of a received memo
 API
 ###
 
-.. automodule:: bitsharesbase.memo
+.. automodule:: steembase.memo
     :members:
diff --git a/docs/notify.rst b/docs/notify.rst
index 746c5fd1970b80dded3246830890c85a14461ea4..63e8d67df50ef12b22c15d2ca91c2127dd640015 100644
--- a/docs/notify.rst
+++ b/docs/notify.rst
@@ -4,5 +4,5 @@ Notify
 This modules allows yout to be notified of events taking place on the
 blockchain.
 
-.. autoclass:: bitshares.notify.Notify
+.. autoclass:: steem.notify.Notify
    :members:
diff --git a/docs/price.rst b/docs/price.rst
index e0d9a7a7d03978ccd89c961c908cfc262005f058..f328c79fb0781d48477ad90162a80d4179a0b7f2 100644
--- a/docs/price.rst
+++ b/docs/price.rst
@@ -1,5 +1,5 @@
 Price
 ~~~~~~
 
-.. autoclass:: bitshares.price.Price
+.. autoclass:: steem.price.Price
    :members:
diff --git a/docs/proposal.rst b/docs/proposal.rst
index e1574ab78c4932627025f73809da7ac1ea8bc778..f0c14089cafec5eab7ae12cc25ccf114d97e09d6 100644
--- a/docs/proposal.rst
+++ b/docs/proposal.rst
@@ -1,8 +1,8 @@
 Proposal
 ~~~~~~~~
 
-.. autoclass:: bitshares.proposal.Proposal
+.. autoclass:: steem.proposal.Proposal
    :members:
 
-.. autoclass:: bitshares.proposal.Proposals
+.. autoclass:: steem.proposal.Proposals
    :members:
diff --git a/docs/storage.rst b/docs/storage.rst
index 3fc9abc6347ecfab4233fa8b4fef46ddfa94dbc0..1e7a4df4c5c1a98d17b4e88ec9aa8cab4d1f4a54 100644
--- a/docs/storage.rst
+++ b/docs/storage.rst
@@ -7,11 +7,11 @@ These classes are very low level and are not well documented.
 API
 ---
 
-.. autoclass:: bitshares.storage.DataDir
+.. autoclass:: steem.storage.DataDir
    :members:
 
-.. autoclass:: bitshares.storage.Key
+.. autoclass:: steem.storage.Key
    :members:
 
-.. autoclass:: bitshares.storage.MasterPassword
+.. autoclass:: steem.storage.MasterPassword
    :members:
diff --git a/docs/support.rst b/docs/support.rst
index f63b4fb8916285b45f1602f81d007ca0ce67d860..5377a837d222595a7fb0b077f4788397aca38abd 100644
--- a/docs/support.rst
+++ b/docs/support.rst
@@ -3,8 +3,7 @@ Support and Questions
 *********************
 
 We have currently not setup a distinct channel for development around
-pybitshares. However, many of the contributors are frequently reading
+pysteemi. However, many of the contributors are frequently reading
 through these channels:
 
-* https://bitsharestalk.org
-* https://t.me/BitSharesDEX
+
diff --git a/docs/transactionbuilder.rst b/docs/transactionbuilder.rst
index 8f2eea10424b5e86ed509a26fd4ac683de6af3db..55fd4b96b007e659fb73a12fc99b4a071bf7312b 100644
--- a/docs/transactionbuilder.rst
+++ b/docs/transactionbuilder.rst
@@ -5,8 +5,8 @@ To build your own transactions and sign them
 
 .. code-block:: python
 
-   from bitshares.transactionbuilder import TransactionBuilder
-   from bitsharesbase.operations import Transfer
+   from steem.transactionbuilder import TransactionBuilder
+   from steembase.operations import Transfer
    tx = TransactionBuilder()
    tx.appendOps(Transfer(**{
             "fee": {"amount": 0, "asset_id": "1.3.0"},  # will be filled in automatically
@@ -18,5 +18,5 @@ To build your own transactions and sign them
    tx.sign()
    tx.broadcast()
 
-.. autoclass:: bitshares.transactionbuilder.TransactionBuilder
+.. autoclass:: steem.transactionbuilder.TransactionBuilder
    :members:
diff --git a/docs/transactions.rst b/docs/transactions.rst
index ecb49767f7b3310893ead75bb1350c8076256ead..63fe9236e8c3e6b84f3a29bd8c73eca5acce46e6 100644
--- a/docs/transactions.rst
+++ b/docs/transactions.rst
@@ -16,7 +16,7 @@ We load the class for manual transaction construction via:
 
 .. code-block:: python
 
-    from bitsharesbase import transactions, operations
+    from steembase import transactions, operations
 
 Construction
 ############
diff --git a/docs/tutorials.rst b/docs/tutorials.rst
index d931604098ccd82fcd15c410166ba6b1d6361c07..2827f9856f2ac9990408eda9b139797ff90df56f 100644
--- a/docs/tutorials.rst
+++ b/docs/tutorials.rst
@@ -14,10 +14,10 @@ executed in the same order as they are added to the transaction.
 .. code-block:: python
 
   from pprint import pprint
-  from bitshares import BitShares
+  from steem import BitShares
 
   testnet = BitShares(
-      "wss://node.testnet.bitshares.eu",
+      "wss://node.testnet.steem.eu",
       nobroadcast=True,
       bundle=True,
   )
@@ -37,16 +37,16 @@ Proposing a Transaction
 
 In BitShares, you can propose a transactions to any account. This is
 used to facilitate on-chain multisig transactions. With
-python-bitshares, you can do this simply by using the ``proposer``
+python-steem, you can do this simply by using the ``proposer``
 attribute:
 
 .. code-block:: python
 
   from pprint import pprint
-  from bitshares import BitShares
+  from steem import BitShares
 
   testnet = BitShares(
-      "wss://node.testnet.bitshares.eu",
+      "wss://node.testnet.steem.eu",
       proposer="xeroc"
   )
   testnet.wallet.unlock("supersecret")
@@ -57,23 +57,23 @@ Simple Sell Script
 
 .. code-block:: python
 
-    from bitshares import BitShares
-    from bitshares.market import Market
-    from bitshares.price import Price
-    from bitshares.amount import Amount
+    from steem import BitShares
+    from steem.market import Market
+    from steem.price import Price
+    from steem.amount import Amount
 
     #
     # Instanciate BitShares (pick network via API node)
     #
-    bitshares = BitShares(
-        "wss://node.testnet.bitshares.eu",
+    steem = BitShares(
+        "wss://node.testnet.steem.eu",
         nobroadcast=True   # <<--- set this to False when you want to fire!
     )
 
     #
     # Unlock the Wallet
     #
-    bitshares.wallet.unlock("<supersecret>")
+    steem.wallet.unlock("<supersecret>")
 
     #
     # This defines the market we are looking at.
@@ -82,7 +82,7 @@ Simple Sell Script
     #
     market = Market(
         "GOLD:USD",
-        bitshares_instance=bitshares
+        steem_instance=steem
     )
 
     #
@@ -100,10 +100,10 @@ Sell at a timely rate
 .. code-block:: python
 
     import threading
-    from bitshares import BitShares
-    from bitshares.market import Market
-    from bitshares.price import Price
-    from bitshares.amount import Amount
+    from steem import BitShares
+    from steem.market import Market
+    from steem.price import Price
+    from steem.amount import Amount
 
 
     def sell():
@@ -121,15 +121,15 @@ Sell at a timely rate
         #
         # Instanciate BitShares (pick network via API node)
         #
-        bitshares = BitShares(
-            "wss://node.testnet.bitshares.eu",
+        steem = BitShares(
+            "wss://node.testnet.steem.eu",
             nobroadcast=True   # <<--- set this to False when you want to fire!
         )
 
         #
         # Unlock the Wallet
         #
-        bitshares.wallet.unlock("<supersecret>")
+        steem.wallet.unlock("<supersecret>")
 
         #
         # This defines the market we are looking at.
@@ -138,7 +138,7 @@ Sell at a timely rate
         #
         market = Market(
             "GOLD:USD",
-            bitshares_instance=bitshares
+            steem_instance=steem
         )
 
         sell()
diff --git a/docs/utils.rst b/docs/utils.rst
index cf9157cdfb321e9076f1c6868afdbf91b8229b60..0a6bb64c894ab7a7e168df9a020f14d44fb1b3d7 100644
--- a/docs/utils.rst
+++ b/docs/utils.rst
@@ -1,5 +1,5 @@
 Utilities
 ~~~~~~~~~~~~~~~~~~~
 
-.. autoclass:: bitshares.utils
+.. autoclass:: steem.utils
    :members:
diff --git a/docs/vesting.rst b/docs/vesting.rst
index b2052931572639124db88f46d75ff610dbb6bfeb..780ac286b0d4a04249baa47c241e5757420464e4 100644
--- a/docs/vesting.rst
+++ b/docs/vesting.rst
@@ -1,5 +1,5 @@
 Vesting
 ~~~~~~~
 
-.. autoclass:: bitshares.vesting.Vesting
+.. autoclass:: steem.vesting.Vesting
    :members:
diff --git a/docs/wallet.rst b/docs/wallet.rst
index beeef88d9891fa475e322a1859ac9a322d9fe3f4..6fdf71c22f4148a075e92ae6730d18728f4fde51 100644
--- a/docs/wallet.rst
+++ b/docs/wallet.rst
@@ -8,9 +8,9 @@ A new wallet can be created by using:
 
 .. code-block:: python
 
-   from bitshares import BitShares
-   bitshares = BitShares()
-   bitshares.wallet.create("supersecret-passphrase")
+   from steem import BitShares
+   steem = BitShares()
+   steem.wallet.create("supersecret-passphrase")
 
 This will raise an exception if you already have a wallet installed.
 
@@ -21,23 +21,23 @@ The wallet can be unlocked for signing using
 
 .. code-block:: python
 
-   from bitshares import BitShares
-   bitshares = BitShares()
-   bitshares.wallet.unlock("supersecret-passphrase")
+   from steem import BitShares
+   steem = BitShares()
+   steem.wallet.unlock("supersecret-passphrase")
 
 Adding a Private Key
 --------------------
 
 A private key can be added by using the
-:func:`bitshares.wallet.Wallet.addPrivateKey` method that is available
+:func:`steem.wallet.Wallet.addPrivateKey` method that is available
 **after** unlocking the wallet with the correct passphrase:
 
 .. code-block:: python
 
-   from bitshares import BitShares
-   bitshares = BitShares()
-   bitshares.wallet.unlock("supersecret-passphrase")
-   bitshares.wallet.addPrivateKey("5xxxxxxxxxxxxxxxxxxxx")
+   from steem import BitShares
+   steem = BitShares()
+   steem.wallet.unlock("supersecret-passphrase")
+   steem.wallet.addPrivateKey("5xxxxxxxxxxxxxxxxxxxx")
 
 .. note:: The private key has to be either in hexadecimal or in wallet
           import format (wif) (starting with a ``5``).
@@ -45,5 +45,5 @@ A private key can be added by using the
 API
 ---
 
-.. autoclass:: bitshares.wallet.Wallet
+.. autoclass:: steem.wallet.Wallet
    :members:
diff --git a/docs/websocket.rst b/docs/websocket.rst
index 3d40296af1fe39d1d82c9ea021ba520316177271..da23a50aa6af67612b260c0334768acfadc46b10 100644
--- a/docs/websocket.rst
+++ b/docs/websocket.rst
@@ -8,10 +8,10 @@ node.
 .. code-block:: python
 
     from pprint import pprint
-    from bitsharesapi.websocket import BitSharesWebsocket
+    from steemapi.websocket import BitSharesWebsocket
 
     ws = BitSharesWebsocket(
-        "wss://node.testnet.bitshares.eu",
+        "wss://node.testnet.steem.eu",
         markets=[["1.3.0", "1.3.172"]],
         accounts=["xeroc"],
         objects=["2.0.x", "2.1.x"],
@@ -23,7 +23,7 @@ node.
 
 Defintion
 =========
-.. autoclass:: bitsharesapi.websocket.BitSharesWebsocket
+.. autoclass:: steemapi.websocket.BitSharesWebsocket
     :members:
     :undoc-members:
     :private-members:
diff --git a/docs/websocketrpc.rst b/docs/websocketrpc.rst
index 9cba4f2aa3c6467c7bf43aa9be2ba4ade7e70afa..daad50b43031bc34f5d3729a13031fb22042d202 100644
--- a/docs/websocketrpc.rst
+++ b/docs/websocketrpc.rst
@@ -7,5 +7,5 @@ websockets.
 
 Defintion
 =========
-.. autoclass:: bitsharesapi.bitsharesnoderpc.BitSharesNodeRPC
+.. autoclass:: steemapi.steemnoderpc.BitSharesNodeRPC
     :members: rpcexec, __getattr__
diff --git a/docs/witness.rst b/docs/witness.rst
index cad8bf4b287b5504f8a1d506e260a9b558f87747..7459ff03cbce54f5cc40b4e02ebad3e717345c87 100644
--- a/docs/witness.rst
+++ b/docs/witness.rst
@@ -5,11 +5,11 @@ Read data about a witness
 
 .. code-block:: python
 
-   from bitshares.witness import Witness
+   from steem.witness import Witness
    Witness("chainsquad.com")
 
-.. autoclass:: bitshares.witness.Witness
+.. autoclass:: steem.witness.Witness
    :members:
 
-.. autoclass:: bitshares.witness.Witnesses
+.. autoclass:: steem.witness.Witnesses
    :members:
diff --git a/docs/worker.rst b/docs/worker.rst
index 8ccc31161724eb38fc1abc18f57186a7b443a3bc..e0c24a9a600a8463503697be7d5d59b4fccef371 100644
--- a/docs/worker.rst
+++ b/docs/worker.rst
@@ -5,11 +5,11 @@ Read data about a worker
 
 .. code-block:: python
 
-   from bitshares.witness import Witness
+   from steem.witness import Witness
    Witness("refund400")
 
-.. autoclass:: bitshares.worker.Worker
+.. autoclass:: steem.worker.Worker
    :members:
 
-.. autoclass:: bitshares.worker.Workers
+.. autoclass:: steem.worker.Workers
    :members:
diff --git a/tests/test_account.py b/tests/test_account.py
index 89ef7478fa6ea4c14a634c177b43090f09398d7e..3899d10e7b9e997aa3cba6936770ecbf06c1d072 100644
--- a/tests/test_account.py
+++ b/tests/test_account.py
@@ -28,15 +28,14 @@ class Testcases(unittest.TestCase):
         set_shared_steem_instance(self.bts)
 
     def test_account(self):
-        Account("witness-account")
-        Account("1.2.3")
+        Account("test")
+        Account("DoesNotExistsXXX")
         # asset = Asset("1.3.0")
         # symbol = asset["symbol"]
-        account = Account("witness-account", full=True)
-        self.assertEqual(account.name, "witness-account")
+        account = Account("test", full=True)
+        self.assertEqual(account.name, "test")
         self.assertEqual(account["name"], account.name)
-        self.assertEqual(account["id"], "1.2.1")
-        self.assertIsInstance(account.balance("1.3.0"), Amount)
+        self.assertIsInstance(account.balance("SBD"), Amount)
         # self.assertIsInstance(account.balance({"symbol": symbol}), Amount)
         self.assertIsInstance(account.balances, list)
         for h in account.history(limit=1):
@@ -52,20 +51,4 @@ class Testcases(unittest.TestCase):
         self.assertEqual(str(account), "<Account 1.2.1>")
         self.assertIsInstance(Account(account), Account)
 
-    def test_account_upgrade(self):
-        account = Account("witness-account")
-        tx = account.upgrade()
-        ops = tx["operations"]
-        op = ops[0][1]
-        self.assertEqual(len(ops), 1)
-        self.assertEqual(
-            getOperationNameForId(ops[0][0]),
-            "account_upgrade"
-        )
-        self.assertTrue(
-            op["upgrade_to_lifetime_member"]
-        )
-        self.assertEqual(
-            op["account_to_upgrade"],
-            "1.2.1",
-        )
+
diff --git a/tests/test_steem.py b/tests/test_steem.py
index f499db8c853facc26aa1f8e14f7d4d165777a9f7..c8c3462e01c118effad4de5a1717dc2d02a7ac16 100644
--- a/tests/test_steem.py
+++ b/tests/test_steem.py
@@ -26,13 +26,13 @@ class Testcases(unittest.TestCase):
         # from getpass import getpass
         # self.bts.wallet.unlock(getpass())
         set_shared_steem_instance(self.bts)
-        self.bts.set_default_account("init0")
+        self.bts.set_default_account("test")
 
     def test_connect(self):
         self.bts.connect()
 
     def test_set_default_account(self):
-        self.bts.set_default_account("init0")
+        self.bts.set_default_account("test")
 
     def test_info(self):
         info = self.bts.info()