Prevent uploading duplicated artifacts.

Packaging v2 was uploading artifacts twice.

Bug: https://github.com/flutter/flutter/issues/116822
Change-Id: I6424c9367291bb2349a8359e8dc3fe37285fe5be
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/37124
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Jesse Seales <jseales@google.com>
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
index 8135328..a9fbb92 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
index cc010bc..e68cf7d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
index 8135328..a9fbb92 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
index cc010bc..e68cf7d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
index 8135328..a9fbb92 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_staging.json
index cc010bc..e68cf7d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
index 8135328..a9fbb92 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_staging.json
index cc010bc..e68cf7d 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_flutter-release-test_upload_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_prod.json
index 981ee62..8ffa75a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_staging.json
index 16c851d..b011026 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_prod.json
index 981ee62..8ffa75a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_staging.json
index 16c851d..b011026 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_experimental_upload_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
index 981ee62..8ffa75a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_staging.json
index 16c851d..b011026 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
index 981ee62..8ffa75a 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_prod.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_staging.json
index 16c851d..b011026 100644
--- a/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/linux_refs_heads_master_upload_staging.json
@@ -877,165 +877,6 @@
     ]
   },
   {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/linux/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.tar.xz",
-      "[CLEANUP]/tmp_tmp_2/releases/master/linux/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/linux/experimental/flutter-archive-package.tar.xz (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "linux",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/linux/experimental/flutter-archive-package.tar.xz (2)",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
     "name": "$result"
   }
 ]
\ No newline at end of file
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_prod.json
index 625c674..c8e1032 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_staging.json
index 5217efa..c661803 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_prod.json
index 625c674..c8e1032 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_staging.json
index 5217efa..c661803 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_experimental_upload_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
index 625c674..c8e1032 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_staging.json
index 5217efa..c661803 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
index 625c674..c8e1032 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_staging.json
index 5217efa..c661803 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_beta_upload_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac"
+    "name": "Ensure releases/beta/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/releases_linux.json",
+    "name": "gsutil releases/beta/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/mac (2)"
+    "name": "Ensure releases/beta/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/beta/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/beta/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
index 7d046a3..3a7c398 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
index 50fb470..18d3a69 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
index 7d046a3..3a7c398 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
index 50fb470..18d3a69 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
index 7d046a3..3a7c398 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_staging.json
index 50fb470..18d3a69 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
index 7d046a3..3a7c398 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_staging.json
index 50fb470..18d3a69 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_flutter-release-test_upload_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/mac/experimental"
+    "name": "Ensure releases/flutter-release-test/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/flutter-release-test/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/flutter-release-test/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_prod.json
index 4626bed..7652edb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_staging.json
index 21aeeb5..d710565 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_prod.json
index 4626bed..7652edb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_staging.json
index 21aeeb5..d710565 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_experimental_upload_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
index 4626bed..7652edb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_staging.json
index 21aeeb5..d710565 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
index 4626bed..7652edb 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_prod.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_staging.json
index 21aeeb5..d710565 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_master_upload_staging.json
@@ -727,7 +727,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -767,7 +767,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/mac/experimental"
+    "name": "Ensure releases/master/macos/experimental"
   },
   {
     "cmd": [
@@ -778,7 +778,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_1/releases/master/mac/experimental"
+      "[CLEANUP]/tmp_tmp_1/releases/master/macos/experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -818,7 +818,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/macos/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -871,166 +871,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/mac/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/master/mac/experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/mac/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]/gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]/tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "darwin",
-      "PUB_CACHE": "[START_DIR]/.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]/flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[START_DIR]/flutter/bin",
-        "[START_DIR]/flutter/bin/cache/dart-sdk/bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/mac/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/macos/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_prod.json
index b6eb0ed..2abf5c4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_staging.json
index f18087a..4094dbd 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_prod.json
index b6eb0ed..2abf5c4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_staging.json
index f18087a..4094dbd 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_experimental_upload_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
index b6eb0ed..2abf5c4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_staging.json
index f18087a..4094dbd 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
index b6eb0ed..2abf5c4 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_prod.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_staging.json
index f18087a..4094dbd 100644
--- a/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/mac_refs_heads_stable_upload_staging.json
@@ -782,7 +782,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -822,7 +822,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac"
+    "name": "Ensure releases/stable/macos"
   },
   {
     "cmd": [
@@ -833,7 +833,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/releases_linux.json",
-      "[CLEANUP]/tmp_tmp_1/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_1/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -873,7 +873,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/releases_linux.json"
   },
   {
     "cmd": [
@@ -926,7 +926,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/releases_linux.json",
+    "name": "gsutil releases/stable/macos/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -941,7 +941,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -981,7 +981,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/mac (2)"
+    "name": "Ensure releases/stable/macos (2)"
   },
   {
     "cmd": [
@@ -992,7 +992,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]/archive/flutter-archive-package.zip",
-      "[CLEANUP]/tmp_tmp_2/releases/stable/mac"
+      "[CLEANUP]/tmp_tmp_2/releases/stable/macos"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1032,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/mac/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/macos/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1085,7 +1085,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/mac/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/macos/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_prod.json
index 06a94ac..c0d9b5c 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_staging.json
index 88ad559..169c637 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_prod.json
index 06a94ac..c0d9b5c 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_staging.json
index 88ad559..169c637 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_experimental_upload_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
index 06a94ac..c0d9b5c 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_staging.json
index 88ad559..169c637 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
index 06a94ac..c0d9b5c 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_staging.json
index 88ad559..169c637 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_beta_upload_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win"
+    "name": "Ensure releases/beta/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/releases_linux.json",
+    "name": "gsutil releases/beta/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/beta/win (2)"
+    "name": "Ensure releases/beta/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\beta\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/beta/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/beta/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/beta/win/flutter-archive-package.zip",
+    "name": "gsutil releases/beta/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_prod.json
index df92cc4..c046f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_staging.json
index 7dc1ed1..32efca0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
index df92cc4..c046f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
index 7dc1ed1..32efca0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_experimental_upload_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
index df92cc4..c046f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_staging.json
index 7dc1ed1..32efca0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
index df92cc4..c046f68 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_staging.json
index 7dc1ed1..32efca0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_flutter-release-test_upload_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/flutter-release-test/win/experimental"
+    "name": "Ensure releases/flutter-release-test/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\flutter-release-test\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/flutter-release-test/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\flutter-release-test\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/flutter-release-test/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/flutter-release-test/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_prod.json
index 3e80b3b..b576b1e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_staging.json
index 084e7e8..3f8e099 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_prod.json
index 3e80b3b..b576b1e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_staging.json
index 084e7e8..3f8e099 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_experimental_upload_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
index 3e80b3b..b576b1e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_staging.json
index 084e7e8..3f8e099 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
index 3e80b3b..b576b1e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_prod.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:prod"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_staging.json
index 084e7e8..3f8e099 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_master_upload_staging.json
@@ -794,7 +794,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -835,7 +835,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/master/win/experimental"
+    "name": "Ensure releases/master/windows/experimental"
   },
   {
     "cmd": [
@@ -846,7 +846,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\win\\experimental"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\master\\windows\\experimental"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -887,7 +887,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/master/windows/experimental/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -941,169 +941,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip",
-    "~followup_annotations": [
-      "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "ensure-directory",
-      "--mode",
-      "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Ensure releases/master/win/experimental (2)"
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\master\\win\\experimental"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "Copy gs://flutter_infra_release/releases/master/win/experimental/flutter-archive-package.zip (2)"
-  },
-  {
-    "cmd": [
-      "python3",
-      "-u",
-      "RECIPE_MODULE[depot_tools::gsutil]\\resources\\gsutil_smart_retry.py",
-      "--",
-      "RECIPE_REPO[depot_tools]\\gsutil.py",
-      "----",
-      "cp",
-      "-r",
-      "[CLEANUP]\\tmp_tmp_2/*",
-      "gs://flutter_infra_release/"
-    ],
-    "env": {
-      "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
-      "GIT_BRANCH": "",
-      "LUCI_BRANCH": "",
-      "LUCI_CI": "True",
-      "LUCI_PR": "",
-      "OS": "win",
-      "PUB_CACHE": "[START_DIR]\\.pub-cache",
-      "REVISION": "12345abcde12345abcde12345abcde12345abcde",
-      "SDK_CHECKOUT_PATH": "[START_DIR]\\flutter"
-    },
-    "env_prefixes": {
-      "PATH": [
-        "[CACHE]\\builder\\7za",
-        "[START_DIR]\\flutter\\bin",
-        "[START_DIR]\\flutter\\bin\\cache\\dart-sdk\\bin"
-      ]
-    },
-    "env_suffixes": {
-      "DEPOT_TOOLS_UPDATE": [
-        "0"
-      ],
-      "PATH": [
-        "RECIPE_REPO[depot_tools]"
-      ]
-    },
-    "infra_step": true,
-    "luci_context": {
-      "realm": {
-        "name": "project:staging"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "gsutil releases/master/win/experimental/flutter-archive-package.zip (2)",
+    "name": "gsutil releases/master/windows/experimental/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_prod.json
index de05089..a9beb2e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_staging.json
index 7086009..a7817f0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_prod.json
index de05089..a9beb2e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_staging.json
index 7086009..a7817f0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_experimental_upload_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
index de05089..a9beb2e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_staging.json
index 7086009..a7817f0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
index de05089..a9beb2e 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_prod.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_staging.json b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_staging.json
index 7086009..a7817f0 100644
--- a/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_staging.json
+++ b/recipes/packaging_v2/packaging_v2.expected/win_refs_heads_stable_upload_staging.json
@@ -850,7 +850,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -891,7 +891,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win"
+    "name": "Ensure releases/stable/windows"
   },
   {
     "cmd": [
@@ -902,7 +902,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\releases_linux.json",
-      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_1\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -943,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/releases_linux.json"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/releases_linux.json"
   },
   {
     "cmd": [
@@ -997,7 +997,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/releases_linux.json",
+    "name": "gsutil releases/stable/windows/releases_linux.json",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
@@ -1012,7 +1012,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1053,7 +1053,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Ensure releases/stable/win (2)"
+    "name": "Ensure releases/stable/windows (2)"
   },
   {
     "cmd": [
@@ -1064,7 +1064,7 @@
       "/path/to/tmp/json",
       "copy",
       "[START_DIR]\\archive\\flutter-archive-package.zip",
-      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\win"
+      "[CLEANUP]\\tmp_tmp_2\\releases\\stable\\windows"
     ],
     "env": {
       "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
@@ -1105,7 +1105,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "Copy gs://flutter_infra_release/releases/stable/win/flutter-archive-package.zip"
+    "name": "Copy gs://flutter_infra_release/releases/stable/windows/flutter-archive-package.zip"
   },
   {
     "cmd": [
@@ -1159,7 +1159,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "gsutil releases/stable/win/flutter-archive-package.zip",
+    "name": "gsutil releases/stable/windows/flutter-archive-package.zip",
     "~followup_annotations": [
       "@@@STEP_LINK@gsutil.upload@https://console.cloud.google.com/storage/browser/flutter_infra_release/@@@"
     ]
diff --git a/recipes/packaging_v2/packaging_v2.py b/recipes/packaging_v2/packaging_v2.py
index ba5d1d9..4d9cab0 100644
--- a/recipes/packaging_v2/packaging_v2.py
+++ b/recipes/packaging_v2/packaging_v2.py
@@ -26,6 +26,12 @@
 
 PACKAGED_REF_RE = re.compile(r'^refs/heads/(.+)$')
 
+PLATFORMS_MAP = {
+    'win': 'windows',
+    'mac': 'macos',
+    'linux': 'linux'
+}
+
 
 @contextmanager
 def Install7za(api):
@@ -71,7 +77,8 @@
 
       flutter_pkg_absolute_path = GetFlutterPackageAbsolutePath(api, work_dir)
       file_name = api.path.basename(flutter_pkg_absolute_path)
-      dest_archive = '/%s/%s' % (branch, api.platform.name)
+      platform_name = PLATFORMS_MAP[api.platform.name]
+      dest_archive = '/%s/%s' % (branch, platform_name)
       dest_gs = 'gs://flutter_infra_release/releases%s' % dest_archive
       api.flutter_bcid.report_stage(BcidStage.UPLOAD.value)
       if branch in ('beta', 'stable'):
@@ -86,7 +93,6 @@
       else:
         # add experimental subpath if branch is not beta or stable
         pkg_gs_path = '%s/%s/%s' % (dest_gs, 'experimental', file_name)
-        api.archives.upload_artifact(flutter_pkg_absolute_path, pkg_gs_path)
       api.archives.upload_artifact(flutter_pkg_absolute_path, pkg_gs_path)
       api.flutter_bcid.upload_provenance(flutter_pkg_absolute_path, pkg_gs_path)
       api.flutter_bcid.report_stage(BcidStage.UPLOAD_COMPLETE.value)