diff --git a/beem/conveyor.py b/beem/conveyor.py
index 63c957851b0e4947c62ce6f37ab6712232593f37..93a24df9ec0b78e47fc1c2da0457cfdf7fe247d3 100644
--- a/beem/conveyor.py
+++ b/beem/conveyor.py
@@ -23,7 +23,7 @@ except ImportError:
 
 class Conveyor(object):
     """ Class to access hiveio Conveyor instances:
-        https://github.com/hiveio/conveyor
+        https://gitlab.syncad.com/hive-group//conveyor
 
         Description from the official documentation:
 
@@ -42,7 +42,7 @@ class Conveyor(object):
           consisting of a post title and a body.
 
         The underlying RPC authentication and request signing procedure is
-        described here: https://github.com/hiveio/rpc-auth
+        described here: https://gitlab.syncad.com/hive-group//rpc-auth
 
     """
 
@@ -65,7 +65,7 @@ class Conveyor(object):
 
     def prehash_message(self, timestamp, account, method, params, nonce):
         """ Prepare a hash for the Conveyor API request with SHA256 according
-            to https://github.com/hiveio/rpc-auth
+            to https://gitlab.syncad.com/hive-group//rpc-auth
             Hashing of `second` is then done inside `ecdsasig.sign_message()`.
 
             :param str timestamp: valid iso8601 datetime ending in "Z"
diff --git a/docs/apidefinitions.rst b/docs/apidefinitions.rst
index 1642ae841b50188d85721b8262c78aaa38fd5f50..4329c392ec03100d8a73343c7b195c83509b0c45 100644
--- a/docs/apidefinitions.rst
+++ b/docs/apidefinitions.rst
@@ -670,7 +670,7 @@ get_trending_tags
 .. code-block:: python
 
     from beem.discussions import Query, Trending_tags
-    q = Query(limit=10, start_tag="hiveio")
+    q = Query(limit=10, start_tag="hive")
     for h in Trending_tags(q):
         print(h)
 
diff --git a/tests/beem/test_account.py b/tests/beem/test_account.py
index 87668f946ced11ca5bfced339d59cbc8d7051592..df1af496a917400663f430d3a2b42fcbc35062d5 100644
--- a/tests/beem/test_account.py
+++ b/tests/beem/test_account.py
@@ -10,7 +10,7 @@ import pytz
 from datetime import datetime, timedelta
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.account import Account
 from beem.block import Block
 from beem.amount import Amount
@@ -27,10 +27,10 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
         node_list = nodelist.get_nodes(exclude_limited=True)
       
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=node_list,
             nobroadcast=True,
             bundle=False,
diff --git a/tests/beem/test_amount.py b/tests/beem/test_amount.py
index e46bf31cfa428ad49d16664f8b240f520aef133d..4c974c5d7f3b65e91657c6c0d17acb753c317cab 100644
--- a/tests/beem/test_amount.py
+++ b/tests/beem/test_amount.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 from builtins import super
 import unittest
 from parameterized import parameterized
-from beem import Steem
+from beem import Hive
 from beem.amount import Amount
 from beem.asset import Asset
 from beem.nodelist import NodeList
@@ -17,13 +17,13 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             num_retries=10
         )
-        cls.hiveio = Steem(
+        cls.hiveio = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             use_condenser=False,
diff --git a/tests/beem/test_asset.py b/tests/beem/test_asset.py
index 0155f82eb8e8704b84b327510711531614b02cef..d9f80e706a44ef1956e7667f6db5b9a42532f30a 100644
--- a/tests/beem/test_asset.py
+++ b/tests/beem/test_asset.py
@@ -6,7 +6,7 @@ from builtins import str
 from builtins import super
 import unittest
 from parameterized import parameterized
-from beem import Steem
+from beem import Hive
 from beem.asset import Asset
 from beem.instance import set_shared_hive_instance
 from beem.exceptions import AssetDoesNotExistsException
@@ -17,13 +17,13 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             num_retries=10
         )
-        cls.hiveio = Steem(
+        cls.hiveio = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             num_retries=10
@@ -87,7 +87,7 @@ class Testcases(unittest.TestCase):
     # Mocker comes from pytest-mock, providing an easy way to have patched objects
     # for the life of the test.
     def test_calls(mocker):
-        asset = Asset("USD", lazy=True, hive_instance=Steem(offline=True))
+        asset = Asset("USD", lazy=True, hive_instance=Hive(offline=True))
         method = mocker.patch.object(Asset, 'get_call_orders')
         asset.calls
         method.assert_called_with(10)
diff --git a/tests/beem/test_base_objects.py b/tests/beem/test_base_objects.py
index bd86c090eb13ad07650f49f1e42918af7e6f0db5..022acd16f9d9b82523b58f25d21956f029a617e1 100644
--- a/tests/beem/test_base_objects.py
+++ b/tests/beem/test_base_objects.py
@@ -4,7 +4,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 from builtins import super
 import unittest
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.instance import set_shared_hive_instance
 from beem.account import Account
 from beem.witness import Witness
@@ -15,8 +15,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             num_retries=10
diff --git a/tests/beem/test_block.py b/tests/beem/test_block.py
index caf5a2deb7bda37522a078076e767d3e92970c9d..8bc0f44276b70a334154f9749655b0f90730e5de 100644
--- a/tests/beem/test_block.py
+++ b/tests/beem/test_block.py
@@ -6,7 +6,7 @@ from builtins import super
 import unittest
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.block import Block, BlockHeader
 from datetime import datetime
 from beem.instance import set_shared_hive_instance
@@ -19,8 +19,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             keys={"active": wif},
diff --git a/tests/beem/test_blockchain.py b/tests/beem/test_blockchain.py
index 8d6a929a95cd5a86b16de6ab7fa7da8b024a2abf..188616754a45d953fcfa4909354062d95f72d532 100644
--- a/tests/beem/test_blockchain.py
+++ b/tests/beem/test_blockchain.py
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 import pytz
 import time
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.blockchain import Blockchain
 from beem.exceptions import BlockWaitTimeExceeded
 from beem.block import Block
@@ -25,8 +25,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             keys={"active": wif},
@@ -221,8 +221,8 @@ class Testcases(unittest.TestCase):
     def test_hash_op(self):
         bts = self.bts
         b = Blockchain(hive_instance=bts)
-        op1 = {'type': 'vote_operation', 'value': {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'hiveio-sandwich-contest-week-25-2da-entry', 'weight': 100}}
-        op2 = ['vote', {'voter': 'ubg', 'author': 'yesslife', 'permlink': 'hiveio-sandwich-contest-week-25-2da-entry', 'weight': 100}]
+        op1 = {'type': 'vote_operation', 'value': {'voter': 'ubg', 'author': 'hiveio', 'permlink': 'announcing-the-launch-of-hive-blockchain', 'weight': 100}}
+        op2 = ['vote', {'voter': 'ubg', 'author': 'hiveio', 'permlink': 'announcing-the-launch-of-hive-blockchain', 'weight': 100}]
         hash1 = b.hash_op(op1)
         hash2 = b.hash_op(op2)
         self.assertEqual(hash1, hash2)
diff --git a/tests/beem/test_blockchain_batch.py b/tests/beem/test_blockchain_batch.py
index 036010a2287312ea7526fa177dc2d43c42345e7c..9c582ecb9d90d095888d0f8b02bc5590fb9daa59 100644
--- a/tests/beem/test_blockchain_batch.py
+++ b/tests/beem/test_blockchain_batch.py
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 import pytz
 import time
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.blockchain import Blockchain
 from beem.block import Block
 from beem.instance import set_shared_hive_instance
@@ -23,8 +23,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             num_retries=10,
diff --git a/tests/beem/test_blockchain_threading.py b/tests/beem/test_blockchain_threading.py
index da81cf05d41901746340c74a49eec38a0306e832..88fd22307caf0a7dd9d7d070395e7ff2390bf6bf 100644
--- a/tests/beem/test_blockchain_threading.py
+++ b/tests/beem/test_blockchain_threading.py
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta
 import pytz
 import time
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.blockchain import Blockchain
 from beem.block import Block
 from beem.instance import set_shared_hive_instance
@@ -20,8 +20,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             timeout=30,
diff --git a/tests/beem/test_cli.py b/tests/beem/test_cli.py
index 19d3107b5db53454e259aa6fe5cdcc3e6cb24fe9..b054b8667e6249c335bc834681b110cb4614cfbd 100644
--- a/tests/beem/test_cli.py
+++ b/tests/beem/test_cli.py
@@ -9,7 +9,7 @@ import mock
 import click
 from click.testing import CliRunner
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.account import Account
 from beem.amount import Amount
 from beemgraphenebase.account import PrivateKey
@@ -29,7 +29,7 @@ class Testcases(unittest.TestCase):
     def setUpClass(cls):
         nodelist = NodeList()
         nodelist.update_nodes()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
         cls.node_list = nodelist.get_nodes(exclude_limited=True)
        
         # hv = shared_hive_instance()
@@ -154,14 +154,14 @@ class Testcases(unittest.TestCase):
 
     def test_upvote(self):
         runner = CliRunner()
-        result = runner.invoke(cli, ['-ds', 'upvote', '@hiveio/firstpost'], input="test\n")
+        result = runner.invoke(cli, ['-ds', 'upvote', '@hiveio/announcing-the-launch-of-hive-blockchain'], input="test\n")
         self.assertEqual(result.exit_code, 0)
-        result = runner.invoke(cli, ['-ds', 'upvote', '--weight', '100', '@hiveio/firstpost'], input="test\n")
+        result = runner.invoke(cli, ['-ds', 'upvote', '--weight', '100', '@hiveio/announcing-the-launch-of-hive-blockchain'], input="test\n")
         self.assertEqual(result.exit_code, 0)
 
     def test_downvote(self):
         runner = CliRunner()
-        result = runner.invoke(cli, ['-ds', 'downvote', '--weight', '100', '@hiveio/firstpost'], input="test\n")
+        result = runner.invoke(cli, ['-ds', 'downvote', '--weight', '100', '@hiveio/announcing-the-launch-of-hive-blockchain'], input="test\n")
         self.assertEqual(result.exit_code, 0)
 
     def test_transfer(self):
@@ -315,7 +315,7 @@ class Testcases(unittest.TestCase):
 
     def test_rehive(self):
         runner = CliRunner()
-        result = runner.invoke(cli, ['-dso', 'rehive', '@hiveio/firstposte'], input="test\n")
+        result = runner.invoke(cli, ['-dso', 'rehive', '@hiveio/announcing-the-launch-of-hive-blockchain'], input="test\n")
         self.assertEqual(result.exit_code, 0)
 
     def test_follow_unfollow(self):
diff --git a/tests/beem/test_comment.py b/tests/beem/test_comment.py
index cb5beaeaebe4325617a799297b5c4c614de03f45..96bee5eb55b10c6d188e8f36cd8a3ad2cb8ef79f 100644
--- a/tests/beem/test_comment.py
+++ b/tests/beem/test_comment.py
@@ -6,7 +6,7 @@ from builtins import super, str
 import unittest
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.comment import Comment, RecentReplies, RecentByPath
 from beem.vote import Vote
 from beem.account import Account
@@ -21,10 +21,10 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
         node_list = nodelist.get_nodes(exclude_limited=True)
 
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=node_list,
             use_condenser=True,
             nobroadcast=True,
@@ -32,7 +32,7 @@ class Testcases(unittest.TestCase):
             keys={"active": wif},
             num_retries=10
         )
-        cls.hiveio = Steem(
+        cls.hiveio = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             unsigned=True,
diff --git a/tests/beem/test_connection.py b/tests/beem/test_connection.py
index 5bb785cc5648adc20f542a28c2074834a1fc5511..320d888dadedd3d605d445e4101793399ca64d92 100644
--- a/tests/beem/test_connection.py
+++ b/tests/beem/test_connection.py
@@ -1,5 +1,5 @@
 import unittest
-from beem import Steem
+from beem import Hive
 from beem.account import Account
 from beem.instance import set_shared_hive_instance, SharedInstance
 from beem.blockchainobject import BlockchainObject
@@ -13,15 +13,15 @@ class Testcases(unittest.TestCase):
 
     def test_hv1hv2(self):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        b1 = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        b1 = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             num_retries=10
         )
         node_list = nodelist.get_nodes(exclude_limited=True)
 
-        b2 = Steem(
+        b2 = Hive(
             node=node_list,
             nobroadcast=True,
             num_retries=10
@@ -31,9 +31,9 @@ class Testcases(unittest.TestCase):
 
     def test_default_connection(self):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
 
-        b2 = Steem(
+        b2 = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
         )
diff --git a/tests/beem/test_constants.py b/tests/beem/test_constants.py
index c546769935bb3762109ddd4c16f796d9a667b4d9..ee274766672235c4e024b181e109d7e25d3263ae 100644
--- a/tests/beem/test_constants.py
+++ b/tests/beem/test_constants.py
@@ -10,7 +10,7 @@ import pytz
 from datetime import datetime, timedelta
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem, exceptions, constants
+from beem import Hive, exceptions, constants
 from beem.nodelist import NodeList
 
 wif = "5KQwrPbwdL6PhXujxW37FSSQZ1JiwsST4cqQzDeyXtP79zkvFD3"
@@ -21,8 +21,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.appbase = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.appbase = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             bundle=False,
diff --git a/tests/beem/test_conveyor.py b/tests/beem/test_conveyor.py
index 27ad87717f7df026d1687ce875070535c9435e6a..5b937745d1126d63ea216843be7f263d57aad7b4 100644
--- a/tests/beem/test_conveyor.py
+++ b/tests/beem/test_conveyor.py
@@ -3,7 +3,7 @@ from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
 import unittest
-from beem import Steem
+from beem import Hive
 from beem.conveyor import Conveyor
 from beem.instance import set_shared_hive_instance
 from beem.nodelist import NodeList
@@ -16,7 +16,7 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        hv = Steem(node=nodelist.get_nodes(), nobroadcast=True,
+        hv = Hive(node=nodelist.get_nodes(), nobroadcast=True,
                     num_retries=10, expiration=120)
         set_shared_hive_instance(hv)
 
diff --git a/tests/beem/test_discussions.py b/tests/beem/test_discussions.py
index 94c465d9c1c0e5bc04a1799bcf6178e4eff6ac12..13dfa659359cf7e54a95a47d520d3508af5f5e75 100644
--- a/tests/beem/test_discussions.py
+++ b/tests/beem/test_discussions.py
@@ -6,7 +6,7 @@ from builtins import super
 import unittest
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.discussions import (
     Query, Discussions_by_trending, Comment_discussions_by_payout,
     Post_discussions_by_payout, Discussions_by_created, Discussions_by_active,
@@ -25,10 +25,10 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False, appbase=True), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False, appbase=True), num_retries=10))
         node_list = nodelist.get_nodes(exclude_limited=True)
       
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=node_list,
             use_condenser=True,
             nobroadcast=True,
@@ -44,7 +44,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_trending(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -52,7 +52,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Comment_discussions_by_payout(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -61,7 +61,7 @@ class Testcases(unittest.TestCase):
 
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Post_discussions_by_payout(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -69,7 +69,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_created(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -77,7 +77,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_active(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -91,7 +91,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_votes(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -99,7 +99,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 10
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_children(query, hive_instance=bts)
         self.assertEqual(len(d), 10)
 
@@ -132,7 +132,7 @@ class Testcases(unittest.TestCase):
         bts = self.bts
         query = Query()
         query["limit"] = 1
-        query["tag"] = "hiveio"
+        query["tag"] = "hive"
         d = Discussions_by_promoted(query, hive_instance=bts)
         discussions = Discussions(hive_instance=bts)
         d2 = []
diff --git a/tests/beem/test_instance.py b/tests/beem/test_instance.py
index 473a05d6eb933ded182f1c77ae54fcba239ed3a9..0977c2ac0e1652d880c41e3083566ebdd913b188 100644
--- a/tests/beem/test_instance.py
+++ b/tests/beem/test_instance.py
@@ -10,7 +10,7 @@ import unittest
 import random
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.amount import Amount
 from beem.witness import Witness
 from beem.account import Account
@@ -39,14 +39,14 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.nodelist = NodeList()
-        cls.nodelist.update_nodes(hive_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        hv = Steem(node=cls.nodelist.get_nodes())
+        cls.nodelist.update_nodes(hive_instance=Hive(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        hv = Hive(node=cls.nodelist.get_nodes())
         hv.config.refreshBackup()
         hv.set_default_nodes(["xyz"])
         del hv
 
         cls.urls = cls.nodelist.get_nodes(exclude_limited=True)
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=cls.urls,
             nobroadcast=True,
             num_retries=10
@@ -61,7 +61,7 @@ class Testcases(unittest.TestCase):
 
     @classmethod
     def tearDownClass(cls):
-        hv = Steem(node=cls.nodelist.get_nodes())
+        hv = Hive(node=cls.nodelist.get_nodes())
         hv.config.recover_with_latest_backup()
 
     @parameterized.expand([
@@ -77,9 +77,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Account("test", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Account("test", hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             acc = Account("test", hive_instance=hv)
             self.assertIn(acc.hive.rpc.url, self.urls)
@@ -95,7 +95,7 @@ class Testcases(unittest.TestCase):
     ])
     def test_amount(self, node_param):
         if node_param == "instance":
-            hv = Steem(node="https://abc.d", autoconnect=False, num_retries=1)
+            hv = Hive(node="https://abc.d", autoconnect=False, num_retries=1)
             set_shared_hive_instance(self.bts)
             o = Amount("1 HBD")
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -104,7 +104,7 @@ class Testcases(unittest.TestCase):
             ):
                 Amount("1 HBD", hive_instance=hv)
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Amount("1 HBD", hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -125,9 +125,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Block(1, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Block(1, hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Block(1, hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -148,9 +148,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Blockchain(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Blockchain(hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Blockchain(hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -171,9 +171,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Comment(self.authorperm, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Comment(self.authorperm, hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Comment(self.authorperm, hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -194,9 +194,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Market(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Market(hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Market(hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -217,9 +217,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Price(10.0, "HIVE/HBD", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Price(10.0, "HIVE/HBD", hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Price(10.0, "HIVE/HBD", hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -240,9 +240,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Vote(self.authorpermvoter, hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Vote(self.authorpermvoter, hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Vote(self.authorpermvoter, hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -263,10 +263,10 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                o = Wallet(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                o = Wallet(hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
                 o.hive.get_config()
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Wallet(hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -288,9 +288,9 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                Witness("gtg", hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                Witness("gtg", hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = Witness("gtg", hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -311,10 +311,10 @@ class Testcases(unittest.TestCase):
             with self.assertRaises(
                 RPCConnection
             ):
-                o = TransactionBuilder(hive_instance=Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+                o = TransactionBuilder(hive_instance=Hive(node="https://abc.d", autoconnect=False, num_retries=1))
                 o.hive.get_config()
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = TransactionBuilder(hive_instance=hv)
             self.assertIn(o.hive.rpc.url, self.urls)
@@ -331,16 +331,16 @@ class Testcases(unittest.TestCase):
     def test_hive(self, node_param):
         if node_param == "instance":
             set_shared_hive_instance(self.bts)
-            o = Steem(node=self.urls)
+            o = Hive(node=self.urls)
             o.get_config()
             self.assertIn(o.rpc.url, self.urls)
             with self.assertRaises(
                 RPCConnection
             ):
-                hv = Steem(node="https://abc.d", autoconnect=False, num_retries=1)
+                hv = Hive(node="https://abc.d", autoconnect=False, num_retries=1)
                 hv.get_config()
         else:
-            set_shared_hive_instance(Steem(node="https://abc.d", autoconnect=False, num_retries=1))
+            set_shared_hive_instance(Hive(node="https://abc.d", autoconnect=False, num_retries=1))
             hv = self.bts
             o = hv
             o.get_config()
diff --git a/tests/beem/test_market.py b/tests/beem/test_market.py
index fd72f1a8f77efeb1ab62ab3940169ed71d454e84..78b2d745bd6b5b8e85d988f880e3108fdd8386bc 100644
--- a/tests/beem/test_market.py
+++ b/tests/beem/test_market.py
@@ -6,7 +6,7 @@ from builtins import super
 import unittest
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.market import Market
 from beem.price import Price
 from beem.asset import Asset
@@ -22,8 +22,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             unsigned=True,
diff --git a/tests/beem/test_message.py b/tests/beem/test_message.py
index a5fa27b655396bb3f8bda99591e202e46fa48cc0..5df689b8105d4fb79b104cfbb224cd48d7a29358 100644
--- a/tests/beem/test_message.py
+++ b/tests/beem/test_message.py
@@ -1,7 +1,7 @@
 from builtins import super
 import unittest
 import mock
-from beem import Steem
+from beem import Hive
 from beem.message import Message
 from beem.account import Account
 from beem.instance import set_shared_hive_instance
@@ -16,8 +16,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             keys=[wif],
diff --git a/tests/beem/test_nodelist.py b/tests/beem/test_nodelist.py
index af5804aff1d76e4d46e7b55b07a967703263cbb5..49a24eb0184e9ccf02b6b1b6e0d59ae81404dcfa 100644
--- a/tests/beem/test_nodelist.py
+++ b/tests/beem/test_nodelist.py
@@ -4,7 +4,7 @@ from __future__ import print_function
 from __future__ import unicode_literals
 from builtins import super
 import unittest
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.instance import set_shared_hive_instance
 from beem.account import Account
 from beem.nodelist import NodeList
@@ -14,7 +14,7 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=False),
             nobroadcast=True,
             num_retries=10
diff --git a/tests/beem/test_objectcache.py b/tests/beem/test_objectcache.py
index ede9c18cb50e6b86c873f3c422da5a10bc55c3da..7b6b53e3914fa4c55770ca2c474e97efa5d15c48 100644
--- a/tests/beem/test_objectcache.py
+++ b/tests/beem/test_objectcache.py
@@ -6,7 +6,7 @@ from builtins import super
 from builtins import str
 import time
 import unittest
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.instance import set_shared_hive_instance
 from beem.blockchainobject import ObjectCache
 from beem.account import Account
diff --git a/tests/beem/test_price.py b/tests/beem/test_price.py
index d8a59f6f483f664feb2803dd17b66112d1cc5f0c..6e61b70936ba23bd40ac95a2cf3eaf01a82a31ea 100644
--- a/tests/beem/test_price.py
+++ b/tests/beem/test_price.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 from __future__ import unicode_literals
-from beem import Steem
+from beem import Hive
 from beem.instance import set_shared_hive_instance
 from beem.amount import Amount
 from beem.price import Price, Order, FilledOrder
@@ -15,8 +15,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        hive = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        hive = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             num_retries=10
diff --git a/tests/beem/test_steem.py b/tests/beem/test_steem.py
index 2362e707af8fd282cb59bdf504494d5387a4a70b..f1df25350bfe94b502185d4f52738de58cafa274 100644
--- a/tests/beem/test_steem.py
+++ b/tests/beem/test_steem.py
@@ -11,7 +11,7 @@ from parameterized import parameterized
 import random
 import json
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.amount import Amount
 from beem.memo import Memo
 from beem.version import version as beem_version
@@ -32,8 +32,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         cls.nodelist = NodeList()
-        cls.nodelist.update_nodes(hive_instance=Steem(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        cls.nodelist.update_nodes(hive_instance=Hive(node=cls.nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=cls.nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             unsigned=True,
@@ -62,7 +62,7 @@ class Testcases(unittest.TestCase):
         self.assertEqual(float(amount), 1.33)
 
     def test_create_account(self):
-        bts = Steem(node=self.nodelist.get_nodes(),
+        bts = Hive(node=self.nodelist.get_nodes(),
                     nobroadcast=True,
                     unsigned=True,
                     data_refresh_time_seconds=900,
@@ -131,7 +131,7 @@ class Testcases(unittest.TestCase):
             "test")
 
     def test_create_account_password(self):
-        bts = Steem(node=self.nodelist.get_nodes(),
+        bts = Hive(node=self.nodelist.get_nodes(),
                     nobroadcast=True,
                     unsigned=True,
                     data_refresh_time_seconds=900,
@@ -362,7 +362,7 @@ class Testcases(unittest.TestCase):
         self.assertFalse(bts.get_blockchain_version() == '0.0.0')
 
     def test_offline(self):
-        bts = Steem(node=self.nodelist.get_nodes(),
+        bts = Hive(node=self.nodelist.get_nodes(),
                     offline=True,
                     data_refresh_time_seconds=900,
                     keys={"active": wif, "owner": wif, "memo": wif})
@@ -385,7 +385,7 @@ class Testcases(unittest.TestCase):
         self.assertEqual(bts.get_blockchain_version(), '0.0.0')
 
     def test_properties(self):
-        bts = Steem(node=self.nodelist.get_nodes(),
+        bts = Hive(node=self.nodelist.get_nodes(),
                     nobroadcast=True,
                     data_refresh_time_seconds=900,
                     keys={"active": wif, "owner": wif, "memo": wif},
diff --git a/tests/beem/test_steemconnect.py b/tests/beem/test_steemconnect.py
index bdf46b0a0f53d4b0cc24a30ef0f382acad021e6b..8ee100e9a6e14472582ca8a5fbf62295c03fbb72 100644
--- a/tests/beem/test_steemconnect.py
+++ b/tests/beem/test_steemconnect.py
@@ -11,7 +11,7 @@ from parameterized import parameterized
 import random
 import json
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.amount import Amount
 from beem.memo import Memo
 from beem.version import version as beem_version
@@ -32,8 +32,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             unsigned=True,
diff --git a/tests/beem/test_storage.py b/tests/beem/test_storage.py
index 0ad0c17554fe8614482a3eab00a5c3ad65a4cb40..16b6c0c4a22529586ed9b708a61ae5c2c7047518 100644
--- a/tests/beem/test_storage.py
+++ b/tests/beem/test_storage.py
@@ -11,7 +11,7 @@ from parameterized import parameterized
 import random
 import json
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.amount import Amount
 from beem.memo import Memo
 from beem.version import version as beem_version
@@ -33,9 +33,9 @@ class Testcases(unittest.TestCase):
         hv = shared_hive_instance()
         hv.config.refreshBackup()
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
 
-        cls.hv = Steem(
+        cls.hv = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             # We want to bundle many operations into a single transaction
diff --git a/tests/beem/test_testnet.py b/tests/beem/test_testnet.py
index 18e15dc55bcd519dd6dc0c783b604a2df2b2ace2..9dc0faf537e9a425ffed35e74bf033280bd58339 100644
--- a/tests/beem/test_testnet.py
+++ b/tests/beem/test_testnet.py
@@ -9,7 +9,7 @@ import string
 import unittest
 import random
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.exceptions import (
     InsufficientAuthorityError,
     MissingKeyError,
@@ -45,7 +45,7 @@ class Testcases(unittest.TestCase):
         # hv.config.refreshBackup()
         # nodes = nodelist.get_testnet()
         cls.nodes = nodelist.get_nodes()
-        cls.bts = Steem(
+        cls.bts = Hive(
             node=cls.nodes,
             nobroadcast=True,
             num_retries=10,
@@ -289,7 +289,7 @@ class Testcases(unittest.TestCase):
         # Send a 2 of 2 transaction from elf which needs beem4's cosign to send
         # funds but sign the transaction with elf's key and then serialize the transaction
         # and deserialize the transaction.  After that, sign with beem4's key.
-        hive = Steem(
+        hive = Hive(
             node=self.nodes,
             num_retries=10,
             keys=[self.active_private_key_of_beem5],
@@ -311,7 +311,7 @@ class Testcases(unittest.TestCase):
         del hive
         del tx
 
-        hive = Steem(
+        hive = Hive(
             node=self.nodes,
             num_retries=10,
             keys=[self.active_private_key_of_beem4],
@@ -519,7 +519,7 @@ class Testcases(unittest.TestCase):
 
     def test_appendWif(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     nobroadcast=True,
                     expiration=120,
                     num_retries=10)
@@ -542,7 +542,7 @@ class Testcases(unittest.TestCase):
 
     def test_appendSigner(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     keys=[self.active_key],
                     nobroadcast=True,
                     expiration=120,
@@ -564,7 +564,7 @@ class Testcases(unittest.TestCase):
 
     def test_verifyAuthorityException(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     keys=[self.posting_key],
                     nobroadcast=True,
                     expiration=120,
@@ -587,7 +587,7 @@ class Testcases(unittest.TestCase):
 
     def test_Transfer_broadcast(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     keys=[self.active_key],
                     nobroadcast=True,
                     expiration=120,
@@ -624,7 +624,7 @@ class Testcases(unittest.TestCase):
     
     def test_follow_active_key(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     keys=[self.active_key],
                     nobroadcast=True,
                     expiration=120,
@@ -634,7 +634,7 @@ class Testcases(unittest.TestCase):
 
     def test_follow_posting_key(self):
         nodelist = NodeList()
-        hv = Steem(node=self.nodes,
+        hv = Hive(node=self.nodes,
                     keys=[self.posting_key],
                     nobroadcast=True,
                     expiration=120,
diff --git a/tests/beem/test_txbuffers.py b/tests/beem/test_txbuffers.py
index 975249881b608c61294ee41f1621f913a0a7ac4f..819679f0bfe0da29a4eefcb82f41e7653ecc7a08 100644
--- a/tests/beem/test_txbuffers.py
+++ b/tests/beem/test_txbuffers.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 from builtins import super
 import unittest
 from parameterized import parameterized
-from beem import Steem
+from beem import Hive
 from beem.instance import set_shared_hive_instance
 from beem.transactionbuilder import TransactionBuilder
 from beembase.signedtransactions import Signed_Transaction
@@ -32,15 +32,15 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
         node_list = nodelist.get_nodes(exclude_limited=True)
-        cls.hv = Steem(
+        cls.hv = Hive(
             node=node_list,
             keys={"active": wif, "owner": wif, "memo": wif},
             nobroadcast=True,
             num_retries=10
         )
-        cls.hiveio = Steem(
+        cls.hiveio = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             keys={"active": wif, "owner": wif, "memo": wif},
diff --git a/tests/beem/test_vote.py b/tests/beem/test_vote.py
index 41b2ccf8927d079f058e9e0beef68b7b5ba9c684..ea84994e7085036be6ed133f9901168e7a45ebd8 100644
--- a/tests/beem/test_vote.py
+++ b/tests/beem/test_vote.py
@@ -8,7 +8,7 @@ from parameterized import parameterized
 import pytz
 from datetime import datetime, timedelta
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.comment import Comment
 from beem.account import Account
 from beem.vote import Vote, ActiveVotes, AccountVotes
@@ -23,8 +23,8 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             keys={"active": wif},
diff --git a/tests/beem/test_wallet.py b/tests/beem/test_wallet.py
index 2c253b8deb627b507e655d7b8c0cca3cb6a34c1f..b64295fa54e5ab77281e9601a9300764a77dfab3 100644
--- a/tests/beem/test_wallet.py
+++ b/tests/beem/test_wallet.py
@@ -7,7 +7,7 @@ import unittest
 from parameterized import parameterized
 import mock
 from pprint import pprint
-from beem import Steem, exceptions
+from beem import Hive, exceptions
 from beem.account import Account
 from beem.amount import Amount
 from beem.asset import Asset
@@ -24,9 +24,9 @@ class Testcases(unittest.TestCase):
         hv = shared_hive_instance()
         hv.config.refreshBackup()
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
 
-        cls.hv = Steem(
+        cls.hv = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             # We want to bundle many operations into a single transaction
diff --git a/tests/beem/test_witness.py b/tests/beem/test_witness.py
index 2048765cbf4def74d44429136d4ef1c1392e6d1b..cc2c35568b6828fa2837f70b2c30f55369c01de9 100644
--- a/tests/beem/test_witness.py
+++ b/tests/beem/test_witness.py
@@ -6,7 +6,7 @@ from builtins import super
 import unittest
 from parameterized import parameterized
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beem.witness import Witness, Witnesses, WitnessesVotedByAccount, WitnessesRankedByVote
 from beem.instance import set_shared_hive_instance
 from beem.nodelist import NodeList
@@ -18,15 +18,15 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
-        cls.bts = Steem(
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(exclude_limited=False), num_retries=10))
+        cls.bts = Hive(
             node=nodelist.get_nodes(exclude_limited=True),
             nobroadcast=True,
             unsigned=True,
             keys={"active": wif},
             num_retries=10
         )
-        cls.hiveio = Steem(
+        cls.hiveio = Hive(
             node="https://api.hive.blog",
             nobroadcast=True,
             unsigned=True,
diff --git a/tests/beemapi/test_steemnoderpc.py b/tests/beemapi/test_steemnoderpc.py
index d1a7081d90a5c0730dcb7cfd4b100d16133025fc..21afe29d38ed7c5ec668d5acba12913f15336a1b 100644
--- a/tests/beemapi/test_steemnoderpc.py
+++ b/tests/beemapi/test_steemnoderpc.py
@@ -12,7 +12,7 @@ from parameterized import parameterized
 import random
 import itertools
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beemapi.hivenoderpc import SteemNodeRPC
 from beemapi.websocket import SteemWebsocket
 from beemapi import exceptions
@@ -31,13 +31,13 @@ class Testcases(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=3))
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=3))
         cls.nodes = nodelist.get_nodes()
         if "https://api.hive.blog" in cls.nodes:
             cls.nodes.remove("https://api.hive.blog")
         cls.nodes_hiveit = ["https://api.hive.blog"]
 
-        cls.appbase = Steem(
+        cls.appbase = Hive(
             node=cls.nodes,
             nobroadcast=True,
             keys={"active": wif, "owner": wif, "memo": wif},
diff --git a/tests/beemapi/test_websocket.py b/tests/beemapi/test_websocket.py
index 3df13f2831bd252f2fd3d721f5c86b781d60d148..6dedba048596dc920839b0f043fa4d6dbf062323 100644
--- a/tests/beemapi/test_websocket.py
+++ b/tests/beemapi/test_websocket.py
@@ -10,7 +10,7 @@ import unittest
 import random
 import itertools
 from pprint import pprint
-from beem import Steem
+from beem import Hive
 from beemapi.websocket import SteemWebsocket
 from beem.instance import set_shared_hive_instance
 from beem.nodelist import NodeList
@@ -26,8 +26,8 @@ class Testcases(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         nodelist = NodeList()
-        nodelist.update_nodes(hive_instance=Steem(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
-        hv = Steem(node=nodelist.get_nodes())
+        nodelist.update_nodes(hive_instance=Hive(node=nodelist.get_nodes(normal=True, appbase=True), num_retries=10))
+        hv = Hive(node=nodelist.get_nodes())
 
         self.ws = SteemWebsocket(
             urls=hv.rpc.nodes,
diff --git a/tests/beembase/test_transactions.py b/tests/beembase/test_transactions.py
index e6133ec8f899600477e7ef82bfd39685871381fe..8bc9569b3490f81c7cbffddbe2ef60fa46c341d4 100644
--- a/tests/beembase/test_transactions.py
+++ b/tests/beembase/test_transactions.py
@@ -26,7 +26,7 @@ from beembase.operationids import getOperationNameForId
 from beemgraphenebase.py23 import py23_bytes, bytes_types
 from beem.amount import Amount
 from beem.asset import Asset
-from beem.hive import Steem
+from beem.hive import Hive
 
 
 TEST_AGAINST_CLI_WALLET = False
@@ -43,7 +43,7 @@ class Testcases(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.hv = Steem(
+        self.hv = Hive(
             offline=True
         )
 
diff --git a/tests/beemgraphene/test_objects.py b/tests/beemgraphene/test_objects.py
index 195038d55b5fae7a322b21d64e1dc4878261e9a6..2c05d014a20acf8184786eec303589fec9303ca7 100644
--- a/tests/beemgraphene/test_objects.py
+++ b/tests/beemgraphene/test_objects.py
@@ -8,7 +8,7 @@ import json
 from beemgraphenebase import objects
 from beemgraphenebase import types
 from beem.amount import Amount
-from beem import Steem
+from beem import Hive
 
 
 class Testcases(unittest.TestCase):
diff --git a/tests/beemgraphene/test_types.py b/tests/beemgraphene/test_types.py
index bd39a3eae365c78d32a9e9cde9081d93fae87025..18cb06cbafd69cd5ef9a9443f483cf2fe7c5b96d 100644
--- a/tests/beemgraphene/test_types.py
+++ b/tests/beemgraphene/test_types.py
@@ -8,7 +8,7 @@ import unittest
 import json
 from beemgraphenebase import types
 from beem.amount import Amount
-from beem import Steem
+from beem import Hive
 from beemgraphenebase.py23 import (
     py23_bytes,
     py23_chr,