Index: buildbot/osuosl/master/config/workers.py
===================================================================
--- buildbot/osuosl/master/config/workers.py
+++ buildbot/osuosl/master/config/workers.py
@@ -1,4 +1,4 @@
-# TODO: Rename workers with "slave" as a part of the name.
+# TODO: Rename workers with "worker" as a part of the name.
 # TODO: Refactor to define a list of tuples, each of which describes a worker, then enumerate and create as data driven.
 
 from buildbot.plugins import worker
Index: buildbot/osuosl/master/public_html/index.html
===================================================================
--- buildbot/osuosl/master/public_html/index.html
+++ buildbot/osuosl/master/public_html/index.html
@@ -25,7 +25,7 @@
 
 <b>Buildbot Information:</b>
 <ul>
-  <li><a href="buildslaves">Buildslave</a> information</li>
+  <li><a href="buildslaves">Buildworker</a> information</li>
   <li><a href="changes">ChangeSource</a> information.</li>
   <br/>
   <li><a href="about">About this Buildbot</a></li>
Index: buildbot/osuosl/master/templates/root.html
===================================================================
--- buildbot/osuosl/master/templates/root.html
+++ buildbot/osuosl/master/templates/root.html
@@ -19,10 +19,10 @@
 <p>Our goal is to provide extensive build and test coverage for all supported platforms.</p>
 <p>
   If you are willing to donate some CPU cycles and some room on a hard drive, you are welcome.
-  The instructions of how to add a build slave to the LLVM Buildbot infrastructure can be found
+  The instructions of how to add a build worker to the LLVM Buildbot infrastructure can be found
   in the
-  <a href="http://llvm.org/docs/HowToAddABuilder.html">
-    How to Add Your Build Configuration to the LLVM Buildbot Infrastructure</a>
+  <a href="https://llvm.org/docs/HowToAddABuilder.html">
+    How To Add Your Build Configuration To LLVM Buildbot Infrastructure</a>
   document.
 </p>
 
@@ -49,7 +49,7 @@
   <li class="{{ item_class.next() }}"><a href="one_line_per_build">Recent Builds</a> are summarized here, one
   per line.</li>
 
-  <li class="{{ item_class.next() }}"><a href="buildslaves">Buildslave</a> information</li>
+  <li class="{{ item_class.next() }}"><a href="buildslaves">Buildworker</a> information</li>
   <li class="{{ item_class.next() }}"><a href="changes">Changesource</a> information.</li>
 
   <li class="{{ item_class.next() }}"><a href="about">About</a> this Buildbot</li>
Index: llvmlab/llvmlab/ui/ci/views.py
===================================================================
--- llvmlab/llvmlab/ui/ci/views.py
+++ llvmlab/llvmlab/ui/ci/views.py
@@ -55,11 +55,11 @@
     k_days_data = int(request.args.get('days', 1))
     k_pixels_per_minute = float(request.args.get('pixels_per_minute', .5))
 
-    # Aggregate builds by slave, for completed builds within the desired time
+    # Aggregate builds by worker, for completed builds within the desired time
     # frame.
     current_time = time.time()
     builders = current_app.config.status.builders
-    slave_builders = util.multidict(
+    worker_builders = util.multidict(
         (build.slave, build)
         for builds in builders.values()
         for build in builds
@@ -78,9 +78,9 @@
     build_chart_data = {}
     max_x = 0
     min_time = min(build.start_time
-                   for builds in slave_builders.values()
+                   for builds in worker_builders.values()
                    for build in builds)
-    for slave, builders in slave_builders.items():
+    for worker, builders in worker_builders.items():
         # Order the builders by time.
         builders.sort(key = lambda b: b.start_time)
         
@@ -103,7 +103,7 @@
                            (build.start_time - min_time) / 60)
                 max_x = max(max_x, left + width)
                 rows[-1].append(ChartItem(build, hex_color, left, width))
-        build_chart_data[slave] = rows
+        build_chart_data[worker] = rows
 
     build_chart = { 'data' : build_chart_data,
                     'max_x' : max_x }
Index: llvmlab/llvmlab/ui/templates/build_chart.html
===================================================================
--- llvmlab/llvmlab/ui/templates/build_chart.html
+++ llvmlab/llvmlab/ui/templates/build_chart.html
@@ -30,9 +30,9 @@
 <h1>Build Chart</h1>
 
 <table border=1>
-{% for slave,builds in build_chart.data|dictsort %}
+{% for worker,builds in build_chart.data|dictsort %}
 <tr class="{{loop.cycle('even', 'odd')}}">
-  <td>{{ slave }}</td>
+  <td>{{ worker }}</td>
   <td>
     <table>
       {% for row in builds %}
Index: llvmlab/llvmlab/ui/templates/buildbot_monitor.html
===================================================================
--- llvmlab/llvmlab/ui/templates/buildbot_monitor.html
+++ llvmlab/llvmlab/ui/templates/buildbot_monitor.html
@@ -18,7 +18,7 @@
     <th>Result</th>
     <th>Start Time</th>
     <th>End Time</th>
-    <th>Slave</th>
+    <th>Worker</th>
   </tr>
 </thead>
 {% for build in builds %}
Index: zorg/buildbot/builders/LLDBBuilder.py
===================================================================
--- zorg/buildbot/builders/LLDBBuilder.py
+++ zorg/buildbot/builders/LLDBBuilder.py
@@ -36,7 +36,7 @@
             obj_dir=build_dir)
 
     env = {}
-    # Determine Slave Environment and Set MSVC environment.
+    # Determine Worker Environment and Set MSVC environment.
     if vs and vs != 'manual':
         f.addStep(SetProperty(
             command=getVisualStudioEnvironment(vs, target_arch),
Index: zorg/buildbot/builders/annotated/hip-build.sh
===================================================================
--- zorg/buildbot/builders/annotated/hip-build.sh
+++ zorg/buildbot/builders/annotated/hip-build.sh
@@ -41,8 +41,8 @@
 git -C "${TESTSUITE_ROOT}" reset --hard origin/main
 
 # Set-up variables
-BUILDBOT_SLAVENAME=$(whoami)
-BUILD_DIR="${BUILDBOT_ROOT}/${BUILDBOT_SLAVENAME}/${BUILDBOT_BUILDERNAME}"
+BUILDBOT_WORKERNAME=$(whoami)
+BUILD_DIR="${BUILDBOT_ROOT}/${BUILDBOT_WORKERNAME}/${BUILDBOT_BUILDERNAME}"
 DESTDIR=${BUILD_DIR}/install
 EXTERNAL_DIR=/buildbot/Externals