diff --git a/crates/explorer_command_injector/AppxManifest-Nightly.xml b/crates/explorer_command_injector/AppxManifest-Nightly.xml
index 31d2d8f782..32c33d2b0c 100644
--- a/crates/explorer_command_injector/AppxManifest-Nightly.xml
+++ b/crates/explorer_command_injector/AppxManifest-Nightly.xml
@@ -18,7 +18,7 @@
     Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
     Version="1.0.0.0" />
   <Properties>
-    <DisplayName>Zed Editor Nightly</DisplayName>
+    <DisplayName>Zed Nightly</DisplayName>
     <PublisherDisplayName>Zed Industries</PublisherDisplayName>
     <!-- TODO: Use actual icon here. -->
     <Logo>resources\logo_150x150.png</Logo>
@@ -45,8 +45,8 @@
     <!-- TODO: Use actual icon here. -->
       <uap:VisualElements
         AppListEntry="none"
-        DisplayName="Zed Editor Nightly"
-        Description="Zed Editor Nightly explorer command injector"
+        DisplayName="Zed Nightly"
+        Description="Zed Nightly explorer command injector"
         BackgroundColor="transparent"
         Square150x150Logo="resources\logo_150x150.png"
         Square44x44Logo="resources\logo_70x70.png">
@@ -67,7 +67,7 @@
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed Editor Nightly">
+            <com:SurrogateServer DisplayName="Zed Nightly">
               <com:Class Id="266f2cfe-1653-42af-b55c-fe3590c83871" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
diff --git a/crates/explorer_command_injector/AppxManifest-Preview.xml b/crates/explorer_command_injector/AppxManifest-Preview.xml
index 44c967f5e2..2904653fb2 100644
--- a/crates/explorer_command_injector/AppxManifest-Preview.xml
+++ b/crates/explorer_command_injector/AppxManifest-Preview.xml
@@ -18,7 +18,7 @@
     Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
     Version="1.0.0.0" />
   <Properties>
-    <DisplayName>Zed Editor Preview</DisplayName>
+    <DisplayName>Zed Preview</DisplayName>
     <PublisherDisplayName>Zed Industries</PublisherDisplayName>
     <!-- TODO: Use actual icon here. -->
     <Logo>resources\logo_150x150.png</Logo>
@@ -45,8 +45,8 @@
     <!-- TODO: Use actual icon here. -->
       <uap:VisualElements
         AppListEntry="none"
-        DisplayName="Zed Editor Preview"
-        Description="Zed Editor Preview explorer command injector"
+        DisplayName="Zed Preview"
+        Description="Zed Preview explorer command injector"
         BackgroundColor="transparent"
         Square150x150Logo="resources\logo_150x150.png"
         Square44x44Logo="resources\logo_70x70.png">
@@ -67,7 +67,7 @@
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed Editor Preview">
+            <com:SurrogateServer DisplayName="Zed Preview">
               <com:Class Id="af8e85ea-fb20-4db2-93cf-56513c1ec697" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
diff --git a/crates/explorer_command_injector/AppxManifest.xml b/crates/explorer_command_injector/AppxManifest.xml
index 0f0e2c68cf..adf563fbc0 100644
--- a/crates/explorer_command_injector/AppxManifest.xml
+++ b/crates/explorer_command_injector/AppxManifest.xml
@@ -18,7 +18,7 @@
     Publisher="CN=Zed Industries Inc, O=Zed Industries Inc, L=Denver, S=Colorado, C=US"
     Version="1.0.0.0" />
   <Properties>
-    <DisplayName>Zed Editor</DisplayName>
+    <DisplayName>Zed</DisplayName>
 
     <PublisherDisplayName>Zed Industries</PublisherDisplayName>
     <!-- TODO: Use actual icon here. -->
@@ -46,8 +46,8 @@
     <!-- TODO: Use actual icon here. -->
       <uap:VisualElements
         AppListEntry="none"
-        DisplayName="Zed Editor"
-        Description="Zed Editor explorer command injector"
+        DisplayName="Zed"
+        Description="Zed explorer command injector"
         BackgroundColor="transparent"
         Square150x150Logo="resources\logo_150x150.png"
         Square44x44Logo="resources\logo_70x70.png">
@@ -68,7 +68,7 @@
         </desktop4:Extension>
         <com:Extension Category="windows.comServer">
           <com:ComServer>
-            <com:SurrogateServer DisplayName="Zed Editor">
+            <com:SurrogateServer DisplayName="Zed">
               <com:Class Id="6a1f6b13-3b82-48a1-9e06-7bb0a6d0bffd" Path="zed_explorer_command_injector.dll" ThreadingModel="STA"/>
             </com:SurrogateServer>
           </com:ComServer>
diff --git a/script/bundle-windows.ps1 b/script/bundle-windows.ps1
index dc0bdb9b7d..6eaf98cd23 100644
--- a/script/bundle-windows.ps1
+++ b/script/bundle-windows.ps1
@@ -126,41 +126,41 @@ function BuildInstaller {
         "stable" {
             $appId = "{{2DB0DA96-CA55-49BB-AF4F-64AF36A86712}"
             $appIconName = "app-icon"
-            $appName = "Zed Editor"
-            $appDisplayName = "Zed Editor"
+            $appName = "Zed"
+            $appDisplayName = "Zed"
             $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Editor-Stable-Instance-Mutex"
+            $appMutex = "Zed-Stable-Instance-Mutex"
             $appExeName = "Zed"
-            $regValueName = "ZedEditor"
+            $regValueName = "Zed"
             $appUserId = "ZedIndustries.Zed"
-            $appShellNameShort = "Z&ed Editor"
+            $appShellNameShort = "Z&ed"
             $appAppxFullName = "ZedIndustries.Zed_1.0.0.0_neutral__japxn1gcva8rg"
         }
         "preview" {
             $appId = "{{F70E4811-D0E2-4D88-AC99-D63752799F95}"
             $appIconName = "app-icon-preview"
-            $appName = "Zed Editor Preview"
-            $appDisplayName = "Zed Editor Preview"
+            $appName = "Zed Preview"
+            $appDisplayName = "Zed Preview"
             $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-preview"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Editor-Preview-Instance-Mutex"
+            $appMutex = "Zed-Preview-Instance-Mutex"
             $appExeName = "Zed"
-            $regValueName = "ZedEditorPreview"
+            $regValueName = "ZedPreview"
             $appUserId = "ZedIndustries.Zed.Preview"
-            $appShellNameShort = "Z&ed Editor Preview"
+            $appShellNameShort = "Z&ed Preview"
             $appAppxFullName = "ZedIndustries.Zed.Preview_1.0.0.0_neutral__japxn1gcva8rg"
         }
         "nightly" {
             $appId = "{{1BDB21D3-14E7-433C-843C-9C97382B2FE0}"
             $appIconName = "app-icon-nightly"
-            $appName = "Zed Editor Nightly"
-            $appDisplayName = "Zed Editor Nightly"
+            $appName = "Zed Nightly"
+            $appDisplayName = "Zed Nightly"
             $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-nightly"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Editor-Nightly-Instance-Mutex"
+            $appMutex = "Zed-Nightly-Instance-Mutex"
             $appExeName = "Zed"
-            $regValueName = "ZedEditorNightly"
+            $regValueName = "ZedNightly"
             $appUserId = "ZedIndustries.Zed.Nightly"
             $appShellNameShort = "Z&ed Editor Nightly"
             $appAppxFullName = "ZedIndustries.Zed.Nightly_1.0.0.0_neutral__japxn1gcva8rg"
@@ -168,15 +168,15 @@ function BuildInstaller {
         "dev" {
             $appId = "{{8357632E-24A4-4F32-BA97-E575B4D1FE5D}"
             $appIconName = "app-icon-nightly"
-            $appName = "Zed Editor Dev"
-            $appDisplayName = "Zed Editor Dev"
+            $appName = "Zed Dev"
+            $appDisplayName = "Zed Dev"
             $appSetupName = "ZedEditorUserSetup-x64-$env:RELEASE_VERSION-dev"
             # The mutex name here should match the mutex name in crates\zed\src\zed\windows_only_instance.rs
-            $appMutex = "Zed-Editor-Dev-Instance-Mutex"
+            $appMutex = "Zed-Dev-Instance-Mutex"
             $appExeName = "Zed"
-            $regValueName = "ZedEditorDev"
+            $regValueName = "ZedDev"
             $appUserId = "ZedIndustries.Zed.Dev"
-            $appShellNameShort = "Z&ed Editor Dev"
+            $appShellNameShort = "Z&ed Dev"
             $appAppxFullName = "ZedIndustries.Zed.Dev_1.0.0.0_neutral__japxn1gcva8rg"
         }
         default {