--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -11,17 +11,17 @@ win32/debug:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win32_debug.py
+            - builds/taskcluster_firefox_windows_32_debug.py
 
 win32/opt:
     description: "Win32 Opt"
     index:
         product: firefox
         job-name:
             gecko-v2: win32-opt
     treeherder:
@@ -31,17 +31,17 @@ win32/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win32_opt.py
+            - builds/taskcluster_firefox_windows_32_opt.py
 
 win32/pgo:
     description: "Win32 Opt PGO"
     index:
         product: firefox
         job-name:
             gecko-v2: win32-pgo
     treeherder:
@@ -52,17 +52,17 @@ win32/pgo:
     worker:
         implementation: generic-worker
         max-run-time: 9000
     run:
         using: mozharness
         options: [enable-pgo]
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win32_opt.py
+            - builds/taskcluster_firefox_windows_32_opt.py
 
 win64/debug:
     description: "Win64 Debug"
     index:
         product: firefox
         job-name:
             gecko-v2: win64-debug
     treeherder:
@@ -72,17 +72,17 @@ win64/debug:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win64_debug.py
+            - builds/taskcluster_firefox_windows_64_debug.py
 
 win64/opt:
     description: "Win64 Opt"
     index:
         product: firefox
         job-name:
             gecko-v2: win64-opt
     treeherder:
@@ -92,17 +92,17 @@ win64/opt:
     worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
     worker:
         implementation: generic-worker
         max-run-time: 7200
     run:
         using: mozharness
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win64_opt.py
+            - builds/taskcluster_firefox_windows_64_opt.py
 
 win64/pgo:
     description: "Win64 Opt PGO"
     index:
         product: firefox
         job-name:
             gecko-v2: win64-pgo
     treeherder:
@@ -113,10 +113,10 @@ win64/pgo:
     worker:
         implementation: generic-worker
         max-run-time: 10800
     run:
         using: mozharness
         options: [enable-pgo]
         script: mozharness/scripts/fx_desktop_build.py
         config:
-            - builds/taskcluster_firefox_win64_opt.py
+            - builds/taskcluster_firefox_windows_64_opt.py
 

rename from testing/mozharness/configs/builds/taskcluster_firefox_win32_debug.py
rename to testing/mozharness/configs/builds/taskcluster_firefox_windows_32_debug.py

rename from testing/mozharness/configs/builds/taskcluster_firefox_win32_opt.py
rename to testing/mozharness/configs/builds/taskcluster_firefox_windows_32_opt.py

rename from testing/mozharness/configs/builds/taskcluster_firefox_win64_debug.py
rename to testing/mozharness/configs/builds/taskcluster_firefox_windows_64_debug.py

rename from testing/mozharness/configs/builds/taskcluster_firefox_win64_opt.py
rename to testing/mozharness/configs/builds/taskcluster_firefox_windows_64_opt.py