diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d2500e2f794ca06bdbc6c06b21ce39001b57973..f5bf5790e4b7daf02f4713d25b1017b494f88f1a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -866,7 +866,7 @@ jobs:
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
         if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
         with:
-          name: ZedEditorUserSetup-x64-${{ github.event.pull_request.head.sha || github.sha }}.exe
+          name: Zed_${{ github.event.pull_request.head.sha || github.sha }}-x86_64.exe
           path: ${{ env.SETUP_PATH }}
 
       - name: Upload Artifacts to release
diff --git a/crates/auto_update/src/auto_update.rs b/crates/auto_update/src/auto_update.rs
index 2d1ea7269e2ab102962faeae848d94a8c491d8f2..e16b82e6c74f29b62d3bd9e9ec2535d8bcf965f7 100644
--- a/crates/auto_update/src/auto_update.rs
+++ b/crates/auto_update/src/auto_update.rs
@@ -658,7 +658,7 @@ impl AutoUpdater {
         let filename = match OS {
             "macos" => anyhow::Ok("Zed.dmg"),
             "linux" => Ok("zed.tar.gz"),
-            "windows" => Ok("zed_editor_installer.exe"),
+            "windows" => Ok("Zed.exe"),
             unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
         }?;
 
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index 43023a9e141b77d7770b7ddae3e459cf7159c78e..f6f44307ff7c2be960b40cd837739d2657095ab2 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -172,7 +172,7 @@ function BuildInstaller {
             $appIconName = "app-icon"
             $appName = "Zed"
             $appDisplayName = "Zed"
-            $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION"
+            $appSetupName = "Zed-x86_64"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
             $appMutex = "Zed-Stable-Instance-Mutex"
             $appExeName = "Zed"
@@ -186,7 +186,7 @@ function BuildInstaller {
             $appIconName = "app-icon-preview"
             $appName = "Zed Preview"
             $appDisplayName = "Zed Preview"
-            $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-preview"
+            $appSetupName = "Zed-x86_64"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
             $appMutex = "Zed-Preview-Instance-Mutex"
             $appExeName = "Zed"
@@ -200,7 +200,7 @@ function BuildInstaller {
             $appIconName = "app-icon-nightly"
             $appName = "Zed Nightly"
             $appDisplayName = "Zed Nightly"
-            $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-nightly"
+            $appSetupName = "Zed-x86_64"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
             $appMutex = "Zed-Nightly-Instance-Mutex"
             $appExeName = "Zed"
@@ -214,7 +214,7 @@ function BuildInstaller {
             $appIconName = "app-icon-dev"
             $appName = "Zed Dev"
             $appDisplayName = "Zed Dev"
-            $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-dev"
+            $appSetupName = "Zed-x86_64"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
             $appMutex = "Zed-Dev-Instance-Mutex"
             $appExeName = "Zed"
diff --git a/script/upload-nightly.ps1 b/script/upload-nightly.ps1
index 7fa453c806b91369851c20042c5131a30ccf77a7..94f00ae9084a991669201281bdcd6110521fb50a 100644
--- a/script/upload-nightly.ps1
+++ b/script/upload-nightly.ps1
@@ -46,7 +46,7 @@ $sha | Out-File -FilePath "target/latest-sha" -NoNewline
 
 switch ($target) {
     "windows" {
-        UploadToBlobStore -BucketName $bucketName -FileToUpload $env:SETUP_PATH -BlobStoreKey "nightly/zed_editor_installer_x86_64.exe"
+        UploadToBlobStore -BucketName $bucketName -FileToUpload $env:SETUP_PATH -BlobStoreKey "nightly/Zed-x86_64.exe"
         UploadToBlobStore -BucketName $bucketName -FileToUpload "target/latest-sha" -BlobStoreKey "nightly/latest-sha-windows"
 
         Remove-Item -Path $env:SETUP_PATH -ErrorAction SilentlyContinue