diff --git a/docs/running-locust-docker.rst b/docs/running-locust-docker.rst
index cad8794c4e..095095219d 100644
--- a/docs/running-locust-docker.rst
+++ b/docs/running-locust-docker.rst
@@ -14,7 +14,7 @@ The docker image can be used like this (assuming that the ``locustifile.py`` exi
 Docker Compose
 ==============
 
-Here's an example Docker Compose file that could ber used to start both a master node, and slave nodes:
+Here's an example Docker Compose file that could ber used to start both a master node, and worker nodes:
 
 .. literalinclude:: ../examples/docker-compose/docker-compose.yml
     :language: yaml
diff --git a/locust/runners.py b/locust/runners.py
index 617bac43b4..c991c157e8 100644
--- a/locust/runners.py
+++ b/locust/runners.py
@@ -509,7 +509,7 @@ def heartbeat_worker(self):
                     client.heartbeat -= 1
 
     def reset_connection(self):
-        logger.info("Reset connection to slave")
+        logger.info("Reset connection to worker")
         try:
             self.server.close()
             self.server = rpc.Server(self.master_bind_host, self.master_bind_port)
diff --git a/locust/test/test_runners.py b/locust/test/test_runners.py
index 5b72425583..8502893b52 100644
--- a/locust/test/test_runners.py
+++ b/locust/test/test_runners.py
@@ -356,7 +356,7 @@ def incr_stats(l):
             # issue start command that should trigger TestUsers to be spawned in the Workers
             master.start(6, hatch_rate=1000)
             sleep(0.1)
-            # check that slave nodes have started locusts
+            # check that worker nodes have started locusts
             for worker in workers:
                 self.assertEqual(2, worker.user_count)
             # give time for users to generate stats, and stats to be sent to master