Bug 1386857 - [ci] Remove the 'tc' treeherder group prefix from all tasks, r=dustin
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Fri, 12 Jan 2018 15:49:58 -0500
changeset 454043 47cfae837c499c0dcf95c646114f1b4ee129d7ad
parent 454042 f924db10f84f5b10536651002965ebcefb3b8a72
child 454044 cccd776a80d97621554ed046072bc7ea3dc0bdad
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1386857
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1386857 - [ci] Remove the 'tc' treeherder group prefix from all tasks, r=dustin There are now only a handful of buildbot jobs remaining and the concern over outdated treeherder exclusion profiles has largely been resolved. This does remove the tc() group from a substantial number of tasks which will now show up as top level tasks, potentially adding clutter. In some cases, we might want to re-add a new group (e.g group builds or compiled tests together). However rather than try to predict the best group names for tasks I'm unfamiliar with, I think it's best to land this as is. Then if things are looking too cluttered at the root namespace, file follow-up bugs as needed. MozReview-Commit-ID: 8SMwjDwAOzV
taskcluster/ci/build/android-stuff.yml
taskcluster/ci/build/android.yml
taskcluster/ci/build/linux.yml
taskcluster/ci/build/macosx.yml
taskcluster/ci/build/windows.yml
taskcluster/ci/config.yml
taskcluster/ci/hazard/kind.yml
taskcluster/ci/l10n/kind.yml
taskcluster/ci/nightly-l10n/kind.yml
taskcluster/ci/release-source/source.yml
taskcluster/ci/source-test/doc.yml
taskcluster/ci/spidermonkey/linux.yml
taskcluster/ci/spidermonkey/windows.yml
taskcluster/ci/static-analysis/kind.yml
taskcluster/ci/test/awsy.yml
taskcluster/ci/test/compiled.yml
taskcluster/ci/test/firefox-ui.yml
taskcluster/ci/test/marionette.yml
taskcluster/ci/test/misc.yml
taskcluster/ci/test/mochitest.yml
taskcluster/ci/test/reftest.yml
taskcluster/ci/test/talos.yml
taskcluster/ci/test/web-platform.yml
taskcluster/ci/test/xpcshell.yml
taskcluster/ci/valgrind/kind.yml
taskcluster/taskgraph/transforms/beetmover.py
taskcluster/taskgraph/transforms/beetmover_checksums.py
taskcluster/taskgraph/transforms/beetmover_l10n.py
taskcluster/taskgraph/transforms/beetmover_repackage.py
taskcluster/taskgraph/transforms/beetmover_repackage_l10n.py
taskcluster/taskgraph/transforms/checksums_signing.py
taskcluster/taskgraph/transforms/nightly_l10n_signing.py
taskcluster/taskgraph/transforms/repackage.py
taskcluster/taskgraph/transforms/repackage_l10n.py
taskcluster/taskgraph/transforms/repackage_signing.py
taskcluster/taskgraph/transforms/signing.py
taskcluster/taskgraph/transforms/upload_symbols.py
--- a/taskcluster/ci/build/android-stuff.yml
+++ b/taskcluster/ci/build/android-stuff.yml
@@ -2,17 +2,17 @@ android-test/opt:
     description: "Android armv7 unit tests"
     index:
         product: mobile
         job-name: android-test
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
         tier: 1
-        symbol: tc-A(test)
+        symbol: A(test)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-test
         artifacts:
             - name: public/android/unittest
@@ -49,17 +49,17 @@ android-lint/opt:
     description: "Android lint"
     index:
         product: mobile
         job-name: android-lint
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
         tier: 1
-        symbol: tc-A(lint)
+        symbol: A(lint)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-lint
         artifacts:
             - name: public/android/lint/lint-results-officialPhotonDebug.html
@@ -108,17 +108,17 @@ android-checkstyle/opt:
     description: "Android checkstyle"
     index:
         product: mobile
         job-name: android-checkstyle
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
         tier: 1
-        symbol: tc-A(checkstyle)
+        symbol: A(checkstyle)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-checkstyle
         artifacts:
             - name: public/android/checkstyle/checkstyle.html
@@ -160,17 +160,17 @@ android-findbugs/opt:
     description: "Android findbugs"
     index:
         product: mobile
         job-name: android-findbugs
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
         tier: 1
-        symbol: tc-A(findbugs)
+        symbol: A(findbugs)
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-findbugs
         artifacts:
             - name: public/android/findbugs/findbugs-officialPhotonDebug-output.html
@@ -211,17 +211,17 @@ android-geckoview-docs/opt:
     description: "Android GeckoView docs"
     index:
         product: mobile
         job-name: android-geckoview-docs
     treeherder:
         platform: android-4-0-armv7-api16/opt
         kind: build
         tier: 3
-        symbol: tc-A(gv-docs)
+        symbol: A(gv-docs)
     run-on-projects: [mozilla-central]
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             PERFHERDER_EXTRA_OPTIONS: android-geckoview-docs
             GECKOVIEW_DOCS_UPLOAD_SECRET: "project/releng/gecko/build/level-{level}/geckoview-docs-upload"
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -1,16 +1,16 @@
 android-api-16/debug:
     description: "Android 4.0 api-16+ Debug"
     index:
         product: mobile
         job-name: android-api-16-debug
     treeherder:
         platform: android-4-0-armv7-api16/debug
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -47,17 +47,17 @@ android-api-16/debug:
 
 android-x86/opt:
     description: "Android 4.2 x86 Opt"
     index:
         product: mobile
         job-name: android-x86-opt
     treeherder:
         platform: android-4-2-x86/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             # Increase the timeout because nsContentUtils.o takes a ridiculously
@@ -104,17 +104,17 @@ android-x86-nightly/opt:
     shipping-phase: promote
     shipping-product: fennec
     index:
         product: mobile
         job-name: android-x86-opt
         type: nightly
     treeherder:
         platform: android-4-2-x86/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             # Increase the timeout because nsContentUtils.o takes a ridiculously
@@ -157,17 +157,17 @@ android-x86-nightly/opt:
 
 android-api-16/opt:
     description: "Android 4.0 api-16+ Opt"
     index:
         product: mobile
         job-name: android-api-16-opt
     treeherder:
         platform: android-4-0-armv7-api16/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -209,17 +209,17 @@ android-api-16-nightly/opt:
     shipping-phase: promote
     shipping-product: fennec
     index:
         product: mobile
         job-name: android-api-16-opt
         type: nightly-with-multi-l10n
     treeherder:
         platform: android-4-0-armv7-api16/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -257,17 +257,17 @@ android-api-16-nightly/opt:
 
 android-x86-old-id/opt:
     description: "Android 4.2 x86 Opt OldId"
     index:
         product: mobile
         job-name: android-x86-old-id-opt
     treeherder:
         platform: android-4-2-x86-old-id/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             # Increase the timeout because nsContentUtils.o takes a ridiculously
@@ -313,17 +313,17 @@ android-x86-old-id-nightly/opt:
     attributes:
         nightly: true
     index:
         product: mobile
         job-name: android-x86-old-id-opt
         type: nightly
     treeherder:
         platform: android-4-2-x86-old-id/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
             # Increase the timeout because nsContentUtils.o takes a ridiculously
@@ -367,17 +367,17 @@ android-x86-old-id-nightly/opt:
 
 android-api-16-old-id/opt:
     description: "Android 4.0 api-16+ Opt OldId"
     index:
         product: mobile
         job-name: android-api-16-old-id-opt
     treeherder:
         platform: android-4-0-armv7-api16-old-id/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -418,17 +418,17 @@ android-api-16-old-id-nightly/opt:
     attributes:
         nightly: true
     index:
         product: mobile
         job-name: android-api-16-old-id-opt
         type: nightly-with-multi-l10n
     treeherder:
         platform: android-4-0-armv7-api16-old-id/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -467,17 +467,17 @@ android-api-16-old-id-nightly/opt:
 
 android-api-16-gradle/opt:
     description: "Android 4.0 api-16+ (non-Gradle) Opt"
     index:
         product: mobile
         job-name: android-api-16-gradle-opt
     treeherder:
         platform: android-api-16-gradle/opt
-        symbol: tc(Bng)
+        symbol: Bng
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -513,17 +513,17 @@ android-api-16-gradle/opt:
 
 android-aarch64/opt:
     description: "Android 5.0 AArch64 Opt"
     index:
         product: mobile
         job-name: android-aarch64-opt
     treeherder:
         platform: android-5-0-aarch64/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
@@ -565,17 +565,17 @@ android-aarch64-nightly/opt:
     shipping-phase: promote
     shipping-product: fennec
     index:
         product: mobile
         job-name: android-aarch64-opt
         type: nightly
     treeherder:
         platform: android-5-0-aarch64/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         docker-image: {in-tree: android-build}
         max-run-time: 7200
         env:
             GRADLE_USER_HOME: "/builds/worker/workspace/build/src/mobile/android/gradle/dotgradle-offline"
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android/releng.manifest"
         artifacts:
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1,16 +1,16 @@
 linux64/opt:
     description: "Linux64 Opt"
     index:
         product: firefox
         job-name: linux64-opt
     treeherder:
         platform: linux64/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -28,17 +28,17 @@ linux64/opt:
 
 linux64-dmd/opt:
     description: "Linux64 DMD Opt"
     index:
         product: firefox
         job-name: linux64-dmd-opt
     treeherder:
         platform: linux64-dmd/opt
-        symbol: tc(Bdmd)
+        symbol: Bdmd
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
@@ -59,17 +59,17 @@ linux64-dmd/opt:
 
 linux64/pgo:
     description: "Linux64 PGO"
     index:
         product: firefox
         job-name: linux64-pgo
     treeherder:
         platform: linux64/pgo
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         options: [enable-pgo]
         config:
@@ -88,17 +88,17 @@ linux64/pgo:
 
 linux64-fuzzing/debug:
     description: "Linux64 Fuzzing Debug"
     index:
         product: firefox
         job-name: linux64-fuzzing-debug
     treeherder:
         platform: linux64/debug
-        symbol: tc(Bf)
+        symbol: Bf
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
         env:
             PERFHERDER_EXTRA_OPTIONS: fuzzing
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -119,17 +119,17 @@ linux64-fuzzing/debug:
 
 linux64/debug:
     description: "Linux64 Debug"
     index:
         product: firefox
         job-name: linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -153,17 +153,17 @@ linux64-devedition-nightly/opt:
     shipping-phase: build
     shipping-product: devedition
     index:
         product: devedition
         job-name: linux64-opt
         type: nightly
     treeherder:
         platform: linux64-devedition/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -185,17 +185,17 @@ linux64-devedition-nightly/opt:
 
 linux64-base-toolchains/opt:
     description: "Linux64 base toolchains Opt"
     index:
         product: firefox
         job-name: linux64-base-toolchains-opt
     treeherder:
         platform: linux64/opt
-        symbol: tc(Bb)
+        symbol: Bb
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -215,17 +215,17 @@ linux64-base-toolchains/opt:
 
 linux64-base-toolchains/debug:
     description: "Linux64 base toolchains Debug"
     index:
         product: firefox
         job-name: linux64-base-toolchains-debug
     treeherder:
         platform: linux64/debug
-        symbol: tc(Bb)
+        symbol: Bb
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -246,17 +246,17 @@ linux64-base-toolchains/debug:
 
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: firefox
         job-name: linux-opt
     treeherder:
         platform: linux32/opt
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -274,17 +274,17 @@ linux/opt:
 
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: firefox
         job-name: linux-debug
     treeherder:
         platform: linux32/debug
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -303,17 +303,17 @@ linux/debug:
 
 linux/pgo:
     description: "Linux32 PGO"
     index:
         product: firefox
         job-name: linux-pgo
     treeherder:
         platform: linux32/pgo
-        symbol: tc(B)
+        symbol: B
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         options: [enable-pgo]
         config:
@@ -332,17 +332,17 @@ linux/pgo:
 
 linux-rusttests/opt:
     description: "Linux32 Rust tests Opt"
     index:
         product: firefox
         job-name: linux-rusttests-opt
     treeherder:
         platform: linux32/opt
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
@@ -366,17 +366,17 @@ linux-rusttests/opt:
 
 linux-rusttests/debug:
     description: "Linux32 Rust tests Debug"
     index:
         product: firefox
         job-name: linux-rusttests-debug
     treeherder:
         platform: linux32/debug
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
@@ -405,17 +405,17 @@ linux-devedition-nightly/opt:
     shipping-phase: build
     shipping-product: devedition
     index:
         product: devedition
         job-name: linux-opt
         type: nightly
     treeherder:
         platform: linux32-devedition/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -442,17 +442,17 @@ linux-nightly/opt:
     shipping-phase: build
     shipping-product: firefox
     index:
         product: firefox
         job-name: linux-opt
         type: nightly
     treeherder:
         platform: linux32/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -472,17 +472,17 @@ linux-nightly/opt:
 
 linux64-asan/opt:
     description: "Linux64 Opt ASAN"
     index:
         product: firefox
         job-name: linux64-asan-opt
     treeherder:
         platform: linux64/asan
-        symbol: tc(Bo)
+        symbol: Bo
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: "opt asan"
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -504,17 +504,17 @@ linux64-asan/opt:
 
 linux64-asan-fuzzing/opt:
     description: "Linux64 Fuzzing Opt ASAN"
     index:
         product: firefox
         job-name: linux64-fuzzing-asan-opt
     treeherder:
         platform: linux64/asan
-        symbol: tc(Bof)
+        symbol: Bof
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-fuzzing
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -535,17 +535,17 @@ linux64-asan-fuzzing/opt:
 
 linux64-asan-reporter/opt:
     description: "Linux64 Opt ASAN Reporter Nightly"
     index:
         product: firefox
         job-name: linux64-asan-reporter-opt
     treeherder:
         platform: linux64/asan
-        symbol: tc(BoR)
+        symbol: BoR
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: asan-reporter
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -566,17 +566,17 @@ linux64-asan-reporter/opt:
 
 linux64-asan/debug:
     description: "Linux64 Debug ASAN"
     index:
         product: firefox
         job-name: linux64-asan-debug
     treeherder:
         platform: linux64/asan
-        symbol: tc(Bd)
+        symbol: Bd
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         env:
             PERFHERDER_EXTRA_OPTIONS: "debug asan"
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -602,17 +602,17 @@ linux64-nightly/opt:
     shipping-phase: build
     shipping-product: firefox
     index:
         product: firefox
         job-name: linux64-opt
         type: nightly
     treeherder:
         platform: linux64/opt
-        symbol: tc(N)
+        symbol: N
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
             - builds/releng_base_firefox.py
@@ -631,17 +631,17 @@ linux64-nightly/opt:
 
 linux64-noopt/debug:
     description: "Linux64 No-optimize Debug"
     index:
         product: firefox
         job-name: linux64-noopt-debug
     treeherder:
         platform: linux64-noopt/debug
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 3600
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
@@ -663,17 +663,17 @@ linux64-noopt/debug:
 
 linux64-rusttests/opt:
     description: "Linux64 Rust tests Opt"
     index:
         product: firefox
         job-name: linux64-rusttests-opt
     treeherder:
         platform: linux64/opt
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
@@ -697,17 +697,17 @@ linux64-rusttests/opt:
 
 linux64-rusttests/debug:
     description: "Linux64 Rust tests Debug"
     index:
         product: firefox
         job-name: linux64-rusttests-debug
     treeherder:
         platform: linux64/debug
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 5400
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
@@ -731,17 +731,17 @@ linux64-rusttests/debug:
 
 linux64-jsdcov/opt:
     description: "Linux64-JSDCov Opt"
     index:
         product: firefox
         job-name: linux64-jsdcov-opt
     treeherder:
         platform: linux64-jsdcov/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     run-on-projects: []
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -761,17 +761,17 @@ linux64-jsdcov/opt:
 
 linux64-ccov/opt:
     description: "Linux64-CCov Opt"
     index:
         product: firefox
         job-name: linux64-ccov-opt
     treeherder:
         platform: linux64-ccov/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     run-on-projects: []
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
@@ -791,17 +791,17 @@ linux64-ccov/opt:
 
 linux64-add-on-devel/opt:
     description: "Linux64 add-on-devel"
     index:
         product: firefox
         job-name: linux64-add-on-devel
     treeherder:
         platform: linux64-add-on-devel/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test update]
         config:
--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -1,16 +1,16 @@
 macosx64/debug:
     description: "MacOS X x64 Cross-compile"
     index:
         product: firefox
         job-name: macosx64-debug
     treeherder:
         platform: osx-cross/debug
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -33,17 +33,17 @@ macosx64/debug:
 
 macosx64/opt:
     description: "MacOS X x64 Cross-compile"
     index:
         product: firefox
         job-name: macosx64-opt
     treeherder:
         platform: osx-cross/opt
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -65,17 +65,17 @@ macosx64/opt:
 
 macosx64-dmd/opt:
     description: "MacOS X x64 DMD Cross-compile"
     index:
         product: firefox
         job-name: macosx64-dmd-opt
     treeherder:
         platform: osx-10-10-dmd/opt
-        symbol: tc(Bdmd)
+        symbol: Bdmd
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -105,17 +105,17 @@ macosx64-devedition-nightly/opt:
     shipping-phase: build
     shipping-product: devedition
     index:
         product: devedition
         job-name: macosx64-opt
         type: nightly
     treeherder:
         platform: osx-cross-devedition/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -141,17 +141,17 @@ macosx64-devedition-nightly/opt:
 
 macosx64-noopt/debug:
     description: "MacOS X x64 No-optimize Debug"
     index:
         product: firefox
         job-name: macosx64-noopt-debug
     treeherder:
         platform: osx-cross-noopt/debug
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -177,17 +177,17 @@ macosx64-noopt/debug:
 
 macosx64-add-on-devel/opt:
     description: "MacOS X x64 add-on-devel"
     index:
         product: firefox
         job-name: macosx64-add-on-devel
     treeherder:
         platform: osx-cross-add-on-devel/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
@@ -217,17 +217,17 @@ macosx64-nightly/opt:
     shipping-phase: build
     shipping-product: firefox
     index:
         product: firefox
         job-name: macosx64-opt
         type: nightly
     treeherder:
         platform: osx-cross/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
     worker:
         max-run-time: 36000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
     run:
         using: mozharness
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1,16 +1,16 @@
 win32/debug:
     description: "Win32 Debug"
     index:
         product: firefox
         job-name: win32-debug
     treeherder:
         platform: windows2012-32/debug
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -28,17 +28,17 @@ win32/debug:
 
 win32/opt:
     description: "Win32 Opt"
     index:
         product: firefox
         job-name: win32-opt
     treeherder:
         platform: windows2012-32/opt
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -56,17 +56,17 @@ win32/opt:
 
 win32-dmd/opt:
     description: "Win32 DMD Opt"
     index:
         product: firefox
         job-name: win32-dmd-opt
     treeherder:
         platform: windows2012-32-dmd/opt
-        symbol: tc(Bdmd)
+        symbol: Bdmd
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -87,17 +87,17 @@ win32-dmd/opt:
 
 win32/pgo:
     description: "Win32 Opt PGO"
     index:
         product: firefox
         job-name: win32-pgo
     treeherder:
         platform: windows2012-32/pgo
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 9000
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -115,17 +115,17 @@ win32/pgo:
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: firefox
         job-name: win64-debug
     treeherder:
         platform: windows2012-64/debug
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -143,17 +143,17 @@ win64/debug:
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: firefox
         job-name: win64-opt
     treeherder:
         platform: windows2012-64/opt
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -171,17 +171,17 @@ win64/opt:
 
 win64-dmd/opt:
     description: "Win64 DMD Opt"
     index:
         product: firefox
         job-name: win64-dmd-opt
     treeherder:
         platform: windows2012-64-dmd/opt
-        symbol: tc(Bdmd)
+        symbol: Bdmd
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -207,17 +207,17 @@ win32-nightly/opt:
         job-name: win32-opt
         type: nightly
     attributes:
         nightly: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-32/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -243,17 +243,17 @@ win64-nightly/opt:
         job-name: win64-opt
         type: nightly
     attributes:
         nightly: true
     shipping-phase: build
     shipping-product: firefox
     treeherder:
         platform: windows2012-64/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -274,17 +274,17 @@ win64-nightly/opt:
 
 win64/pgo:
     description: "Win64 Opt PGO"
     index:
         product: firefox
         job-name: win64-pgo
     treeherder:
         platform: windows2012-64/pgo
-        symbol: tc(B)
+        symbol: B
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -302,17 +302,17 @@ win64/pgo:
 
 win32-add-on-devel/opt:
     description: "Windows32 add-on-devel"
     index:
         product: firefox
         job-name: win32-add-on-devel
     treeherder:
         platform: windows2012-32-add-on-devel/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -332,17 +332,17 @@ win32-add-on-devel/opt:
 
 win64-add-on-devel/opt:
     description: "Windows64 add-on-devel"
     index:
         product: firefox
         job-name: win64-add-on-devel
     treeherder:
         platform: windows2012-64-add-on-devel/opt
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 10800
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -362,17 +362,17 @@ win64-add-on-devel/opt:
 
 win64-noopt/debug:
     description: "Win64 No-optimize Debug"
     index:
         product: firefox
         job-name: win64-noopt-debug
     treeherder:
         platform: windows2012-64-noopt/debug
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -391,17 +391,17 @@ win64-noopt/debug:
 
 win32-noopt/debug:
     description: "Win32 No-optimize Debug"
     index:
         product: firefox
         job-name: win32-noopt-debug
     treeherder:
         platform: windows2012-32-noopt/debug
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -420,17 +420,17 @@ win32-noopt/debug:
 
 win32-rusttests/opt:
     description: "Win32 Opt Rust tests"
     index:
         product: firefox
         job-name: win32-rusttests-opt
     treeherder:
         platform: windows2012-32/opt
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
@@ -450,17 +450,17 @@ win32-rusttests/opt:
 
 win64-rusttests/opt:
     description: "Win64 Opt Rust tests"
     index:
         product: firefox
         job-name: win64-rusttests-opt
     treeherder:
         platform: windows2012-64/opt
-        symbol: tc(BR)
+        symbol: BR
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: rusttests
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
@@ -480,17 +480,17 @@ win64-rusttests/opt:
 
 win64-ccov/debug:
     description: "Win64 Debug Code Coverage"
     index:
         product: firefox
         job-name: win64-ccov-debug
     treeherder:
         platform: windows2012-64/ccov
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -509,17 +509,17 @@ win64-ccov/debug:
 
 win64-asan/debug:
     description: "Win64 Debug ASAN"
     index:
         product: firefox
         job-name: win64-asan-debug
     treeherder:
         platform: windows2012-64/asan
-        symbol: tc(Bd)
+        symbol: Bd
         tier: 3
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "debug asan"
     run:
@@ -539,17 +539,17 @@ win64-asan/debug:
 
 win64-asan/opt:
     description: "Win64 Opt ASAN"
     index:
         product: firefox
         job-name: win64-asan-opt
     treeherder:
         platform: windows2012-64/asan
-        symbol: tc(Bo)
+        symbol: Bo
         tier: 3
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
             PERFHERDER_EXTRA_OPTIONS: "opt asan"
     run:
@@ -574,17 +574,17 @@ win32-devedition-nightly/opt:
         job-name: win32-opt
         type: nightly
     attributes:
         nightly: true
     shipping-phase: build
     shipping-product: devedition
     treeherder:
         platform: windows2012-32-devedition/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
@@ -611,17 +611,17 @@ win64-devedition-nightly/opt:
         job-name: win64-opt
         type: nightly
     attributes:
         nightly: true
     shipping-phase: build
     shipping-product: devedition
     treeherder:
         platform: windows2012-64-devedition/opt
-        symbol: tc(N)
+        symbol: N
         tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         max-run-time: 7200
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
     run:
         using: mozharness
@@ -643,17 +643,17 @@ win64-devedition-nightly/opt:
 
 win32-mingw32/debug:
     description: "Win32 MinGW Debug"
     index:
         product: firefox
         job-name: win32-mingw32-debug
     treeherder:
         platform: windows-mingw32-32/debug
-        symbol: tc(B)
+        symbol: B
         tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 7200
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -1,61 +1,59 @@
 trust-domain: gecko
 treeherder:
     group-names:
         'cram': 'Cram tests'
         'mocha': 'Mocha unit tests'
         'py': 'Python unit tests'
-        'tc': 'Executed by TaskCluster'
-        'tc-A': 'Android Gradle tests executed by TaskCluster'
-        'tc-e10s': 'Executed by TaskCluster with e10s'
-        'tc-Fxfn-l': 'Firefox functional tests (local) executed by TaskCluster'
-        'tc-Fxfn-l-e10s': 'Firefox functional tests (local) executed by TaskCluster with e10s'
-        'tc-Fxfn-r': 'Firefox functional tests (remote) executed by TaskCluster'
-        'tc-Fxfn-r-e10s': 'Firefox functional tests (remote) executed by TaskCluster with e10s'
-        'tc-M': 'Mochitests executed by TaskCluster'
-        'tc-M-e10s': 'Mochitests executed by TaskCluster with e10s'
-        'tc-M-V': 'Mochitests on Valgrind executed by TaskCluster'
-        'tc-R': 'Reftests executed by TaskCluster'
-        'tc-R-e10s': 'Reftests executed by TaskCluster with e10s'
-        'tc-T': 'Talos performance tests executed by TaskCluster'
-        'tc-Tsd': 'Talos performance tests executed by TaskCluster with Stylo disabled'
-        'tc-Tss': 'Talos performance tests executed by TaskCluster with Stylo sequential'
-        'tc-T-e10s': 'Talos performance tests executed by TaskCluster with e10s'
-        'tc-Tsd-e10s': 'Talos performance tests executed by TaskCluster with e10s, Stylo disabled'
-        'tc-Tss-e10s': 'Talos performance tests executed by TaskCluster with e10s, Stylo sequential'
-        'tc-tt-c': 'Telemetry client marionette tests'
-        'tc-tt-c-e10s': 'Telemetry client marionette tests with e10s'
-        'tc-SY-e10s': 'Are we slim yet tests by TaskCluster with e10s'
-        'tc-SYsd-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo disabled'
-        'tc-SYss-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo sequential'
-        'tc-VP': 'VideoPuppeteer tests executed by TaskCluster'
-        'tc-W': 'Web platform tests executed by TaskCluster'
-        'tc-W-e10s': 'Web platform tests executed by TaskCluster with e10s'
-        'tc-X': 'Xpcshell tests executed by TaskCluster'
-        'tc-X-e10s': 'Xpcshell tests executed by TaskCluster with e10s'
-        'tc-L10n': 'Localised Repacks executed by Taskcluster'
-        'tc-L10n-Rpk': 'Localized Repackaged Repacks executed by Taskcluster'
-        'tc-BM-L10n': 'Beetmover for locales executed by Taskcluster'
-        'tc-BMR-L10n': 'Beetmover repackages for locales executed by Taskcluster'
+        'A': 'Android Gradle tests'
+        'Fxfn-l': 'Firefox functional tests (local)'
+        'Fxfn-l-e10s': 'Firefox functional tests (local) with e10s'
+        'Fxfn-r': 'Firefox functional tests (remote)'
+        'Fxfn-r-e10s': 'Firefox functional tests (remote) with e10s'
+        'M': 'Mochitests'
+        'M-e10s': 'Mochitests with e10s'
+        'M-V': 'Mochitests on Valgrind'
+        'R': 'Reftests'
+        'R-e10s': 'Reftests with e10s'
+        'T': 'Talos performance tests'
+        'Tsd': 'Talos performance tests with Stylo disabled'
+        'Tss': 'Talos performance tests with Stylo sequential'
+        'T-e10s': 'Talos performance tests with e10s'
+        'Tsd-e10s': 'Talos performance tests with e10s, Stylo disabled'
+        'Tss-e10s': 'Talos performance tests with e10s, Stylo sequential'
+        'tt-c': 'Telemetry client marionette tests'
+        'tt-c-e10s': 'Telemetry client marionette tests with e10s'
+        'SY-e10s': 'Are we slim yet tests by TaskCluster with e10s'
+        'SYsd-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo disabled'
+        'SYss-e10s': 'Are we slim yet tests by TaskCluster with e10s, Stylo sequential'
+        'VP': 'VideoPuppeteer tests'
+        'W': 'Web platform tests'
+        'W-e10s': 'Web platform tests with e10s'
+        'X': 'Xpcshell tests'
+        'X-e10s': 'Xpcshell tests with e10s'
+        'L10n': 'Localised Repacks'
+        'L10n-Rpk': 'Localized Repackaged Repacks'
+        'BM-L10n': 'Beetmover for locales'
+        'BMR-L10n': 'Beetmover repackages for locales'
         'c-Up': 'Balrog submission of complete updates'
-        'tc-cs': 'Checksum signing executed by Taskcluster'
-        'tc-rs': 'Repackage signing executed by Taskcluster'
-        'tc-BMcs': 'Beetmover checksums, executed by Taskcluster'
+        'cs': 'Checksum signing'
+        'rs': 'Repackage signing'
+        'BMcs': 'Beetmover checksums,'
         'Aries': 'Aries Device Image'
         'Deb7': 'Packages for Debian 7'
         'Nexus 5-L': 'Nexus 5-L Device Image'
         'I': 'Docker Image Builds'
         'TL': 'Toolchain builds for Linux 64-bits'
         'TM': 'Toolchain builds for OSX'
         'TMW': 'Toolchain builds for Windows MinGW'
         'TW32': 'Toolchain builds for Windows 32-bits'
         'TW64': 'Toolchain builds for Windows 64-bits'
         'Searchfox': 'Searchfox builds'
-        'SM-tc': 'Spidermonkey builds'
+        'SM': 'Spidermonkey builds'
         'pub': 'APK publishing'
         'p': 'Partial generation'
         'ps': 'Partials signing'
         'Rel': 'Release promotion'
         'Snap': 'Snap image generation'
 
 index:
     products:
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -25,17 +25,17 @@ job-defaults:
 jobs:
     linux64-shell-haz/debug:
         description: "JS Shell Hazard Analysis Linux"
         index:
             product: firefox
             job-name: shell-haz-debug
         treeherder:
             platform: linux64/debug
-            symbol: SM-tc(H)
+            symbol: SM(H)
         run:
             using: hazard
             command: >
                 cd /builds/worker/checkouts/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project shell $HOME/workspace
         when:
             files-changed:
                 - js/public/**
@@ -48,17 +48,17 @@ jobs:
 
     linux64-haz/debug:
         description: "Browser Hazard Analysis Linux"
         index:
             product: firefox
             job-name: browser-haz-debug
         treeherder:
             platform: linux64/debug
-            symbol: tc(H)
+            symbol: H
         run:
             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
--- a/taskcluster/ci/l10n/kind.yml
+++ b/taskcluster/ci/l10n/kind.yml
@@ -63,17 +63,17 @@ job-template:
          default: public
          android-api-16-l10n: internal
          macosx64-nightly: internal
    worker-type:
       by-build-platform:
          default: aws-provisioner-v1/gecko-{level}-b-linux
          android: aws-provisioner-v1/gecko-{level}-b-android
    treeherder:
-      symbol: tc(L10n)
+      symbol: L10n
       tier: 2
       platform:
          by-build-platform:
             linux64-l10n: linux64/opt
             linux-l10n: linux32/opt
             macosx64: osx-cross/opt
             android-api-16-l10n: android-4-0-armv7-api16/opt
    mozharness:
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -99,17 +99,17 @@ job-template:
             win64-devedition-nightly: win64-devedition-opt
             android-api-16-nightly: android-api-16-opt
    worker-type:
       by-build-platform:
          default: aws-provisioner-v1/gecko-{level}-b-linux
          android-api-16-nightly: aws-provisioner-v1/gecko-{level}-b-android
          win.*: aws-provisioner-v1/gecko-{level}-b-win2012
    treeherder:
-      symbol: tc-L10n(N)
+      symbol: L10n(N)
       tier: 1
       platform:
          by-build-platform:
             linux64-nightly: linux64/opt
             linux-nightly: linux32/opt
             macosx64-nightly: osx-cross/opt
             win32-nightly: windows2012-32/opt
             win64-nightly: windows2012-64/opt
--- a/taskcluster/ci/release-source/source.yml
+++ b/taskcluster/ci/release-source/source.yml
@@ -1,16 +1,16 @@
 linux64-source/opt:
     description: "Firefox source builder"
     index:
         product: firefox
         job-name: linux64-source-opt
     treeherder:
         platform: linux64/opt
-        symbol: tc(Src)
+        symbol: Src
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [build]
         config:
             - builds/releng_sub_linux_configs/64_source.py
@@ -21,17 +21,17 @@ linux64-source/opt:
 
 linux64-fennec-source/opt:
     description: "Fennec source builder"
     index:
         product: fennec
         job-name: linux64-fennec-source-opt
     treeherder:
         platform: android-api-16/opt
-        symbol: tc(Src)
+        symbol: Src
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [build]
         config:
             - builds/releng_sub_linux_configs/64_source.py
@@ -42,17 +42,17 @@ linux64-fennec-source/opt:
 
 linux64-devedition-source/opt:
     description: "Devedition source builder"
     index:
         product: devedition
         job-name: linux64-devedition-source-opt
     treeherder:
         platform: linux64-devedition-source/opt
-        symbol: tc(Src)
+        symbol: Src
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 36000
     run:
         using: mozharness
         actions: [build]
         config:
             - builds/releng_sub_linux_configs/64_source.py
--- a/taskcluster/ci/source-test/doc.yml
+++ b/taskcluster/ci/source-test/doc.yml
@@ -1,13 +1,13 @@
 generate:
     description: Generate the Sphinx documentation
     platform: lint/opt
     treeherder:
-        symbol: tc(Doc)
+        symbol: Doc
         kind: test
         tier: 1
     worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
         artifacts:
             - type: file
@@ -21,17 +21,17 @@ generate:
         sparse-profile: sphinx-docs
     optimization:
         skip-unless-schedules: [docs]
 
 upload:
     description: Generate and upload the Sphinx documentation
     platform: lint/opt
     treeherder:
-        symbol: tc(DocUp)
+        symbol: DocUp
         kind: test
         tier: 3
     run-on-projects: [mozilla-central]
     worker-type: aws-provisioner-v1/gecko-t-linux-xlarge
     worker:
         docker-image: {in-tree: "lint"}
         max-run-time: 1800
         taskcluster-proxy: true
--- a/taskcluster/ci/spidermonkey/linux.yml
+++ b/taskcluster/ci/spidermonkey/linux.yml
@@ -9,159 +9,159 @@ job-defaults:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/linux64/jsshell.manifest"
 
 sm-package-linux64/opt:
     description: "Spidermonkey source package and test"
     index:
         job-name: sm-package-linux64-opt
     treeherder:
-        symbol: SM-tc(pkg)
+        symbol: SM(pkg)
         platform: linux64/opt
     run:
         using: spidermonkey-package
         spidermonkey-variant: plain
 
 sm-mozjs-sys-linux64/debug:
     description: "Build js/src as the mozjs_sys Rust crate"
     index:
         job-name: sm-mozjs-sys-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(mozjs-crate)
+        symbol: SM(mozjs-crate)
     run:
         using: spidermonkey-mozjs-crate
         spidermonkey-variant: plain
     run-on-projects: ['integration', 'release', 'try']
 
 sm-rust-bindings-linux64/debug:
     description: "Build and test the Rust bindings for SpiderMonkey"
     index:
         job-name: sm-rust-bindings-linux64-debug
     treeherder:
-        symbol: SM-tc(rust)
+        symbol: SM(rust)
         tier: 2
         platform: linux64/debug
     run:
         using: spidermonkey-rust-bindings
         spidermonkey-variant: plain
     run-on-projects: ['integration', 'release', 'try']
 
 sm-plain-linux64/debug:
     description: "Spidermonkey Plain"
     index:
         job-name: sm-plain-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(p)
+        symbol: SM(p)
     run:
         spidermonkey-variant: plaindebug
 
 sm-plain-linux64/opt:
     description: "Spidermonkey Plain"
     index:
         job-name: sm-plain-linux64-opt
     treeherder:
-        symbol: SM-tc(p)
+        symbol: SM(p)
         platform: linux64/opt
     run:
         spidermonkey-variant: plain
 
 sm-nojit-linux64/opt:
     description: "Spidermonkey no JIT"
     index:
         job-name: sm-nojit-linux64-opt
     treeherder:
-        symbol: SM-tc(nojit)
+        symbol: SM(nojit)
         platform: linux64/opt
     run:
         spidermonkey-variant: nojit
 
 sm-arm-sim-linux32/debug:
     description: "Spidermonkey ARM sim"
     index:
         job-name: sm-arm-sim-linux32-debug
     treeherder:
         platform: linux32/debug
-        symbol: SM-tc(arm)
+        symbol: SM(arm)
     run:
         spidermonkey-variant: arm-sim
 
 sm-arm64-sim-linux64/debug:
     description: "Spidermonkey ARM64 sim"
     index:
         job-name: sm-arm64-sim-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(arm64)
+        symbol: SM(arm64)
     run:
         spidermonkey-variant: arm64-sim
 
 sm-asan-linux64/opt:
     description: "Spidermonkey Address Sanitizer"
     index:
         job-name: sm-asan-linux64-opt
     treeherder:
-        symbol: SM-tc(asan)
+        symbol: SM(asan)
         platform: linux64/opt
     run:
         spidermonkey-variant: asan
 
 sm-compacting-linux64/debug:
     description: "Spidermonkey Compacting"
     index:
         job-name: sm-compacting-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(cgc)
+        symbol: SM(cgc)
     run:
         spidermonkey-variant: compacting
 
 sm-msan-linux64/opt:
     description: "Spidermonkey Memory Sanitizer"
     index:
         job-name: sm-msan-linux64-opt
     treeherder:
-        symbol: SM-tc(msan)
+        symbol: SM(msan)
         platform: linux64/opt
     run:
         spidermonkey-variant: msan
 
 sm-tsan-linux64/opt:
     description: "Spidermonkey Thread Sanitizer"
     index:
         job-name: sm-tsan-linux64-opt
     treeherder:
-        symbol: SM-tc(tsan)
+        symbol: SM(tsan)
         tier: 3
         platform: linux64/opt
     run:
         spidermonkey-variant: tsan
 
 sm-rootanalysis-linux64/debug:
     description: "Spidermonkey Root Analysis"
     index:
         job-name: sm-rootanalysis-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(r)
+        symbol: SM(r)
     run:
         spidermonkey-variant: rootanalysis
 
 sm-nonunified-linux64/debug:
     description: "Spidermonkey Non-Unified Debug"
     index:
         job-name: sm-nonunified-linux64-debug
     treeherder:
         platform: linux64/debug
-        symbol: SM-tc(nu)
+        symbol: SM(nu)
     run:
         spidermonkey-variant: nonunified
 
 sm-fuzzing-linux64/opt:
     description: "Spidermonkey Fuzzing"
     index:
         job-name: sm-fuzzing-linux64
     treeherder:
         platform: linux64/opt
-        symbol: SM-tc(f)
+        symbol: SM(f)
     run:
         spidermonkey-variant: fuzzing
--- a/taskcluster/ci/spidermonkey/windows.yml
+++ b/taskcluster/ci/spidermonkey/windows.yml
@@ -10,31 +10,31 @@ job-defaults:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
 
 sm-plain-win32/debug:
     description: "Spidermonkey Plain"
     index:
         job-name: sm-plain-win32-debug
     treeherder:
         platform: windows2012-32/debug
-        symbol: SM-tc(p)
+        symbol: SM(p)
     run:
         spidermonkey-variant: plaindebug
 
 sm-plain-win32/opt:
     description: "Spidermonkey Plain"
     index:
         job-name: sm-plain-win32-opt
     treeherder:
         platform: windows2012-32/opt
-        symbol: SM-tc(p)
+        symbol: SM(p)
     run:
         spidermonkey-variant: plain
 
 sm-compacting-win32/debug:
     description: "Spidermonkey Compacting"
     index:
         job-name: sm-compacting-win32-debug
     treeherder:
         platform: windows2012-32/debug
-        symbol: SM-tc(cgc)
+        symbol: SM(cgc)
     run:
         spidermonkey-variant: compacting
--- a/taskcluster/ci/static-analysis/kind.yml
+++ b/taskcluster/ci/static-analysis/kind.yml
@@ -72,17 +72,17 @@ jobs:
 
     win32-st-an/debug:
         description: "Win32 Static Analysis Debug (clang-cl)"
         index:
             product: firefox
             job-name: win32-st-an-debug
         treeherder:
             platform: windows2012-32/debug
-            symbol: tc(S)
+            symbol: S
             tier: 1
         worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
         worker:
             max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
         run:
             using: mozharness
@@ -100,17 +100,17 @@ jobs:
 
     win32-st-an/opt:
         description: "Win32 Static Analysis Opt (clang-cl)"
         index:
             product: firefox
             job-name: win32-st-an-opt
         treeherder:
             platform: windows2012-32/opt
-            symbol: tc(S)
+            symbol: S
             tier: 1
         worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
         worker:
             max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
         run:
             using: mozharness
@@ -128,17 +128,17 @@ jobs:
 
     win64-st-an/debug:
         description: "Win64 Static Analysis Debug (clang-cl)"
         index:
             product: firefox
             job-name: win64-st-an-debug
         treeherder:
             platform: windows2012-64/debug
-            symbol: tc(S)
+            symbol: S
             tier: 1
         worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
         worker:
             max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
         run:
             using: mozharness
@@ -156,17 +156,17 @@ jobs:
 
     win64-st-an/opt:
         description: "Win64 Static Analysis Opt (clang-cl)"
         index:
             product: firefox
             job-name: win64-st-an-opt
         treeherder:
             platform: windows2012-64/opt
-            symbol: tc(S)
+            symbol: S
             tier: 1
         worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
         worker:
             max-run-time: 7200
             env:
                 TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
         run:
             using: mozharness
--- a/taskcluster/ci/test/awsy.yml
+++ b/taskcluster/ci/test/awsy.yml
@@ -11,35 +11,35 @@ job-defaults:
                     - awsy/taskcluster_windows_config.py
                 macosx.*/opt:
                     - awsy/macosx_config.py
                 default:
                     - awsy/linux_config.py
 
 awsy:
     description: "Are we slim yet"
-    treeherder-symbol: tc-SY(sy)
+    treeherder-symbol: SY(sy)
     run-on-projects:
         by-test-platform:
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
 
 awsy-stylo-disabled:
     description: "Are we slim yet for Stylo disabled"
-    treeherder-symbol: tc-SYsd(sy)
+    treeherder-symbol: SYsd(sy)
     run-on-projects:
         by-test-platform:
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
     mozharness:
         extra-options:
             - --disable-stylo
 
 awsy-stylo-sequential:
     description: "Are we slim yet for Stylo sequential"
-    treeherder-symbol: tc-SYss(sy)
+    treeherder-symbol: SYss(sy)
     run-on-projects:
         by-test-platform:
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
     mozharness:
         extra-options:
             - --single-stylo-traversal
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -16,17 +16,17 @@ job-defaults:
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
 
 cppunit:
     description: "CPP Unit Tests"
     suite: cppunittest
-    treeherder-symbol: tc(Cpp)
+    treeherder-symbol: Cpp
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     run-on-projects:
         by-test-platform:
             windows10-64-asan/opt: []  # as an exception to windows.*
             .*-qr/.*: ['mozilla-central', 'try']
@@ -34,17 +34,17 @@ cppunit:
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 gtest:
     description: "GTests run"
     suite: gtest
-    treeherder-symbol: tc(GTest)
+    treeherder-symbol: GTest
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             windows.*-pgo/.*: []  # permafails on pgo
             windows.*-nightly/.*: []  # permafails on nightly too
             .*-devedition/.*: []  # don't run on devedition
             default: built-projects
@@ -53,17 +53,17 @@ gtest:
             windows7-32-pgo.*: 3
             windows10-64-pgo.*: 3
             windows10-64-asan.*: 3
             default: default
 
 jittest:
     description: "JIT Test run"
     suite: jittest/jittest-chunked
-    treeherder-symbol: tc(Jit)
+    treeherder-symbol: Jit
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: built-projects
     chunks:
         by-test-platform:
             windows.*: 1
             windows10-64-ccov/debug: 6
--- a/taskcluster/ci/test/firefox-ui.yml
+++ b/taskcluster/ci/test/firefox-ui.yml
@@ -11,30 +11,30 @@ job-defaults:
                     - firefox_ui_tests/taskcluster_mac.py
                 linux.*:
                     - firefox_ui_tests/taskcluster.py
                     - remove_executables.py
 
 firefox-ui-functional-local:
     description: "Firefox-ui-tests functional run"
     suite: "firefox-ui/functional local"
-    treeherder-symbol: tc-Fxfn-l(en-US)
+    treeherder-symbol: Fxfn-l(en-US)
     mozharness:
         extra-options:
             - "--tag"
             - "local"
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 firefox-ui-functional-remote:
     description: "Firefox-ui-tests functional run"
     suite: "firefox-ui/functional remote"
-    treeherder-symbol: tc-Fxfn-r(en-US)
+    treeherder-symbol: Fxfn-r(en-US)
     mozharness:
         extra-options:
             - "--tag"
             - "remote"
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: 2
--- a/taskcluster/ci/test/marionette.yml
+++ b/taskcluster/ci/test/marionette.yml
@@ -16,17 +16,17 @@ job-defaults:
                 windows.*:
                     - marionette/windows_taskcluster_config.py
                 default:
                     - marionette/prod_config.py
                     - remove_executables.py
 
 marionette:
     description: "Marionette unittest run"
-    treeherder-symbol: tc(Mn)
+    treeherder-symbol: Mn
     max-run-time:
         by-test-platform:
             android.*: 3600
             default: 5400
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
@@ -37,17 +37,17 @@ marionette:
             default: default
     chunks:
         by-test-platform:
             android.*: 10
             default: 1
 
 marionette-headless:
     description: "Marionette headless unittest run"
-    treeherder-symbol: tc(MnH)
+    treeherder-symbol: MnH
     max-run-time: 5400
     instance-size: default
     mozharness:
         extra-options:
             - --headless
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -1,12 +1,12 @@
 geckoview:
     description: "Geckoview run"
     suite: geckoview
-    treeherder-symbol: tc(gv)
+    treeherder-symbol: gv
     instance-size: xlarge
     loopback-video: true
     e10s: false
     mozharness:
         script: android_emulator_unittest.py
         no-read-buildbot-config: true
         config:
             by-test-platform:
@@ -15,17 +15,17 @@ geckoview:
                 android.*:
                     - android/androidarm_4_3.py
         extra-options:
             - --test-suite=geckoview
 
 robocop:
     description: "Robocop run"
     suite: robocop
-    treeherder-symbol: tc-M(rc)
+    treeherder-symbol: M(rc)
     instance-size: xlarge
     chunks:
         by-test-platform:
             # android-4.3-arm7-api-16/debug -- not run
             android-4.3-arm7-api-16/opt: 4
             android-4.3-arm7-api-16-gradle/opt: 4
     loopback-video: true
     e10s: false
@@ -35,32 +35,32 @@ robocop:
         config:
             - android/androidarm_4_3.py
         extra-options:
             - --test-suite=robocop
 
 telemetry-tests-client:
     description: "Telemetry tests client run"
     suite: telemetry-tests-client
-    treeherder-symbol: tc-e10s
+    treeherder-symbol: tt-c()
     max-run-time: 5400
     checkout: true
     tier: 3
     mozharness:
         script: telemetry/telemetry_client.py
         config:
             by-test-platform:
                 linux.*:
                     - remove_executables.py
                 windows.*: []
 
 test-verify:
     description: "Extra verification of tests modified on this push"
     suite: test-verify
-    treeherder-symbol: tc(TV)
+    treeherder-symbol: TV
     loopback-video: true
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     max-run-time: 5400
     allow-software-gl-layers: false
     run-on-projects:
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -20,17 +20,17 @@ job-defaults:
                     - unittests/win_taskcluster_unittest.py
 
 mochitest:
     description: "Mochitest plain run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/plain-chunked-coverage
             default: mochitest/plain-chunked
-    treeherder-symbol: tc-M()
+    treeherder-symbol: M()
     loopback-video: true
     instance-size:
         by-test-platform:
             linux64-jsdcov/opt: xlarge
             android.*: xlarge
             default: default
     chunks:
         by-test-platform:
@@ -65,17 +65,17 @@ mochitest:
         chunked:
             by-test-platform:
                 android.*: false
                 default: true
 
 mochitest-a11y:
     description: "Mochitest a11y run"
     suite: mochitest/a11y
-    treeherder-symbol: tc-M(a11y)
+    treeherder-symbol: M(a11y)
     loopback-video: true
     e10s: false
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: built-projects
     mozharness:
         mochitest-flavor: a11y
@@ -85,17 +85,17 @@ mochitest-a11y:
             default: default
 
 mochitest-browser-chrome:
     description: "Mochitest browser-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/browser-chrome-coverage
             default: mochitest/browser-chrome-chunked
-    treeherder-symbol: tc-M(bc)
+    treeherder-symbol: M(bc)
     loopback-video: true
     chunks:
         by-test-platform:
             linux.*/debug: 16
             linux64-asan/opt: 16
             default: 7
     e10s:
         by-test-platform:
@@ -120,32 +120,32 @@ mochitest-browser-chrome:
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 browser-instrumentation:
     description: "Extra instrumentation for a browser-chrome run (XUL, XBL, etc)"
     suite: mochitest/browser-chrome-instrumentation
-    treeherder-symbol: tc-M(inst)
+    treeherder-symbol: M(inst)
     loopback-video: true
     tier: 3
     run-on-projects:
         by-test-platform:
             windows.*-nightly/.*: ["mozilla-central"]
             default: []
     max-run-time: 14400
     mozharness:
         mochitest-flavor: browser
     allow-software-gl-layers: false
 
 browser-screenshots:
     description: "Browser Screenshots"
     suite: mochitest/browser-chrome-screenshots
-    treeherder-symbol: tc-M(ss)
+    treeherder-symbol: M(ss)
     loopback-video: true
     run-on-projects:
         by-test-platform:
             # We don't want debug, pgo, devedition or nightly builds
             windows7-32/opt: ['mozilla-central', 'integration']
             windows10-64/opt: ['mozilla-central', 'integration']
             linux64/opt: ['mozilla-central', 'integration']
             macosx64/opt: ['mozilla-central', 'integration']
@@ -153,17 +153,17 @@ browser-screenshots:
     max-run-time: 3600
     mozharness:
         mochitest-flavor: browser
     allow-software-gl-layers: false
 
 mochitest-chrome:
     description: "Mochitest chrome run"
     suite: mochitest/chrome
-    treeherder-symbol: tc-M(c)
+    treeherder-symbol: M(c)
     loopback-video: true
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 4
@@ -189,17 +189,17 @@ mochitest-chrome:
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 mochitest-clipboard:
     description: "Mochitest clipboard run"
     suite: mochitest/clipboard
-    treeherder-symbol: tc-M(cl)
+    treeherder-symbol: M(cl)
     loopback-video: true
     instance-size: xlarge
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
     mozharness:
         mochitest-flavor: plain
@@ -220,17 +220,17 @@ mochitest-clipboard:
             default: default
 
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/mochitest-devtools-chrome-coverage
             default: mochitest/mochitest-devtools-chrome-chunked
-    treeherder-symbol: tc-M(dt)
+    treeherder-symbol: M(dt)
     loopback-video: true
     max-run-time: 5400
     chunks: 8
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
@@ -246,17 +246,17 @@ mochitest-devtools-chrome:
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 mochitest-gpu:
     description: "Mochitest GPU run"
     suite: mochitest/gpu
-    treeherder-symbol: tc-M(gpu)
+    treeherder-symbol: M(gpu)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'autoland', 'mozilla-inbound', 'try']  # exclude beta and project branches
             default: built-projects
     loopback-video: true
     instance-size:
         by-test-platform:
             android.*: xlarge
@@ -279,17 +279,17 @@ mochitest-gpu:
         by-test-platform:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 mochitest-media:
     description: "Mochitest media run"
     suite: mochitest/mochitest-media
-    treeherder-symbol: tc-M(mda)
+    treeherder-symbol: M(mda)
     max-run-time: 5400
     loopback-video: true
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: large
     chunks:
         by-test-platform:
@@ -308,17 +308,17 @@ mochitest-media:
         by-test-platform:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 mochitest-plain-headless:
     description: "Mochitest plain headless run"
     suite: mochitest/plain-chunked
-    treeherder-symbol: tc-M(h)
+    treeherder-symbol: M(h)
     loopback-video: true
     chunks:
         by-test-platform:
             linux.*/debug: 16
             default: 5
     e10s: true
     max-run-time: 5400
     allow-software-gl-layers: false
@@ -327,34 +327,34 @@ mochitest-plain-headless:
         mochitest-flavor: plain
         chunked: true
         extra-options:
             - --headless
 
 mochitest-valgrind:
     description: "Mochitest plain Valgrind run"
     suite: mochitest/valgrind-plain
-    treeherder-symbol: tc-M-V()
+    treeherder-symbol: M-V()
     run-on-projects: []
     tier: 3
     loopback-video: true
     chunks: 40
     max-run-time: 14400
     # We could re-enable e10s later.
     # There's no intrinsic reason not to use it.
     e10s: false
     allow-software-gl-layers: false
     mozharness:
         mochitest-flavor: plain
         chunked: true
 
 mochitest-webgl:
     description: "Mochitest webgl run"
     suite: mochitest/mochitest-gl
-    treeherder-symbol: tc-M(gl)
+    treeherder-symbol: M(gl)
     run-on-projects:
         by-test-platform:
             windows10-64-ccov/.*: []  # Do not run on Windows ccov, see bug 1419475.
             default: built-projects
     virtualization: virtual-with-gpu
     chunks:
         by-test-platform:
             android.*: 10
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -15,17 +15,17 @@ job-defaults:
                 macosx.*:
                     - unittests/mac_unittest.py
                 windows.*:
                     - unittests/win_taskcluster_unittest.py
 
 crashtest:
     description: "Crashtest run"
     suite: reftest/crashtest
-    treeherder-symbol: tc-R(C)
+    treeherder-symbol: R(C)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'autoland', 'mozilla-inbound', 'try']  # exclude beta and project branches
             default: built-projects
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
@@ -46,17 +46,17 @@ crashtest:
         by-test-platform:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 jsreftest:
     description: "JS Reftest run"
     suite: reftest/jsreftest
-    treeherder-symbol: tc-R(J)
+    treeherder-symbol: R(J)
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     chunks:
         by-test-platform:
             android-4.3-arm7-api-16/debug: 100
             android.*: 40
@@ -80,17 +80,17 @@ jsreftest:
         by-test-platform:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest:
     description: "Reftest run"
     suite: reftest/reftest
-    treeherder-symbol: tc-R(R)
+    treeherder-symbol: R(R)
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
@@ -123,34 +123,34 @@ reftest:
         by-test-platform:
             linux64-qr/.*: 1
             windows10-64-asan.*: 3
             default: default
 
 reftest-gpu:
     description: "Reftest GPU run"
     suite: reftest/reftest-gpu
-    treeherder-symbol: tc-R(Rg)
+    treeherder-symbol: R(Rg)
     chunks: 8
     run-on-projects:
         by-test-platform:
             windows10.*: []
             windows8-64.*: []
             default: built-projects
     instance-size: default
     virtualization: virtual-with-gpu
     max-run-time: 3600
     mozharness:
         chunked: true
     tier: default
 
 reftest-no-accel:
     description: "Reftest not accelerated run"
     suite: reftest/reftest-no-accel
-    treeherder-symbol: tc-R(Ru)
+    treeherder-symbol: R(Ru)
     virtualization: virtual-with-gpu
     worker-type:
         by-test-platform:
             windows10-64.*: buildbot-bridge/buildbot-bridge
             default: null
     chunks:
         by-test-platform:
             macosx.*: 1
@@ -171,11 +171,11 @@ reftest-no-accel:
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
             default: default
 
 reftest-stylo:
     description: "Reftest run in Stylo vs. Gecko mode"
     suite: reftest/reftest-stylo
-    treeherder-symbol: tc-R(Rs)
+    treeherder-symbol: R(Rs)
     virtualization: virtual-with-gpu
     chunks: 8
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -24,414 +24,414 @@ job-defaults:
                 linux64-ccov/opt:
                     - talos/linux64_config_taskcluster.py
                 default:
                     - talos/linux_config.py
 
 talos-chrome:
     description: "Talos chrome"
     try-name: chromez
-    treeherder-symbol: tc-T(c)
+    treeherder-symbol: T(c)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=chromez
             - --add-option
             - --webServer,localhost
 
 talos-chrome-stylo-disabled:
     description: "Talos Stylo disabled chrome"
     try-name: chromez-stylo-disabled
-    treeherder-symbol: tc-Tsd(c)
+    treeherder-symbol: Tsd(c)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=chromez-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-dromaeojs:
     description: "Talos dromaeojs"
     try-name: dromaeojs
-    treeherder-symbol: tc-T(d)
+    treeherder-symbol: T(d)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=dromaeojs
             - --add-option
             - --webServer,localhost
 
 talos-dromaeojs-stylo-disabled:
     description: "Talos Stylo disabled dromaeojs"
     try-name: dromaeojs-stylo-disabled
-    treeherder-symbol: tc-Tsd(d)
+    treeherder-symbol: Tsd(d)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=dromaeojs-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g1:
     description: "Talos g1"
     try-name: g1
-    treeherder-symbol: tc-T(g1)
+    treeherder-symbol: T(g1)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     max-run-time: 7200
     mozharness:
         extra-options:
             - --suite=g1
             - --add-option
             - --webServer,localhost
 
 talos-g1-stylo-disabled:
     description: "Talos Stylo disabled g1"
     try-name: g1-stylo-disabled
-    treeherder-symbol: tc-Tsd(g1)
+    treeherder-symbol: Tsd(g1)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     max-run-time: 7200
     mozharness:
         extra-options:
             - --suite=g1-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g2:
     description: "Talos g2"
     try-name: g2
-    treeherder-symbol: tc-T(g2)
+    treeherder-symbol: T(g2)
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             linux64-ccov/.*: ['try']  # Bug 1407593
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=g2
             - --add-option
             - --webServer,localhost
 
 talos-g2-stylo-disabled:
     description: "Talos Stylo disabled g2"
     try-name: g2-stylo-disabled
-    treeherder-symbol: tc-Tsd(g2)
+    treeherder-symbol: Tsd(g2)
     max-run-time: 7200
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g2-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g3:
     description: "Talos g3"
     try-name: g3
-    treeherder-symbol: tc-T(g3)
+    treeherder-symbol: T(g3)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=g3
             - --add-option
             - --webServer,localhost
 
 talos-g3-stylo-disabled:
     description: "Talos Stylo disabled g3"
     try-name: g3-stylo-disabled
-    treeherder-symbol: tc-Tsd(g3)
+    treeherder-symbol: Tsd(g3)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g3-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g4:
     description: "Talos g4"
     try-name: g4
-    treeherder-symbol: tc-T(g4)
+    treeherder-symbol: T(g4)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=g4
             - --add-option
             - --webServer,localhost
 
 talos-g4-stylo-disabled:
     description: "Talos Stylo disabled g4"
     try-name: g4-stylo-disabled
-    treeherder-symbol: tc-Tsd(g4)
+    treeherder-symbol: Tsd(g4)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g4-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-g5:
     description: "Talos g5"
     try-name: g5
-    treeherder-symbol: tc-T(g5)
+    treeherder-symbol: T(g5)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=g5
             - --add-option
             - --webServer,localhost
 
 talos-g5-stylo-disabled:
     description: "Talos Stylo disabled g5"
     try-name: g5-stylo-disabled
-    treeherder-symbol: tc-Tsd(g5)
+    treeherder-symbol: Tsd(g5)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=g5-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-h1:
     description: "Talos h1"
     try-name: h1
-    treeherder-symbol: tc-T(h1)
+    treeherder-symbol: T(h1)
     max-run-time: 5400
     run-on-projects:
         by-test-platform:
             windows.*: ['try']
             linux64.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=h1
             - --add-option
             - --webServer,localhost
 
 talos-h2:
     description: "Talos h2"
     try-name: h2
-    treeherder-symbol: tc-T(h2)
+    treeherder-symbol: T(h2)
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             windows.*: ['try']
             linux64.*: ['try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=h2
             - --add-option
             - --webServer,localhost
 
 talos-other:
     description: "Talos other"
     try-name: other
-    treeherder-symbol: tc-T(o)
+    treeherder-symbol: T(o)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=other
             - --add-option
             - --webServer,localhost
 
 talos-other-stylo-disabled:
     description: "Talos Stylo disabled other"
     try-name: other-stylo-disabled
-    treeherder-symbol: tc-Tsd(o)
+    treeherder-symbol: Tsd(o)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=other-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-perf-reftest:
     description: "Talos perf-reftest"
     try-name: perf-reftest
-    treeherder-symbol: tc-T(p)
+    treeherder-symbol: T(p)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=perf-reftest
 
 talos-perf-reftest-singletons:
     description: "Talos perf-reftest singletons"
     try-name: perf-reftest-singletons
-    treeherder-symbol: tc-T(ps)
+    treeherder-symbol: T(ps)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons
 
 talos-perf-reftest-singletons-stylo-disabled:
     description: "Talos Stylo disabled perf-reftest singletons"
     try-name: perf-reftest-singletons-stylo-disabled
-    treeherder-symbol: tc-Tsd(ps)
+    treeherder-symbol: Tsd(ps)
     run-on-projects: ['mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=perf-reftest-singletons-stylo-disabled
 
 talos-perf-reftest-stylo-disabled:
     description: "Talos Stylo disabled perf-reftest"
     try-name: perf-reftest-stylo-disabled
-    treeherder-symbol: tc-Tsd(p)
+    treeherder-symbol: Tsd(p)
     run-on-projects: ['mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=perf-reftest-stylo-disabled
 
 talos-speedometer:
     description: "Talos speedometer"
     try-name: speedometer
-    treeherder-symbol: tc-T(sp)
+    treeherder-symbol: T(sp)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=speedometer
             - --add-option
             - --webServer,localhost
 
 talos-speedometer-stylo-disabled:
     description: "Talos Stylo disabled speedometer"
     try-name: speedometer-stylo-disabled
-    treeherder-symbol: tc-Tsd(sp)
+    treeherder-symbol: Tsd(sp)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=speedometer-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-svgr:
     description: "Talos svgr"
     try-name: svgr
-    treeherder-symbol: tc-T(s)
+    treeherder-symbol: T(s)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=svgr
             - --add-option
             - --webServer,localhost
 
 talos-svgr-stylo-disabled:
     description: "Talos Stylo disabled svgr"
     try-name: svgr-stylo-disabled
-    treeherder-symbol: tc-Tsd(s)
+    treeherder-symbol: Tsd(s)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=svgr-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-tp5o:
     description: "Talos tp5o"
     try-name: tp5o
-    treeherder-symbol: tc-T(tp)
+    treeherder-symbol: T(tp)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=tp5o
             - --add-option
             - --webServer,localhost
 
 talos-tp5o-stylo-disabled:
     description: "Talos Stylo disabled tp5o"
     try-name: tp5o-stylo-disabled
-    treeherder-symbol: tc-Tsd(tp)
+    treeherder-symbol: Tsd(tp)
     run-on-projects: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=tp5o-stylo-disabled
             - --add-option
             - --webServer,localhost
 
 talos-tp6:
     description: "Talos Tp6"
     try-name: tp6
-    treeherder-symbol: tc-T(tp6)
+    treeherder-symbol: T(tp6)
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=tp6
             - --add-option
             - --webServer,localhost
 
 talos-tp6-stylo-disabled:
     description: "Talos Stylo disabled Tp6"
     try-name: tp6-stylo-disabled
-    treeherder-symbol: tc-Tsd(tp6)
+    treeherder-symbol: Tsd(tp6)
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             windows.*: ['mozilla-beta', 'mozilla-central', 'try']
             macosx.*: ['mozilla-beta', 'mozilla-central', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'try']
     mozharness:
         extra-options:
             - --suite=tp6-stylo-disabled
 
 talos-tp6-stylo-threads:
     description: "Talos Stylo sequential Tp6"
     try-name: tp6-stylo-threads
-    treeherder-symbol: tc-Tss(tp6)
+    treeherder-symbol: Tss(tp6)
     max-run-time: 7200
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             macosx.*: ['mozilla-beta', 'autoland', 'try']
             default: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
     mozharness:
         extra-options:
             - --suite=tp6-stylo-threads
 
 talos-xperf:
     description: "Talos xperf"
     try-name: xperf
-    treeherder-symbol: tc-T(x)
+    treeherder-symbol: T(x)
     virtualization: virtual
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             windows7-32.*: ['mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland', 'try']
             default: []
     mozharness:
         extra-options:
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -12,17 +12,17 @@ job-defaults:
                     - web_platform_tests/prod_config.py
                 default:
                     - web_platform_tests/prod_config.py
                     - remove_executables.py
 
 web-platform-tests:
     description: "Web platform test run"
     suite: web-platform-tests
-    treeherder-symbol: tc-W(wpt)
+    treeherder-symbol: W(wpt)
     chunks:
         by-test-platform:
             macosx64/opt: 5
             macosx64/debug: 10
             windows10-64-ccov/debug: 15
             default: 12
     max-run-time: 7200
     e10s:
@@ -32,17 +32,17 @@ web-platform-tests:
     mozharness:
         chunked: true
         extra-options:
             - --test-type=testharness
 
 web-platform-tests-headless:
     description: "Web platform test headless run"
     suite: web-platform-tests
-    treeherder-symbol: tc-W(wptH)
+    treeherder-symbol: W(wptH)
     chunks:
         by-test-platform:
             macosx64/opt: 5
             macosx64/debug: 10
             default: 12
     e10s:
         by-test-platform:
             macosx.*: true
@@ -60,34 +60,34 @@ web-platform-tests-headless:
                     - --headless-height=768
                 default:
                     - --test-type=testharness
                     - --headless
 
 web-platform-tests-reftests:
     description: "Web platform reftest run"
     suite: web-platform-tests-reftests
-    treeherder-symbol: tc-W(Wr)
+    treeherder-symbol: W(Wr)
     chunks:
         by-test-platform:
             macosx.*: 1
             windows.*: 1
             default: 6
     e10s:
         by-test-platform:
             windows7-32/debug: both
             default: true
     mozharness:
         extra-options:
             - --test-type=reftest
 
 web-platform-tests-reftests-headless:
     description: "Web platform reftest headless run"
     suite: web-platform-tests-reftests
-    treeherder-symbol: tc-W(WrH)
+    treeherder-symbol: W(WrH)
     chunks:
         by-test-platform:
             macosx.*: 1
             windows.*: 1
             default: 6
     e10s:
         by-test-platform:
             windows7-32/debug: both
@@ -102,42 +102,42 @@ web-platform-tests-reftests-headless:
                     - --headless-width=1024
                     - --headless-height=768
                 default:
                     - --test-type=reftest
 
 web-platform-tests-wdspec:
     description: "Web platform webdriver-spec run"
     suite: web-platform-tests-wdspec
-    treeherder-symbol: tc-W(Wd)
+    treeherder-symbol: W(Wd)
     mozharness:
         extra-options:
             - --test-type=wdspec
 
 web-platform-tests-wdspec-headless:
     description: "Web platform webdriver-spec headless run"
     suite: web-platform-tests-wdspec
-    treeherder-symbol: tc-W(WdH)
+    treeherder-symbol: W(WdH)
     run-on-projects: []  # disabled pending releng approval
     mozharness:
         extra-options:
             by-test-platform:
                 windows.*:
                     - --test-type=wdspec
                     - --headless
                     - --headless-width=1024
                     - --headless-height=768
                 default:
                     - --test-type=wdspec
                     - --headless
 
 test-verify-wpt:
     description: "Extra verification of web-platform tests modified on this push"
     suite: test-verify-wpt
-    treeherder-symbol: tc(TVw)
+    treeherder-symbol: TVw
     run-on-projects:
         by-test-platform:
             # do not run on ccov; see also the enable_code_coverage transform
             linux64-ccov/.*: []
             default: built-projects
     tier:
         by-test-platform:
             windows10-64-asan.*: 3
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -26,17 +26,17 @@ job-defaults:
                 default: false
 
 xpcshell:
     description: "xpcshell test run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: xpcshell/xpcshell-coverage
             default: xpcshell
-    treeherder-symbol: tc-X(X)
+    treeherder-symbol: X(X)
     run-on-projects:
         by-test-platform:
             .*-qr/.*: ['mozilla-central', 'try']
             windows10-64-asan/opt: []  # No XPCShell on ASAN yet
             default: built-projects
     chunks:
         by-test-platform:
             linux32/debug: 12
--- a/taskcluster/ci/valgrind/kind.yml
+++ b/taskcluster/ci/valgrind/kind.yml
@@ -16,17 +16,17 @@ transforms:
 jobs:
     linux64-valgrind/opt:
         description: "Linux64 Valgrind Opt"
         index:
             product: firefox
             job-name: linux64-valgrind-opt
         treeherder:
             platform: linux64/opt
-            symbol: tc(V)
+            symbol: V
             kind: build
             tier: 1
         worker-type: aws-provisioner-v1/gecko-{level}-b-linux
         worker:
             docker-image: {in-tree: valgrind-build}
             max-run-time: 72000
         run:
             using: mozharness
--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -348,17 +348,17 @@ def validate(config, jobs):
 
 @transforms.add
 def make_task_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attributes = dep_job.attributes
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc(BM-S)')
+        treeherder.setdefault('symbol', 'BM-S')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
         label = job['label']
         description = (
--- a/taskcluster/taskgraph/transforms/beetmover_checksums.py
+++ b/taskcluster/taskgraph/transforms/beetmover_checksums.py
@@ -49,17 +49,17 @@ def validate(config, jobs):
 
 @transforms.add
 def make_beetmover_checksums_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attributes = dep_job.attributes
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc-BMcs(N)')
+        treeherder.setdefault('symbol', 'BMcs(N)')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         label = job['label']
@@ -86,17 +86,17 @@ def make_beetmover_checksums_description
         dependencies = {dependent_kind: dep_job.label}
         for k, v in dep_job.dependencies.items():
             if k.startswith('beetmover'):
                 dependencies[k] = v
 
         attributes = copy_attributes_from_dependent_job(dep_job)
 
         if dep_job.attributes.get('locale'):
-            treeherder['symbol'] = 'tc-BMcs({})'.format(dep_job.attributes.get('locale'))
+            treeherder['symbol'] = 'BMcs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
 
         bucket_scope = get_beetmover_bucket_scope(config)
         action_scope = get_beetmover_action_scope(config)
 
         task = {
             'label': label,
             'description': description,
--- a/taskcluster/taskgraph/transforms/beetmover_l10n.py
+++ b/taskcluster/taskgraph/transforms/beetmover_l10n.py
@@ -14,17 +14,17 @@ transforms = TransformSequence()
 
 
 @transforms.add
 def make_beetmover_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         for locale in dep_job.attributes.get('chunk_locales', []):
 
-            group = 'tc-BM-L10n'
+            group = 'BM-L10n'
 
             # add the locale code
             symbol = locale
 
             treeherder = {
                 'symbol': join_symbol(group, symbol),
             }
 
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -170,17 +170,17 @@ def validate(config, jobs):
 
 @transforms.add
 def make_task_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attributes = dep_job.attributes
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc(BM-R)')
+        treeherder.setdefault('symbol', 'BM-R')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
         label = job['label']
         description = (
--- a/taskcluster/taskgraph/transforms/beetmover_repackage_l10n.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage_l10n.py
@@ -18,17 +18,17 @@ def make_beetmover_description(config, j
     for job in jobs:
         dep_job = job['dependent-task']
 
         locale = dep_job.attributes.get('locale')
         if not locale:
             yield job
             continue
 
-        group = 'tc-BMR-L10n'
+        group = 'BMR-L10n'
 
         # add the locale code
         symbol = locale
 
         treeherder = {
             'symbol': join_symbol(group, symbol),
         }
 
--- a/taskcluster/taskgraph/transforms/checksums_signing.py
+++ b/taskcluster/taskgraph/transforms/checksums_signing.py
@@ -49,17 +49,17 @@ def validate(config, jobs):
 
 @transforms.add
 def make_checksums_signing_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attributes = dep_job.attributes
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc-cs(N)')
+        treeherder.setdefault('symbol', 'cs(N)')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         label = job['label']
@@ -71,17 +71,17 @@ def make_checksums_signing_description(c
                 build_type=attributes.get('build_type')
             )
         )
         dependencies = {"beetmover": dep_job.label}
 
         attributes = copy_attributes_from_dependent_job(dep_job)
 
         if dep_job.attributes.get('locale'):
-            treeherder['symbol'] = 'tc-cs({})'.format(dep_job.attributes.get('locale'))
+            treeherder['symbol'] = 'cs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
 
         upstream_artifacts = [{
             "taskId": {"task-reference": "<beetmover>"},
             "taskType": "beetmover",
             "paths": [
                 "public/target.checksums",
             ],
--- a/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
+++ b/taskcluster/taskgraph/transforms/nightly_l10n_signing.py
@@ -18,17 +18,17 @@ transforms = TransformSequence()
 def make_signing_description(config, jobs):
     for job in jobs:
         job['depname'] = 'unsigned-repack'
 
         dep_job = job['dependent-task']
 
         # add the chunk number to the TH symbol
         symbol = 'Ns{}'.format(dep_job.attributes.get('l10n_chunk'))
-        group = 'tc-L10n'
+        group = 'L10n'
 
         job['treeherder'] = {
             'symbol': join_symbol(group, symbol),
         }
 
         yield job
 
 
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -86,17 +86,17 @@ def make_job_description(config, jobs):
             raise NotImplementedError(
                 "Can't repackage a signing task with multiple dependencies")
         signing_dependencies = dep_job.dependencies
         # This is so we get the build task in our dependencies to
         # have better beetmover support.
         dependencies.update(signing_dependencies)
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc(Nr)')
+        treeherder.setdefault('symbol', 'Nr')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform', "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
         build_task = None
         signing_task = None
         for dependency in dependencies.keys():
--- a/taskcluster/taskgraph/transforms/repackage_l10n.py
+++ b/taskcluster/taskgraph/transforms/repackage_l10n.py
@@ -14,15 +14,15 @@ transforms = TransformSequence()
 
 @transforms.add
 def split_locales(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         for locale in dep_job.attributes.get('chunk_locales', []):
 
             treeherder = job.get('treeherder', {})
-            treeherder['symbol'] = 'tc-L10n-Rpk({})'.format(locale)
+            treeherder['symbol'] = 'L10n-Rpk({})'.format(locale)
 
             yield {
                 'locale': locale,
                 'treeherder': treeherder,
                 'dependent-task': dep_job,
             }
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -45,17 +45,17 @@ def validate(config, jobs):
 
 @transforms.add
 def make_repackage_signing_description(config, jobs):
     for job in jobs:
         dep_job = job['dependent-task']
         attributes = dep_job.attributes
 
         treeherder = job.get('treeherder', {})
-        treeherder.setdefault('symbol', 'tc-rs(N)')
+        treeherder.setdefault('symbol', 'rs(N)')
         dep_th_platform = dep_job.task.get('extra', {}).get(
             'treeherder', {}).get('machine', {}).get('platform', '')
         treeherder.setdefault('platform',
                               "{}/opt".format(dep_th_platform))
         treeherder.setdefault('tier', 1)
         treeherder.setdefault('kind', 'build')
 
         label = job['label']
@@ -74,17 +74,17 @@ def make_repackage_signing_description(c
         # This is so we get the build task etc in our dependencies to
         # have better beetmover support.
         dependencies.update(signing_dependencies)
         attributes = copy_attributes_from_dependent_job(dep_job)
         attributes['repackage_type'] = 'repackage-signing'
 
         locale_str = ""
         if dep_job.attributes.get('locale'):
-            treeherder['symbol'] = 'tc-rs({})'.format(dep_job.attributes.get('locale'))
+            treeherder['symbol'] = 'rs({})'.format(dep_job.attributes.get('locale'))
             attributes['locale'] = dep_job.attributes.get('locale')
             locale_str = "{}/".format(dep_job.attributes.get('locale'))
 
         build_platform = dep_job.attributes.get('build_platform')
         is_nightly = dep_job.attributes.get('nightly')
         signing_cert_scope = get_signing_cert_scope_per_platform(
             build_platform, is_nightly, config
         )
--- a/taskcluster/taskgraph/transforms/signing.py
+++ b/taskcluster/taskgraph/transforms/signing.py
@@ -154,9 +154,9 @@ def make_task_description(config, jobs):
 
 
 def _generate_treeherder_platform(dep_th_platform, build_platform, build_type):
     actual_build_type = 'pgo' if '-pgo' in build_platform else build_type
     return '{}/{}'.format(dep_th_platform, actual_build_type)
 
 
 def _generate_treeherder_symbol(is_nightly):
-    return 'tc(Ns)' if is_nightly else 'tc(Bs)'
+    return 'Ns' if is_nightly else 'Bs'
--- a/taskcluster/taskgraph/transforms/upload_symbols.py
+++ b/taskcluster/taskgraph/transforms/upload_symbols.py
@@ -39,17 +39,17 @@ def fill_template(config, tasks):
         treeherder = task.get('treeherder', {})
         th = dep.task.get('extra')['treeherder']
         treeherder.setdefault('platform',
                               "{}/{}".format(th['machine']['platform'],
                                              build_type))
         treeherder.setdefault('tier', th['tier'])
         treeherder.setdefault('kind', th['jobKind'])
         if dep.attributes.get('nightly'):
-            treeherder.setdefault('symbol', 'tc(SymN)')
+            treeherder.setdefault('symbol', 'SymN')
         else:
-            treeherder.setdefault('symbol', 'tc(Sym)')
+            treeherder.setdefault('symbol', 'Sym')
         task['treeherder'] = treeherder
 
         # clear out the stuff that's not part of a task description
         del task['dependent-task']
 
         yield task