diff --git a/docs/beem.blockchaininstance.rst b/docs/beem.blockchaininstance.rst
new file mode 100644
index 0000000000000000000000000000000000000000..cde7a967db32a38732564a38fcfd4235070f7fc3
--- /dev/null
+++ b/docs/beem.blockchaininstance.rst
@@ -0,0 +1,7 @@
+beem\.blockchaininstance
+========================
+
+.. automodule:: beem.blockchaininstance
+    :members:
+    :undoc-members:
+    :show-inheritance:
\ No newline at end of file
diff --git a/docs/beem.hive.rst b/docs/beem.hive.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0d96cd81ce3d3fd7f7ac8c7978ecb1a0e19d1786
--- /dev/null
+++ b/docs/beem.hive.rst
@@ -0,0 +1,7 @@
+beem\.hive
+==========
+
+.. automodule:: beem.hive
+    :members:
+    :undoc-members:
+    :show-inheritance:
\ No newline at end of file
diff --git a/docs/beem.hivesigner.rst b/docs/beem.hivesigner.rst
new file mode 100644
index 0000000000000000000000000000000000000000..ad91028ab0a02364d1a7d2af602b2b4bfde99319
--- /dev/null
+++ b/docs/beem.hivesigner.rst
@@ -0,0 +1,7 @@
+beem\.hivesigner
+================
+
+.. automodule:: beem.hivesigner
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/beemapi.noderpc.rst b/docs/beemapi.noderpc.rst
new file mode 100644
index 0000000000000000000000000000000000000000..e630d7f03f67dad124bd75e02b209c93daa7ca16
--- /dev/null
+++ b/docs/beemapi.noderpc.rst
@@ -0,0 +1,7 @@
+beemapi\.noderpc
+================
+
+.. automodule:: beemapi.noderpc
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/docs/beemapi.steemnoderpc.rst b/docs/beemapi.steemnoderpc.rst
deleted file mode 100644
index 3ebaf862231420ed88c90a0523c1d7e07eff5dca..0000000000000000000000000000000000000000
--- a/docs/beemapi.steemnoderpc.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-beemapi\.steemnoderpc
-=====================
-
-.. automodule:: beemapi.steemnoderpc
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/docs/beemapi.websocket.rst b/docs/beemapi.websocket.rst
index 75f31fe4b060de1e1e50b35eb3e676df0458f473..04121b089999ee4e783bffb091fc8e5b253cd360 100644
--- a/docs/beemapi.websocket.rst
+++ b/docs/beemapi.websocket.rst
@@ -7,9 +7,9 @@ node.
 .. code-block:: python
 
     from pprint import pprint
-    from beemapi.websocket import SteemWebsocket
+    from beemapi.websocket import NodeWebsocket
 
-    ws = SteemWebsocket(
+    ws = NodeWebsocket(
         "wss://gtg.steem.house:8090",
         accounts=["test"],
         on_block=print,
@@ -18,7 +18,7 @@ node.
     ws.run_forever()
 
 
-.. autoclass:: beemapi.websocket.SteemWebsocket
+.. autoclass:: beemapi.websocket.NodeWebsocket
     :members:
     :undoc-members:
     :private-members:
diff --git a/docs/modules.rst b/docs/modules.rst
index 031f9c2038a2a6c461f849d1b55457cf93a6f7ac..18ce79717ff5f31ac6cb9ca72d52b9391c4a168b 100644
--- a/docs/modules.rst
+++ b/docs/modules.rst
@@ -14,10 +14,13 @@ beem Modules
    beem.block
    beem.blockchain
    beem.blockchainobject
+   beem.blockchaininstance
    beem.comment
    beem.conveyor
    beem.discussions
    beem.exceptions
+   beem.hive
+   beem.hivesigner
    beem.imageuploader
    beem.instance
    beem.market
@@ -45,7 +48,7 @@ beemapi Modules
    beemapi.exceptions
    beemapi.graphenenerpc
    beemapi.node
-   beemapi.steemnoderpc
+   beemapi.noderpc
    beemapi.websocket
 
 beembase Modules