diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index 4889cb3..6c75aaf 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1,3 +1,4 @@
+# TODO: Rename workers with "slave" as a part of the name.
 from buildbot.process.properties import WithProperties
 
 from zorg.buildbot.builders import ClangBuilder
@@ -20,7 +21,7 @@
 from buildbot.plugins import util
 
 # For Libc++ builders
-docker_slaves = [
+docker_workers = [
     'libcxx-cloud1', 'libcxx-cloud2', 'libcxx-cloud3', 'libcxx-cloud4',
     'libcxx-cloud5'
 ]
@@ -1239,7 +1240,7 @@
     # EricWF's builders
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1250,7 +1251,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx11',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1261,7 +1262,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx14',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1272,7 +1273,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx17',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1285,7 +1286,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-cxx2a',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1298,7 +1299,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-32bit',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1309,7 +1310,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-asan',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1321,7 +1322,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-ubsan',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1333,7 +1334,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-msan',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1345,7 +1346,7 @@
 
     {'name' : 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-libunwind-x86_64-linux-ubuntu',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1355,7 +1356,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-tsan',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1365,7 +1366,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc5-cxx11',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc5-cxx11',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
@@ -1375,7 +1376,7 @@
 
     {'name' : 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
     'tags'  : ["libcxx"],
-    'workernames' : docker_slaves,
+    'workernames' : docker_workers,
     'builddir': 'libcxx-libcxxabi-x86_64-linux-ubuntu-gcc-tot-latest-std',
     'factory' : LibcxxAndAbiBuilder.getLibcxxAndAbiBuilder(
                     env={
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
index 2090e77..80ce377 100644
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -39,7 +39,7 @@
         create_worker("linaro-armv8-libcxx", properties={'jobs' : 1}, max_builds=1),
         create_worker("linaro-arm-lldb", properties={'jobs' : 16}, max_builds=1),
 
-        # AArch64 Linaro slaves
+        # AArch64 Linaro workers
         create_worker("linaro-aarch64-quick", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-aarch64-full", properties={'jobs' : 32}, max_builds=1),
         create_worker("linaro-aarch64-global-isel", properties={'jobs' : 32}, max_builds=1),
@@ -54,7 +54,7 @@
         create_worker("linaro-armv8-windows-msvc-01", properties={'jobs' : 8}, max_builds=1),
         create_worker("linaro-armv8-windows-msvc-02", properties={'jobs' : 8}, max_builds=1),
 
-        # ARMv7 build cache slave
+        # ARMv7 build cache workers
         create_worker("packet-linux-armv7-slave-1", properties={'jobs' : 64}, max_builds=1),
 
         # AArch64 build cache worker
diff --git a/zorg/buildbot/process/properties.py b/zorg/buildbot/process/properties.py
index 50899b8..098cd7e 100644
--- a/zorg/buildbot/process/properties.py
+++ b/zorg/buildbot/process/properties.py
@@ -40,7 +40,7 @@
         # Upcall the base class first.
         p = super().getRenderingFor(build)
 
-        # Then we need to figure out the buildslave OS:
+        # Then we need to figure out the worker OS:
         worker = build.getBuild().workerforbuilder.worker
         if worker.worker_system == 'posix':
             # Note: Do not call normpath here, as it could