--- a/testing/taskcluster/tasks/builds/base_linux32.yml
+++ b/testing/taskcluster/tasks/builds/base_linux32.yml
@@ -1,18 +1,18 @@
 $inherits:
   from: 'tasks/builds/firefox_base.yml'
   variables:
-    build_name: 'linux32'
+    build_name: 'linux'
 task:
   #workerType: ..
 
   routes:
-    - 'index.buildbot.branches.{{project}}.linux32'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux32'
+    - 'index.buildbot.branches.{{project}}.linux'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux'
 
   scopes:
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux32-workspace'
 
   payload:
     cache:

--- a/testing/taskcluster/tasks/builds/dbg_linux32.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux32.yml
@@ -1,17 +1,17 @@
 $inherits:
   from: 'tasks/builds/base_linux32.yml'
   variables:
-    build_name: 'linux32'
-    build_type: 'dbg'
+    build_name: 'linux'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux32 Dbg'
-      description: 'Linux32 Dbg'
+      name: '[TC] Linux32 Debug'
+      description: 'Linux32 Debug'
 
   workerType: dbg-linux32
 
   payload:
     env:
       MH_CUSTOM_BUILD_VARIANT_CFG: 'debug'
 
   extra:

--- a/testing/taskcluster/tasks/builds/dbg_linux64-asan.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux64-asan.yml
@@ -1,17 +1,17 @@
 $inherits:
   from: 'tasks/builds/base_linux64.yml'
   variables:
     build_name: 'linux64-asan'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux64 ASan Dbg'
-      description: 'Linux64 ASan Dbg'
+      name: '[TC] Linux64 ASan Debug'
+      description: 'Linux64 ASan Debug'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-asan'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-asan'
 
   workerType: dbg-linux64
 
   payload:

--- a/testing/taskcluster/tasks/builds/dbg_linux64.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux64.yml
@@ -1,17 +1,17 @@
 $inherits:
   from: 'tasks/builds/base_linux64.yml'
   variables:
     build_name: 'linux64'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] Linux64 Dbg'
-      description: 'Linux64 Dbg'
+      name: '[TC] Linux64 Debug'
+      description: 'Linux64 Debug'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-debug'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux64-debug'
 
   workerType: dbg-linux64
 
   payload:

--- a/testing/taskcluster/tasks/builds/dbg_macosx64.yml
+++ b/testing/taskcluster/tasks/builds/dbg_macosx64.yml
@@ -1,17 +1,17 @@
 $inherits:
   from: 'tasks/builds/base_macosx64.yml'
   variables:
     build_name: 'macosx64'
-    build_type: 'dbg'
+    build_type: 'debug'
 task:
   metadata:
-      name: '[TC] MacOSX64 Dbg'
-      description: 'MacOSX64 Dbg'
+      name: '[TC] MacOSX64 Debug'
+      description: 'MacOSX64 Debug'
 
   workerType: dbg-macosx64
 
   payload:
     env:
       MH_CUSTOM_BUILD_VARIANT_CFG: 'cross-debug'
   extra:
     treeherder:

--- a/testing/taskcluster/tasks/builds/opt_linux32.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux32.yml
@@ -1,12 +1,12 @@
 $inherits:
   from: 'tasks/builds/base_linux32.yml'
   variables:
-    build_name: 'linux32'
+    build_name: 'linux'
     build_type: 'opt'
 task:
   metadata:
       name: '[TC] Linux32 Opt'
       description: 'Linux32 Opt'
 
   workerType: opt-linux32