--- a/browser/config/mozconfigs/win64-aarch64/debug
+++ b/browser/config/mozconfigs/win64-aarch64/debug
@@ -19,9 +19,11 @@ export MOZ_TELEMETRY_REPORTING=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . $topsrcdir/build/win64-aarch64/mozconfig.vs-latest
 
+unset ENABLE_CLANG_PLUGIN
+
 . "$topsrcdir/build/mozconfig.common.override"

deleted file mode 100644
--- a/browser/config/mozconfigs/win64-aarch64/debug-msvc
+++ /dev/null
@@ -1,3 +0,0 @@
-. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/debug"
-
-unset ENABLE_CLANG_PLUGIN

--- a/browser/locales/l10n-changesets.json
+++ b/browser/locales/l10n-changesets.json
@@ -5,900 +5,900 @@
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "af": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "an": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ar": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "as": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ast": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "az": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "be": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "bg": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "bn-BD": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "bn-IN": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "br": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "bs": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ca": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "cak": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "crh": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "cs": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "cy": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "da": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "de": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "dsb": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "el": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "en-CA": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "en-GB": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "en-ZA": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "eo": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "es-AR": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "es-CL": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "es-ES": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "es-MX": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "et": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "eu": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "fa": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ff": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "fi": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "fr": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "fy-NL": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ga-IE": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "gd": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "gl": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "gn": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "gu-IN": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "he": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "hi-IN": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "hr": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "hsb": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "hu": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "hy-AM": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ia": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "id": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "is": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "it": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ja": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ja-JP-mac": {
         "platforms": [
             "macosx64",
             "macosx64-devedition"
@@ -911,865 +911,865 @@
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "kab": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "kk": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "km": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "kn": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ko": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "lij": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "lo": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "lt": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ltg": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "lv": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "mai": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "mk": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ml": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "mr": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ms": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "my": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "nb-NO": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ne-NP": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "nl": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "nn-NO": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "oc": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "or": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "pa-IN": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "pl": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "pt-BR": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "pt-PT": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "rm": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ro": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ru": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "si": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "sk": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "sl": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "son": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "sq": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "sr": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "sv-SE": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ta": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "te": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "th": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "tl": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "tr": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "trs": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "uk": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ur": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "uz": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "vi": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "wo": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "xh": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "zh-CN": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "zh-TW": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     }
 }

--- a/browser/locales/l10n-onchange-changesets.json
+++ b/browser/locales/l10n-onchange-changesets.json
@@ -5,67 +5,67 @@
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "he": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "it": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "macosx64",
             "macosx64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ja": {
         "platforms": [
             "linux",
             "linux-devedition",
             "linux64",
             "linux64-devedition",
             "win32",
             "win32-devedition",
             "win64",
-            "win64-aarch64-msvc",
-            "win64-aarch64-msvc-devedition",
+            "win64-aarch64",
+            "win64-aarch64-devedition",
             "win64-devedition"
         ],
         "revision": "default"
     },
     "ja-JP-mac": {
         "platforms": [
             "macosx64",
             "macosx64-devedition"

--- a/taskcluster/ci/beetmover-geckoview/kind.yml
+++ b/taskcluster/ci/beetmover-geckoview/kind.yml
@@ -16,17 +16,17 @@ only-for-attributes:
    - nightly
 
 not-for-build-platforms:
    - linux-nightly/opt
    - linux64-nightly/opt
    - macosx64-nightly/opt
    - win32-nightly/opt
    - win64-nightly/opt
-   - win64-aarch64-msvc-nightly/opt
+   - win64-aarch64-nightly/opt
    - linux-devedition-nightly/opt
    - linux64-devedition-nightly/opt
    - macosx64-devedition-nightly/opt
    - win32-devedition-nightly/opt
    - win64-devedition-nightly/opt
    - linux64-asan-reporter-nightly/opt
    - win64-asan-reporter-nightly/opt
 

--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ b/taskcluster/ci/beetmover-l10n/kind.yml
@@ -17,17 +17,17 @@ only-for-attributes:
     - nightly
 
 not-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux-devedition-nightly/opt
     - linux64-devedition-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
 
 job-template:
     shipping-phase: promote

--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -32,17 +32,17 @@ primary-dependency:
     - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux-devedition-nightly/opt
     - linux64-devedition-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - win64-asan-reporter-nightly/opt
 

--- a/taskcluster/ci/beetmover/kind.yml
+++ b/taskcluster/ci/beetmover/kind.yml
@@ -16,17 +16,17 @@ only-for-attributes:
     - nightly
 
 not-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux-devedition-nightly/opt
     - linux64-devedition-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - win64-asan-reporter-nightly/opt
 

--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1066,70 +1066,70 @@ win64-msvc/opt:
         mozconfig-variant: opt-msvc
     toolchains:
         - win64-clang-cl
         - win64-rust
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
-win64-aarch64-msvc/debug:
-    description: "AArch64 Win64 MSVC Debug"
+win64-aarch64/debug:
+    description: "AArch64 Win64 Debug"
     index:
         product: firefox
-        job-name: win64-aarch64-msvc-debug
+        job-name: win64-aarch64-debug
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-aarch64/debug
-        symbol: Bmsvc
+        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/aarch64.manifest"
-            PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
+            PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         using: mozharness
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
             - builds/taskcluster_sub_win64/debug.py
         extra-config:
             mozconfig_platform: win64-aarch64
-        mozconfig-variant: debug-msvc
+        mozconfig-variant: debug
     run-on-projects: ['mozilla-central', 'trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-aarch64-rust-nightly
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
-win64-aarch64-msvc/opt:
-    description: "AArch64 Win64 MSVC Opt"
+win64-aarch64/opt:
+    description: "AArch64 Win64 Opt"
     index:
         product: firefox
-        job-name: win64-aarch64-msvc-opt
+        job-name: win64-aarch64-opt
     attributes:
         enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-aarch64/opt
-        symbol: Bmsvc
+        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/aarch64.manifest"
-            PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
+            PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         using: mozharness
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
@@ -1139,36 +1139,36 @@ win64-aarch64-msvc/opt:
     run-on-projects: ['mozilla-central', 'trunk', 'try']
     toolchains:
         - win64-clang-cl
         - win64-aarch64-rust-nightly
         - win64-cbindgen
         - win64-sccache
         - win64-node
 
-win64-aarch64-msvc-nightly/opt:
-    description: "AArch64 Win64 MSVC Nightly"
+win64-aarch64-nightly/opt:
+    description: "AArch64 Win64 Nightly"
     index:
         product: firefox
-        job-name: win64-aarch64-msvc-opt
+        job-name: win64-aarch64-opt
         type: nightly
     attributes:
         nightly: true
         enable-full-crashsymbols: true
     shipping-product: firefox
     treeherder:
         platform: windows2012-aarch64/opt
         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/aarch64.manifest"
-            PERFHERDER_EXTRA_OPTIONS: msvc-aarch64
+            PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         using: mozharness
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py

--- a/taskcluster/ci/mar-signing-l10n/kind.yml
+++ b/taskcluster/ci/mar-signing-l10n/kind.yml
@@ -19,16 +19,16 @@ only-for-build-platforms:
     - linux64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-nightly/opt
     - win32-devedition-nightly/opt
     - win64-nightly/opt
     - win64-devedition-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
 
 job-template:
     shipping-phase: promote
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:
         - mar-signing

--- a/taskcluster/ci/mar-signing/kind.yml
+++ b/taskcluster/ci/mar-signing/kind.yml
@@ -19,17 +19,17 @@ only-for-build-platforms:
     - linux64-devedition-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-nightly/opt
     - win32-devedition-nightly/opt
     - win64-nightly/opt
     - win64-devedition-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux64-asan-reporter-nightly/opt
     - win64-asan-reporter-nightly/opt
 
 job-template:
     shipping-phase: promote
     treeherder-group: ms
     description-suffix: 'mar signing'
     required_signoffs:

--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -23,17 +23,17 @@ primary-dependency: build
 
 only-for-build-platforms:
     - linux64-nightly/opt
     - linux-nightly/opt
     - android-api-16-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux64-devedition-nightly/opt
     - linux-devedition-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
 
 job-template:
     description:
@@ -80,32 +80,32 @@ job-template:
             default: public
             android-api-16-nightly: internal
             macosx64-nightly: internal
             macosx64-devedition-nightly: internal
             win32-nightly: internal
             win32-devedition-nightly: internal
             win64-nightly: internal
             win64-devedition-nightly: internal
-            win64-aarch64-msvc-nightly: internal
+            win64-aarch64-nightly: internal
     index:
         type: nightly-l10n
         product:
             by-build-platform:
                 default: firefox
                 .*-devedition-.*: devedition
                 android-api-16-nightly: mobile
         job-name:
             by-build-platform:
                 linux-nightly: linux-opt
                 linux64-nightly: linux64-opt
                 macosx64-nightly: macosx64-opt
                 win32-nightly: win32-opt
                 win64-nightly: win64-opt
-                win64-aarch64-msvc-nightly: win64-aarch64-msvc-opt
+                win64-aarch64-nightly: win64-aarch64-opt
                 linux-devedition-nightly: linux-devedition-opt
                 linux64-devedition-nightly: linux64-devedition-opt
                 macosx64-devedition-nightly: macosx64-devedition-opt
                 win32-devedition-nightly: win32-devedition-opt
                 win64-devedition-nightly: win64-devedition-opt
                 android-api-16-nightly: android-api-16-opt
     worker-type:
         by-build-platform:
@@ -120,17 +120,17 @@ job-template:
                 android-api-16-nightly: 2
         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
-                win64-aarch64-msvc-nightly: windows2012-aarch64/opt
+                win64-aarch64-nightly: windows2012-aarch64/opt
                 linux64-devedition-nightly: linux64-devedition/opt
                 linux-devedition-nightly: linux32-devedition/opt
                 macosx64-devedition-nightly: osx-cross-devedition/opt
                 win32-devedition-nightly: windows2012-32-devedition/opt
                 win64-devedition-nightly: windows2012-64-devedition/opt
                 android-api-16-nightly: android-4-0-armv7-api16/opt
     env:
         by-build-platform:
@@ -180,17 +180,17 @@ job-template:
                     - single_locale/tc_win32.py
                     - taskcluster_nightly.py
                 win64-nightly:
                     - single_locale/firefox.py
                     - single_locale/win64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                     - taskcluster_nightly.py
-                win64-aarch64-msvc-nightly:
+                win64-aarch64-nightly:
                     - single_locale/firefox.py
                     - single_locale/win64-aarch64.py
                     - single_locale/tc_common.py
                     - single_locale/tc_win64.py
                     - taskcluster_nightly.py
                 linux-devedition-nightly:
                     - single_locale/devedition.py
                     - single_locale/linux32.py

--- a/taskcluster/ci/partials/kind.yml
+++ b/taskcluster/ci/partials/kind.yml
@@ -18,17 +18,17 @@ only-for-attributes:
 
 only-for-build-platforms:
    - macosx64-nightly/opt
    - macosx64-devedition-nightly/opt
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
-   - win64-aarch64-msvc-nightly/opt
+   - win64-aarch64-nightly/opt
    - linux-nightly/opt
    - linux-devedition-nightly/opt
    - linux64-nightly/opt
    - linux64-devedition-nightly/opt
    - linux64-asan-reporter-nightly/opt
    - win64-asan-reporter-nightly/opt
 
 job-template:

--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -17,17 +17,17 @@ kind-dependencies:
     - toolchain
 
 only-for-build-platforms:
     - linux-nightly/opt
     - linux64-nightly/opt
     - macosx64-nightly/opt
     - win32-nightly/opt
     - win64-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - linux-devedition-nightly/opt
     - linux64-devedition-nightly/opt
     - macosx64-devedition-nightly/opt
     - win32-devedition-nightly/opt
     - win64-devedition-nightly/opt
 
 job-template:
     mozharness:

--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -15,10 +15,10 @@ kind-dependencies:
 
 only-for-build-platforms:
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
    - win64/opt
-   - win64-aarch64-msvc-nightly/opt
+   - win64-aarch64-nightly/opt
    - win64-asan-reporter-nightly/opt

--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -15,10 +15,10 @@ kind-dependencies:
 
 only-for-build-platforms:
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
    - win64-nightly/opt
    - win64-devedition-nightly/opt
    - win64/opt
-   - win64-aarch64-msvc-nightly/opt
+   - win64-aarch64-nightly/opt
    - win64-asan-reporter-nightly/opt

--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -27,17 +27,17 @@ only-for-build-platforms:
     - macosx64-nightly/opt
     - macosx64-devedition-nightly/opt
     - macosx64/opt
     - win32-nightly/opt
     - win32-devedition-nightly/opt
     - win32/opt
     - win64-nightly/opt
     - win64-devedition-nightly/opt
-    - win64-aarch64-msvc-nightly/opt
+    - win64-aarch64-nightly/opt
     - win64/opt
     - win64-asan-reporter-nightly/opt
 
 job-template:
     mozharness:
         config:
             by-build-platform:
                 linux\b.*:

--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -525,17 +525,17 @@ def target_tasks_nightly_win64(full_task
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
 
 
 @_target_task('nightly_win64_aarch64')
 def target_tasks_nightly_win64_aarch64(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a nightly build of win32 and win64.
     The nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""
-    filter = make_nightly_filter({'win64-aarch64-msvc-nightly'})
+    filter = make_nightly_filter({'win64-aarch64-nightly'})
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
 
 
 @_target_task('nightly_asan')
 def target_tasks_nightly_asan(full_task_graph, parameters, graph_config):
     """Select the set of tasks required for a nightly build of asan. The
     nightly build process involves a pipeline of builds, signing,
     and, eventually, uploading the tasks to balrog."""

--- a/taskcluster/taskgraph/transforms/beetmover.py
+++ b/taskcluster/taskgraph/transforms/beetmover.py
@@ -267,17 +267,16 @@ def generate_upstream_artifacts(job, sig
 
     return upstream_artifacts
 
 
 def craft_release_properties(config, job):
     params = config.params
     build_platform = job['attributes']['build_platform']
     build_platform = build_platform.replace('-nightly', '')
-    build_platform = build_platform.replace('-msvc', '')
     if build_platform.endswith("-source"):
         build_platform = build_platform.replace('-source', '-release')
 
     # XXX This should be explicitly set via build attributes or something
     if 'android' in job['label'] or 'fennec' in job['label']:
         app_name = 'Fennec'
     elif config.graph_config['trust-domain'] == 'comm':
         app_name = 'Thunderbird'

--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -87,33 +87,33 @@ UPSTREAM_ARTIFACT_UNSIGNED_PATHS = _comp
                     "host/bin/mbsdiff",
                 ]),
     r'^win64-asan-reporter-nightly$':
         filter(lambda a: a not in ('target.crashreporter-symbols.zip', 'target.jsshell.zip'),
                _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
                     "host/bin/mar.exe",
                     "host/bin/mbsdiff.exe",
                 ]),
-    r'^win(32|64(|-aarch64-msvc))(|-devedition)-nightly$':
+    r'^win(32|64(|-aarch64))(|-devedition)-nightly$':
         _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_EN_US + [
             'host/bin/mar.exe',
             'host/bin/mbsdiff.exe',
         ],
     r'^(linux(|64)|macosx64|win(32|64))(|-devedition)-nightly-l10n$':
         _DESKTOP_UPSTREAM_ARTIFACTS_UNSIGNED_L10N,
 })
 
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
 UPSTREAM_ARTIFACT_SIGNED_PATHS = _compile_regex_mapping({
     r'^linux(|64)(|-devedition|-asan-reporter)-nightly(|-l10n)$':
         ['target.tar.bz2', 'target.tar.bz2.asc'],
-    r'^win(32|64)(|-aarch64-msvc)(|-devedition|-asan-reporter)-nightly(|-l10n)$': ['target.zip'],
+    r'^win(32|64)(|-aarch64)(|-devedition|-asan-reporter)-nightly(|-l10n)$': ['target.zip'],
 })
 
 # Until bug 1331141 is fixed, if you are adding any new artifacts here that
 # need to be transfered to S3, please be aware you also need to follow-up
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
 UPSTREAM_ARTIFACT_REPACKAGE_PATHS = [
     'target.dmg',

--- a/taskcluster/taskgraph/util/partials.py
+++ b/taskcluster/taskgraph/util/partials.py
@@ -8,17 +8,17 @@ import requests
 import redo
 
 import logging
 logger = logging.getLogger(__name__)
 
 PLATFORM_RENAMES = {
     'windows2012-32': 'win32',
     'windows2012-64': 'win64',
-    'windows2012-aarch64': 'win64-aarch64-msvc',
+    'windows2012-aarch64': 'win64-aarch64',
     'osx-cross': 'macosx64',
 }
 
 BALROG_PLATFORM_MAP = {
     "linux": [
         "Linux_x86-gcc3"
     ],
     "linux32": [
@@ -43,17 +43,17 @@ BALROG_PLATFORM_MAP = {
     ],
     "win64": [
         "WINNT_x86_64-msvc",
         "WINNT_x86_64-msvc-x64"
     ],
     "win64-asan-reporter": [
         "WINNT_x86_64-msvc-x64-asan"
     ],
-    "win64-aarch64-msvc": [
+    "win64-aarch64": [
         "WINNT_aarch64-msvc-aarch64",
     ],
 }
 
 FTP_PLATFORM_MAP = {
     "Darwin_x86-gcc3": "mac",
     "Darwin_x86-gcc3-u-i386-x86_64": "mac",
     "Darwin_x86_64-gcc3": "mac",

--- a/testing/mozharness/configs/l10n_bumper/mozilla-beta.py
+++ b/testing/mozharness/configs/l10n_bumper/mozilla-beta.py
@@ -38,22 +38,22 @@ config = {
         "format": "json",
         "name": "Firefox l10n changesets",
         "revision_url": "https://l10n.mozilla.org/shipping/l10n-changesets?av=fx%(MAJOR_VERSION)s",
         "ignore_config": {
             "ja": ["macosx64", "macosx64-devedition"],
             "ja-JP-mac": [
                 "linux", "linux-devedition", "linux64", "linux64-devedition",
                 "win32", "win32-devedition", "win64", "win64-devedition",
-                "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
+                "win64-aarch64", "win64-aarch64-devedition",
             ],
         },
         "platform_configs": [{
             "platforms": [
                 "linux", "linux-devedition", "linux64", "linux64-devedition",
                 "macosx64", "macosx64-devedition", "win32", "win32-devedition",
-                "win64", "win64-devedition", "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
+                "win64", "win64-devedition", "win64-aarch64", "win64-aarch64-devedition",
             ],
             "path": "browser/locales/shipped-locales",
             "format": "shipped-locales",
         }],
     }],
 }

--- a/testing/mozharness/configs/l10n_bumper/mozilla-central.py
+++ b/testing/mozharness/configs/l10n_bumper/mozilla-central.py
@@ -39,21 +39,21 @@ config = {
         "path": "browser/locales/l10n-changesets.json",
         "format": "json",
         "name": "Firefox l10n changesets",
         "ignore_config": {
             "ja": ["macosx64", "macosx64-devedition"],
             "ja-JP-mac": [
                 "linux", "linux-devedition", "linux64", "linux64-devedition",
                 "win32", "win32-devedition", "win64", "win64-devedition",
-                "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
+                "win64-aarch64", "win64-aarch64-devedition",
             ],
         },
         "platform_configs": [{
             "platforms": [
                 "linux", "linux-devedition", "linux64", "linux64-devedition",
                 "macosx64", "macosx64-devedition", "win32", "win32-devedition",
-                "win64", "win64-devedition", "win64-aarch64-msvc", "win64-aarch64-msvc-devedition",
+                "win64", "win64-devedition", "win64-aarch64", "win64-aarch64-devedition",
             ],
             "path": "browser/locales/all-locales",
         }],
     }],
 }