diff --git a/docs/source/appendices/local-rethinkdb-cluster.md b/docs/source/appendices/local-rethinkdb-cluster.md
index e13b935e..518fd261 100644
--- a/docs/source/appendices/local-rethinkdb-cluster.md
+++ b/docs/source/appendices/local-rethinkdb-cluster.md
@@ -4,7 +4,7 @@ This section explains one way to deploy a multi-node RethinkDB cluster on one ma
 
 ## Launching More RethinkDB Nodes
 
-Assuming you've already [installed RethinkDB](../servers/installing-server.html#install-and-run-rethinkdb-server) and have one RethinkDB node running, here's how you can launch two more nodes on the same machine. First, prepare two additional nodes. Note that the user who starts RethinkDB must have write access to the created directories:
+Assuming you've already [installed RethinkDB](../nodes/installing-server.html#install-and-run-rethinkdb-server) and have one RethinkDB node running, here's how you can launch two more nodes on the same machine. First, prepare two additional nodes. Note that the user who starts RethinkDB must have write access to the created directories:
 
     mkdir -p /path/to/node2
     mkdir -p /path/to/node3
diff --git a/docs/source/index.rst b/docs/source/index.rst
index cadc9b12..2ef1a8fc 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -12,7 +12,7 @@ Table of Contents
 
    introduction
    topic-guides/index
-   servers/index
+   nodes/index
    drivers-clients/index
    release-notes
    appendices/index
diff --git a/docs/source/servers/bigchaindb-cli.md b/docs/source/nodes/bigchaindb-cli.md
similarity index 100%
rename from docs/source/servers/bigchaindb-cli.md
rename to docs/source/nodes/bigchaindb-cli.md
diff --git a/docs/source/servers/configuration.md b/docs/source/nodes/configuration.md
similarity index 100%
rename from docs/source/servers/configuration.md
rename to docs/source/nodes/configuration.md
diff --git a/docs/source/servers/deploy-on-aws.md b/docs/source/nodes/deploy-on-aws.md
similarity index 100%
rename from docs/source/servers/deploy-on-aws.md
rename to docs/source/nodes/deploy-on-aws.md
diff --git a/docs/source/servers/federation-set-up.md b/docs/source/nodes/federation-set-up.md
similarity index 100%
rename from docs/source/servers/federation-set-up.md
rename to docs/source/nodes/federation-set-up.md
diff --git a/docs/source/servers/index.rst b/docs/source/nodes/index.rst
similarity index 100%
rename from docs/source/servers/index.rst
rename to docs/source/nodes/index.rst
diff --git a/docs/source/servers/installing-server.md b/docs/source/nodes/installing-server.md
similarity index 100%
rename from docs/source/servers/installing-server.md
rename to docs/source/nodes/installing-server.md
diff --git a/docs/source/servers/monitoring.md b/docs/source/nodes/monitoring.md
similarity index 100%
rename from docs/source/servers/monitoring.md
rename to docs/source/nodes/monitoring.md
diff --git a/docs/source/servers/node-cluster-federation.md b/docs/source/nodes/node-cluster-federation.md
similarity index 100%
rename from docs/source/servers/node-cluster-federation.md
rename to docs/source/nodes/node-cluster-federation.md
diff --git a/docs/source/servers/python-server-api-examples.md b/docs/source/nodes/python-server-api-examples.md
similarity index 100%
rename from docs/source/servers/python-server-api-examples.md
rename to docs/source/nodes/python-server-api-examples.md
diff --git a/docs/source/servers/running-unit-tests.md b/docs/source/nodes/running-unit-tests.md
similarity index 100%
rename from docs/source/servers/running-unit-tests.md
rename to docs/source/nodes/running-unit-tests.md