diff --git a/buildbot/master/master.cfg b/buildbot/master/master.cfg
index e7546e14..4b2d4b34 100644
--- a/buildbot/master/master.cfg
+++ b/buildbot/master/master.cfg
@@ -103,9 +103,9 @@ def cargo_android_filter(c):
 
 c['schedulers'] = []
 c['schedulers'].append(schedulers.AnyBranchScheduler(
-    name="servo_auto",
+    name="servo-auto",
     treeStableTimer=None,
-    builderNames=["linux1", "linux2", "mac1", "mac2", "mac3", "android", "gonk"],
+    builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-ref-unit", "mac-rel-css", "android", "gonk"],
     change_filter=util.ChangeFilter(filter_fn=servo_auto_try_filter),
 ))
 c['schedulers'].append(schedulers.SingleBranchScheduler(
@@ -116,7 +116,7 @@ c['schedulers'].append(schedulers.SingleBranchScheduler(
 ))
 c['schedulers'].append(schedulers.ForceScheduler(
     name="force",
-    builderNames=["linux1", "linux2", "mac1", "mac2", "mac3", "android", "gonk", "linux1-rel", "linux2-rel", "mac1-rel", "mac2-rel","android-nightly"]
+    builderNames=["linux-dev", "linux-rel", "mac-rel-wpt", "mac-dev-ref-unit", "mac-rel-css", "android", "gonk", "android-nightly"]
 ))
 c['schedulers'].append(schedulers.Nightly(
     name="Nightly",
@@ -126,13 +126,13 @@ c['schedulers'].append(schedulers.Nightly(
     minute=0
 ))
 c['schedulers'].append(schedulers.SingleBranchScheduler(
-    name="cargo_linux_auto",
+    name="cargo-linux-auto",
     treeStableTimer=None,
     builderNames=["cargo-linux"],
     change_filter=util.ChangeFilter(filter_fn=cargo_linux_filter)
 ))
 c['schedulers'].append(schedulers.SingleBranchScheduler(
-    name="cargo_mac_auto",
+    name="cargo-mac-auto",
     treeStableTimer=None,
     builderNames=["cargo-mac"],
     change_filter=util.ChangeFilter(filter_fn=cargo_mac_filter)
@@ -164,73 +164,73 @@ mac_test_env = dict({
     'SERVO_CACHE_DIR': '/Users/servo/.servo'
 }, **common_test_env)
 
-linux1_factory = util.BuildFactory()
-linux1_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-linux1_factory.addStep(steps.ShellCommand(command=["./mach", "test-tidy"], env=linux_headless_env))
-linux1_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=linux_headless_env))
-linux1_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=linux_headless_env))
-linux1_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
+linux_dev_factory = util.BuildFactory()
+linux_dev_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+linux_dev_factory.addStep(steps.ShellCommand(command=["./mach", "test-tidy"], env=linux_headless_env))
+linux_dev_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=linux_headless_env))
+linux_dev_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=linux_headless_env))
+linux_dev_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
                                           env=linux_headless_env))
-linux1_factory.addStep(steps.Compile(command=["./mach", "build-cef"], env=linux_headless_env))
-
-
-linux2_factory = util.BuildFactory()
-linux2_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-linux2_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=linux_headless_env))
-linux2_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
-                                          env=linux_headless_env))
-linux2_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "24",
-                                                   "--log-raw", "test-wpt.log"],
-                                          env=linux_headless_env,
-                                          logfiles={"test-wpt.log": "test-wpt.log"}))
-linux2_factory.addStep(steps.ShellCommand(command=["gzip", "test-wpt.log"], env=linux_headless_env))
-linux2_factory.addStep(steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "24",
-                                                   "--log-raw", "test-css.log"],
-                                          env=linux_headless_env,
-                                          logfiles={"test-css.log": "test-css.log"}))
-linux2_factory.addStep(steps.ShellCommand(command=["gzip", "test-css.log"], env=linux_headless_env))
-linux2_factory.addStep(steps.Compile(command=["./mach", "build-cef", "--release"], env=linux_headless_env))
-
-#linux3_factory = util.BuildFactory()
-#linux3_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-#linux3_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=linux_headless_env))
-#linux3_factory.addStep(steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "24",
-#                                                   "--log-raw", "test-css.log"],
-#                                          env=linux_headless_env,
-#                                          logfiles={"test-css.log": "test-css.log"}))
-#linux3_factory.addStep(steps.ShellCommand(command=["gzip", "test-css.log"], env=linux_headless_env))
-
+linux_dev_factory.addStep(steps.Compile(command=["./mach", "build-cef"], env=linux_headless_env))
+
+
+linux_rel_factory = util.BuildFactory()
+linux_rel_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+linux_rel_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=linux_headless_env))
+linux_rel_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
+                                             env=linux_headless_env))
+linux_rel_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "24",
+                                                      "--log-raw", "test-wpt.log"],
+                                             env=linux_headless_env,
+                                             logfiles={"test-wpt.log": "test-wpt.log"}))
+linux_rel_factory.addStep(steps.ShellCommand(command=["gzip", "test-wpt.log"], env=linux_headless_env))
+linux_rel_factory.addStep(steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "24",
+                                                      "--log-raw", "test-css.log"],
+                                             env=linux_headless_env,
+                                             logfiles={"test-css.log": "test-css.log"}))
+linux_rel_factory.addStep(steps.ShellCommand(command=["gzip", "test-css.log"], env=linux_headless_env))
+linux_rel_factory.addStep(steps.Compile(command=["./mach", "build-cef", "--release"], env=linux_headless_env))
 
 task_limited_test_env = dict({'RUST_TEST_TASKS': '1'}, **mac_test_env)
 
-mac1_factory = util.BuildFactory()
-mac1_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-mac1_factory.addStep(steps.ShellCommand(command=["./mach", "test-tidy"]))
-mac1_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env))
-mac1_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
-                                  env=mac_test_env))
-mac1_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4",
-                                           "--log-raw", "test-wpt.log"],
-                                  env=mac_test_env,
-                                  logfiles={"test-wpt.log": "test-wpt.log"}))
-mac1_factory.addStep(steps.ShellCommand(command=["gzip", "test-wpt.log"], env=mac_test_env))
-
-mac2_factory = util.BuildFactory()
-mac2_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-mac2_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=mac_test_env))
-mac2_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
+mac_rel_wpt_factory = util.BuildFactory()
+mac_rel_wpt_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+mac_rel_wpt_factory.addStep(steps.ShellCommand(command=["./mach", "test-tidy"]))
+mac_rel_wpt_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env))
+mac_rel_wpt_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
+                                               env=mac_test_env))
+mac_rel_wpt_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4",
+                                                        "--log-raw", "test-wpt.log"],
+                                               env=mac_test_env,
+                                               logfiles={"test-wpt.log": "test-wpt.log"}))
+mac_rel_wpt_factory.addStep(steps.ShellCommand(command=["gzip", "test-wpt.log"], env=mac_test_env))
+
+mac_dev_ref_unit_factory = util.BuildFactory()
+mac_dev_ref_unit_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+mac_dev_ref_unit_factory.addStep(steps.Compile(command=["./mach", "build", "--dev"], env=mac_test_env))
+mac_dev_ref_unit_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
                                  env=task_limited_test_env))
-mac2_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=mac_test_env))
-mac2_factory.addStep(steps.Compile(command=["./mach", "build-cef"], env=mac_test_env))
-
-mac3_factory = util.BuildFactory()
-mac3_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-mac3_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env))
-mac3_factory.addStep(steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "4",
-                                           "--log-raw", "test-css.log"],
-                                  env=mac_test_env,
-                                  logfiles={"test-css.log": "test-css.log"}))
-mac3_factory.addStep(steps.ShellCommand(command=["gzip", "test-css.log"], env=mac_test_env))
+mac_dev_ref_unit_factory.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=mac_test_env))
+mac_dev_ref_unit_factory.addStep(steps.Compile(command=["./mach", "build-cef"], env=mac_test_env))
+
+mac_rel_css_factory = util.BuildFactory()
+mac_rel_css_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+mac_rel_css_factory.addStep(steps.Compile(command=["./mach", "build", "--release"], env=mac_test_env))
+mac_rel_css_factory.addStep(steps.ShellCommand(command=["./mach", "test-css", "--release", "--processes", "4",
+                                                        "--log-raw", "test-css.log"],
+                                               env=mac_test_env,
+                                               logfiles={"test-css.log": "test-css.log"}))
+mac_rel_css_factory.addStep(steps.ShellCommand(command=["gzip", "test-css.log"], env=mac_test_env))
+
+mac_dev_ref_unit_factory = util.BuildFactory()
+mac_dev_ref_unit_factory.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
+mac_dev_ref_unit_factory.addStep(steps.Compile(command=["./mach", "build", "--release"]))
+mac_dev_ref_unit_factory.addStep(steps.ShellCommand(command=["./mach", "test-content"], env=common_test_env))
+mac_dev_ref_unit_factory.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
+                                                    env=task_limited_test_env))
+mac_dev_ref_unit_factory.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--processes", "4", "--total-chunks", "2", "--this-chunk", "2", "--log-raw", "test-wpt.log"],
+                                                    env=common_test_env,
+                                                    logfiles={"test-wpt.log": "test-wpt.log"}))
 
 android_compile_env = dict({'ANDROID_SDK': '/home/servo/android-sdk-linux/',
                             'ANDROID_NDK': '/home/servo/android-ndk-r10c/',
@@ -266,56 +266,6 @@ doc_factory.addStep(steps.ShellCommand(command=["etc/ci/upload_docs.sh"],
                                             'SHELL': '/bin/bash'},
                                        logEnviron=False)) # important not to leak token
 
-
-# Release builds
-
-
-linux1_factory_rel = util.BuildFactory()
-linux1_factory_rel.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-linux1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-tidy"], env=linux_headless_env))
-linux1_factory_rel.addStep(steps.Compile(command=["./mach", "build", "--release"], env=linux_headless_env))
-# https://github.com/rust-lang/cargo/issues/691
-# linux1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=linux_headless_env))
-linux1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-content"], env=linux_headless_env))
-linux1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
-                                    env=linux_headless_env))
-
-
-linux2_factory_rel = util.BuildFactory()
-linux2_factory_rel.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-linux2_factory_rel.addStep(steps.Compile(command=["./mach", "build", "--release"], env=linux_test_env))
-linux2_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
-                                    env=linux_test_env))
-linux2_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release",
-                                                 "--processes", "24",
-                                                 "--log-raw", "test-wpt.log"],
-                                        env=linux_test_env,
-                                        logfiles={"test-wpt.log": "test-wpt.log"}))
-linux2_factory_rel.addStep(steps.Compile(command=["./mach", "build-cef", "--release"]))
-
-mac1_factory_rel = util.BuildFactory()
-mac1_factory_rel.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-mac1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-tidy"]))
-mac1_factory_rel.addStep(steps.Compile(command=["./mach", "build", "--release"]))
-mac1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-wpt-failure"],
-                                  env=common_test_env))
-mac1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--release", "--processes", "4", "--total-chunks", "2", "--this-chunk", "1", "--log-raw", "test-wpt.log"],
-                                      env=common_test_env,
-                                      logfiles={"test-wpt.log": "test-wpt.log"}))
-# https://github.com/rust-lang/cargo/issues/691
-# mac1_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-unit"], env=common_test_env))
-mac1_factory_rel.addStep(steps.Compile(command=["./mach", "build-cef"]))
-
-mac2_factory_rel = util.BuildFactory()
-mac2_factory_rel.addStep(steps.Git(repourl=SERVO_REPO, mode="full", method="clobber"))
-mac2_factory_rel.addStep(steps.Compile(command=["./mach", "build", "--release"]))
-mac2_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-content"], env=common_test_env))
-mac2_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-ref", "--kind", "cpu"],
-                                 env=task_limited_test_env))
-mac2_factory_rel.addStep(steps.ShellCommand(command=["./mach", "test-wpt", "--processes", "4", "--total-chunks", "2", "--this-chunk", "2", "--log-raw", "test-wpt.log"],
-                                      env=common_test_env,
-                                      logfiles={"test-wpt.log": "test-wpt.log"}))
-
 # Cargo builds
 # NOTE: We use this instead of Travis CI for some projects, either for platform reasons or because
 # Travis CI can't handle them.
@@ -395,26 +345,19 @@ def branch_priority(builder, requests):
 
 c['builders'] = []
 c['builders'].append(util.BuilderConfig(
-    name="linux1",
+    name="linux-dev",
     slavenames=LINUX_SLAVES,
-    factory=linux1_factory,
+    factory=linux_dev_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
-    name="linux2",
+    name="linux-rel",
     slavenames=LINUX_SLAVES,
-    factory=linux2_factory,
+    factory=linux_rel_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
-#c['builders'].append(util.BuilderConfig(
-#    name="linux3",
-#    slavenames=LINUX_SLAVES,
-#    factory=linux3_factory,
-#    nextBuild=branch_priority,
-#    category="auto",
-#))
 c['builders'].append(util.BuilderConfig(
     name="android",
     slavenames=ANDROID_SLAVES,
@@ -431,23 +374,23 @@ c['builders'].append(util.BuilderConfig(
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
-    name="mac1",
+    name="mac-rel-wpt",
     slavenames=MAC_SLAVES,
-    factory=mac1_factory,
+    factory=mac_rel_wpt_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
-    name="mac2",
+    name="mac-dev-ref-unit",
     slavenames=MAC_SLAVES,
-    factory=mac2_factory,
+    factory=mac_dev_ref_unit_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
 c['builders'].append(util.BuilderConfig(
-    name="mac3",
+    name="mac-rel-css",
     slavenames=MAC_SLAVES,
-    factory=mac3_factory,
+    factory=mac_rel_css_factory,
     nextBuild=branch_priority,
     category="auto",
 ))
@@ -457,34 +400,6 @@ c['builders'].append(util.BuilderConfig(
     factory=doc_factory,
     category="auto",
 ))
-c['builders'].append(util.BuilderConfig(
-    name="linux1-rel",
-    slavenames=LINUX_SLAVES,
-    factory=linux1_factory_rel,
-    nextBuild=branch_priority,
-    category="release",
-))
-c['builders'].append(util.BuilderConfig(
-    name="linux2-rel",
-    slavenames=LINUX_SLAVES,
-    factory=linux2_factory_rel,
-    nextBuild=branch_priority,
-    category="release",
-))
-c['builders'].append(util.BuilderConfig(
-    name="mac1-rel",
-    slavenames=MAC_SLAVES,
-    factory=mac1_factory_rel,
-    nextBuild=branch_priority,
-    category="release",
-))
-c['builders'].append(util.BuilderConfig(
-    name="mac2-rel",
-    slavenames=MAC_SLAVES,
-    factory=mac2_factory_rel,
-    nextBuild=branch_priority,
-    category="release",
-))
 c['builders'].append(util.BuilderConfig(
     name="android-nightly",
     slavenames=HEAD_SLAVES,
diff --git a/homu/cfg.toml b/homu/cfg.toml
index d568cb49..225604b6 100644
--- a/homu/cfg.toml
+++ b/homu/cfg.toml
@@ -37,8 +37,8 @@ secret = "{{ pillar["homu"]["gh-webhook-secret"] }}"
 [repo.servo.buildbot]
 url = "http://build.servo.org"
 secret = "{{ pillar["homu"]["buildbot-secret"] }}"
-builders = ["linux1", "linux2", "android", "mac1", "mac2", "mac3", "gonk"]
-try_builders = ["linux1", "linux2", "android", "mac1", "mac2", "mac3", "gonk"]
+builders = ["linux-dev", "linux-rel", "android", "mac-dev-ref-unit", "mac-rel-wpt", "mac-rel-css", "gonk"]
+try_builders = ["linux-dev", "linux-rel", "android", "mac-dev-ref-unit", "mac-rel-wpt", "mac-rel-css", "gonk"]
 username = "{{ pillar["homu"]["buildbot-http-user"] }}"
 password = "{{ pillar["homu"]["buildbot-http-pass"] }}"