--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -38,17 +38,17 @@ jobs:
                 && ./build-haz-linux.sh --project shell $HOME/workspace
         when:
             files-changed:
                 - js/public/**
                 - js/src/**
         toolchains:
             - linux64-clang
             - linux64-gcc-6
-            - linux64-sixgill
+            - linux64-gcc-sixgill
             - linux64-rust
 
     linux64-haz/debug:
         description: "Browser Hazard Analysis Linux"
         index:
             product: firefox
             job-name: browser-haz-debug
         treeherder:
@@ -58,10 +58,10 @@ jobs:
             using: hazard
             mozconfig: "browser/config/mozconfigs/linux64/hazards"
             command: >
                 cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project browser $HOME/workspace
         toolchains:
             - linux64-clang
             - linux64-gcc-6
-            - linux64-sixgill
+            - linux64-gcc-sixgill
             - linux64-rust

--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -192,17 +192,17 @@ linux64-gcc-7:
         max-run-time: 36000
     run:
         using: toolchain-script
         script: build-gcc-7-linux.sh
         resources:
             - 'build/unix/build-gcc/build-gcc.sh'
         toolchain-artifact: public/build/gcc.tar.xz
 
-linux64-sixgill:
+linux64-gcc-sixgill:
     description: "sixgill GCC plugin build"
     treeherder:
         kind: build
         platform: toolchains/opt
         symbol: TL(sixgill)
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker: