diff --git a/crates/gpui2/src/styled.rs b/crates/gpui2/src/styled.rs
index 4a9a5d7ecf0c1fc18791dd5be596f4bfc488c7b4..a272ab95b14d7416e91d0bf166f2683e7941f02e 100644
--- a/crates/gpui2/src/styled.rs
+++ b/crates/gpui2/src/styled.rs
@@ -1,5 +1,5 @@
 use crate::{
-    self as gpui2, hsla, point, px, relative, rems, AlignItems, CursorStyle, DefiniteLength,
+    self as gpui, hsla, point, px, relative, rems, AlignItems, CursorStyle, DefiniteLength,
     Display, Fill, FlexDirection, Hsla, JustifyContent, Length, Position, Rems, SharedString,
     StyleRefinement, Visibility,
 };
diff --git a/crates/gpui2_macros/src/derive_component.rs b/crates/gpui2_macros/src/derive_component.rs
index a9467033101721082fb3c509251489605f945379..aaf814497aa9ac3963d3cef335a04383fc12f335 100644
--- a/crates/gpui2_macros/src/derive_component.rs
+++ b/crates/gpui2_macros/src/derive_component.rs
@@ -28,9 +28,9 @@ pub fn derive_component(input: TokenStream) -> TokenStream {
     let (_, ty_generics, _) = ast.generics.split_for_impl();
 
     let expanded = quote! {
-        impl #impl_generics gpui2::Component<#view_type> for #name #ty_generics #where_clause {
-            fn render(self) -> gpui2::AnyElement<#view_type> {
-                (move |view_state: &mut #view_type, cx: &mut gpui2::ViewContext<'_, #view_type>| self.render(view_state, cx))
+        impl #impl_generics gpui::Component<#view_type> for #name #ty_generics #where_clause {
+            fn render(self) -> gpui::AnyElement<#view_type> {
+                (move |view_state: &mut #view_type, cx: &mut gpui::ViewContext<'_, #view_type>| self.render(view_state, cx))
                     .render()
             }
         }
diff --git a/crates/gpui2_macros/src/style_helpers.rs b/crates/gpui2_macros/src/style_helpers.rs
index 9e47d85ef1267717eeb77143b75208d3c5940054..57aef03afa55276293d48f610458c5d29ddf9862 100644
--- a/crates/gpui2_macros/src/style_helpers.rs
+++ b/crates/gpui2_macros/src/style_helpers.rs
@@ -123,7 +123,7 @@ fn generate_predefined_setter(
         .iter()
         .map(|field_tokens| {
             quote! {
-                style.#field_tokens = Some((#negation_token gpui2::#length_tokens).into());
+                style.#field_tokens = Some((#negation_token gpui::#length_tokens).into());
             }
         })
         .collect::<Vec<_>>();
@@ -163,7 +163,7 @@ fn generate_custom_value_setter(
 
     let method = quote! {
         #[doc = #doc_string]
-        fn #method_name(mut self, length: impl std::clone::Clone + Into<gpui2::#length_type>) -> Self where Self: std::marker::Sized {
+        fn #method_name(mut self, length: impl std::clone::Clone + Into<gpui::#length_type>) -> Self where Self: std::marker::Sized {
             let style = self.style();
             #(#field_assignments)*
             self
diff --git a/crates/live_kit_client2/Cargo.toml b/crates/live_kit_client2/Cargo.toml
index 5adb71194806c450133e149bc9893e647f3ad74b..b606434b05d2e28171fe42839a7ff17e213028a5 100644
--- a/crates/live_kit_client2/Cargo.toml
+++ b/crates/live_kit_client2/Cargo.toml
@@ -16,14 +16,14 @@ name = "test_app"
 test-support = [
     "async-trait",
     "collections/test-support",
-    "gpui2/test-support",
+    "gpui/test-support",
     "live_kit_server",
     "nanoid",
 ]
 
 [dependencies]
 collections = { path = "../collections", optional = true }
-gpui2 = { package = "gpui2", path = "../gpui2", optional = true }
+gpui = { package = "gpui2", path = "../gpui2", optional = true }
 live_kit_server = { path = "../live_kit_server", optional = true }
 media = { path = "../media" }
 
@@ -41,7 +41,7 @@ nanoid = { version ="0.4", optional = true}
 
 [dev-dependencies]
 collections = { path = "../collections", features = ["test-support"] }
-gpui2 = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
+gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
 live_kit_server = { path = "../live_kit_server" }
 media = { path = "../media" }
 nanoid = "0.4"
diff --git a/crates/live_kit_client2/examples/test_app.rs b/crates/live_kit_client2/examples/test_app.rs
index 4062441a06b4e7bede19a3d57dc4835111996b29..98302eb35c049015cbfee131b5dbcf125b7f5956 100644
--- a/crates/live_kit_client2/examples/test_app.rs
+++ b/crates/live_kit_client2/examples/test_app.rs
@@ -1,7 +1,7 @@
 use std::{sync::Arc, time::Duration};
 
 use futures::StreamExt;
-use gpui2::KeyBinding;
+use gpui::KeyBinding;
 use live_kit_client2::{
     LocalAudioTrack, LocalVideoTrack, RemoteAudioTrackUpdate, RemoteVideoTrackUpdate, Room,
 };
@@ -16,7 +16,7 @@ struct Quit;
 fn main() {
     SimpleLogger::init(LevelFilter::Info, Default::default()).expect("could not initialize logger");
 
-    gpui2::App::production(Arc::new(())).run(|cx| {
+    gpui::App::production(Arc::new(())).run(|cx| {
         #[cfg(any(test, feature = "test-support"))]
         println!("USING TEST LIVEKIT");
 
@@ -173,6 +173,6 @@ fn main() {
     });
 }
 
-fn quit(_: &Quit, cx: &mut gpui2::AppContext) {
+fn quit(_: &Quit, cx: &mut gpui::AppContext) {
     cx.quit();
 }
diff --git a/crates/live_kit_client2/src/test.rs b/crates/live_kit_client2/src/test.rs
index 10c97e8d815b1798ed7711cfb33d7dc011635aef..6367e53ba857e979d834c048af06340fa1a8fc89 100644
--- a/crates/live_kit_client2/src/test.rs
+++ b/crates/live_kit_client2/src/test.rs
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Context, Result};
 use async_trait::async_trait;
 use collections::{BTreeMap, HashMap};
 use futures::Stream;
-use gpui2::BackgroundExecutor;
+use gpui::BackgroundExecutor;
 use live_kit_server::token;
 use media::core_video::CVImageBuffer;
 use parking_lot::Mutex;
diff --git a/crates/storybook2/Cargo.toml b/crates/storybook2/Cargo.toml
index 0f335ae9845e2cdbb370e45c3c201f6dc5ed5ea0..1f3a0b33cc2254671069d8e8c1f0fb0e453db9ae 100644
--- a/crates/storybook2/Cargo.toml
+++ b/crates/storybook2/Cargo.toml
@@ -14,7 +14,7 @@ anyhow.workspace = true
 backtrace-on-stack-overflow = "0.3.0"
 clap = { version = "4.4", features = ["derive", "string"] }
 chrono = "0.4"
-gpui2 = { path = "../gpui2" }
+gpui = { package = "gpui2", path = "../gpui2" }
 itertools = "0.11.0"
 log.workspace = true
 rust-embed.workspace = true
@@ -29,4 +29,4 @@ ui = { package = "ui2", path = "../ui2", features = ["stories"] }
 util = { path = "../util" }
 
 [dev-dependencies]
-gpui2 = { path = "../gpui2", features = ["test-support"] }
+gpui = { package = "gpui2", path = "../gpui2", features = ["test-support"] }
diff --git a/crates/storybook2/src/assets.rs b/crates/storybook2/src/assets.rs
index 3d4298454882409b394713a5a899052b4bdda706..9fc71917b45f7fa024a3e157f0a806d6056ef7f4 100644
--- a/crates/storybook2/src/assets.rs
+++ b/crates/storybook2/src/assets.rs
@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 
 use anyhow::{anyhow, Result};
-use gpui2::{AssetSource, SharedString};
+use gpui::{AssetSource, SharedString};
 use rust_embed::RustEmbed;
 
 #[derive(RustEmbed)]
diff --git a/crates/storybook2/src/stories/colors.rs b/crates/storybook2/src/stories/colors.rs
index c1c65d62fa16eca970fe72f286c39c6235d0d46e..13b7b36a8c67c1674f34d54a003a1b6d6788aeb9 100644
--- a/crates/storybook2/src/stories/colors.rs
+++ b/crates/storybook2/src/stories/colors.rs
@@ -1,5 +1,5 @@
 use crate::story::Story;
-use gpui2::{px, Div, Render};
+use gpui::{px, Div, Render};
 use theme2::{default_color_scales, ColorScaleStep};
 use ui::prelude::*;
 
@@ -20,7 +20,7 @@ impl Render for ColorsStory {
                     .flex_col()
                     .gap_1()
                     .overflow_y_scroll()
-                    .text_color(gpui2::white())
+                    .text_color(gpui::white())
                     .children(color_scales.into_iter().map(|scale| {
                         div()
                             .flex()
diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs
index aa71040b477abeddee443d851c1eaf1550ec3da1..16c03f87d5421af9d9336e462692102c4cb632bb 100644
--- a/crates/storybook2/src/stories/focus.rs
+++ b/crates/storybook2/src/stories/focus.rs
@@ -1,4 +1,4 @@
-use gpui2::{
+use gpui::{
     div, Div, FocusEnabled, Focusable, KeyBinding, ParentElement, Render, StatefulInteraction,
     StatelessInteractive, Styled, View, VisualContext, WindowContext,
 };
@@ -33,7 +33,7 @@ impl FocusStory {
 impl Render for FocusStory {
     type Element = Div<Self, StatefulInteraction<Self>, FocusEnabled<Self>>;
 
-    fn render(&mut self, cx: &mut gpui2::ViewContext<Self>) -> Self::Element {
+    fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> Self::Element {
         let theme = cx.theme();
         let color_1 = theme.styles.git.created;
         let color_2 = theme.styles.git.modified;
diff --git a/crates/storybook2/src/stories/kitchen_sink.rs b/crates/storybook2/src/stories/kitchen_sink.rs
index cf8277c4f451e0b3e9cf5d9b96781a0ce66d0085..54d6f2a3a967cc3f6e5a29be97e36291c45bdeff 100644
--- a/crates/storybook2/src/stories/kitchen_sink.rs
+++ b/crates/storybook2/src/stories/kitchen_sink.rs
@@ -1,5 +1,5 @@
 use crate::{story::Story, story_selector::ComponentStory};
-use gpui2::{Div, Render, StatefulInteraction, View, VisualContext};
+use gpui::{Div, Render, StatefulInteraction, View, VisualContext};
 use strum::IntoEnumIterator;
 use ui::prelude::*;
 
diff --git a/crates/storybook2/src/stories/scroll.rs b/crates/storybook2/src/stories/scroll.rs
index 9236629c341e5c1ffa5706e656c0bdbf9bcea09d..cdb48603e093f62e4ef5ee5968af068798e3bce9 100644
--- a/crates/storybook2/src/stories/scroll.rs
+++ b/crates/storybook2/src/stories/scroll.rs
@@ -1,4 +1,4 @@
-use gpui2::{
+use gpui::{
     div, px, Component, Div, ParentElement, Render, SharedString, StatefulInteraction, Styled,
     View, VisualContext, WindowContext,
 };
@@ -15,7 +15,7 @@ impl ScrollStory {
 impl Render for ScrollStory {
     type Element = Div<Self, StatefulInteraction<Self>>;
 
-    fn render(&mut self, cx: &mut gpui2::ViewContext<Self>) -> Self::Element {
+    fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> Self::Element {
         let theme = cx.theme();
         let color_1 = theme.styles.git.created;
         let color_2 = theme.styles.git.modified;
diff --git a/crates/storybook2/src/stories/text.rs b/crates/storybook2/src/stories/text.rs
index 85a9fd51a6ed67860d53e663a31dd30ff18e77ca..b4a4c86e7eed15fb774ea1586e4ab36a1ea5aafe 100644
--- a/crates/storybook2/src/stories/text.rs
+++ b/crates/storybook2/src/stories/text.rs
@@ -1,4 +1,4 @@
-use gpui2::{div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext};
+use gpui::{div, white, Div, ParentElement, Render, Styled, View, VisualContext, WindowContext};
 
 pub struct TextStory;
 
@@ -11,7 +11,7 @@ impl TextStory {
 impl Render for TextStory {
     type Element = Div<Self>;
 
-    fn render(&mut self, cx: &mut gpui2::ViewContext<Self>) -> Self::Element {
+    fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> Self::Element {
         div().size_full().bg(white()).child(concat!(
             "The quick brown fox jumps over the lazy dog. ",
             "Meanwhile, the lazy dog decided it was time for a change. ",
diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs
index c0e1456bc01a1ebb7ffe3f50ccf17ea411315179..46ec0f4a3511ea2b3a3cc7999e203a62d35a01d6 100644
--- a/crates/storybook2/src/stories/z_index.rs
+++ b/crates/storybook2/src/stories/z_index.rs
@@ -1,4 +1,4 @@
-use gpui2::{px, rgb, Div, Hsla, Render};
+use gpui::{px, rgb, Div, Hsla, Render};
 use ui::prelude::*;
 
 use crate::story::Story;
diff --git a/crates/storybook2/src/story_selector.rs b/crates/storybook2/src/story_selector.rs
index 2adf2956d33512930bf8e829a3845d7ba5522dbc..f59208ccb8794948dd93afa99155d707ea91ad0d 100644
--- a/crates/storybook2/src/story_selector.rs
+++ b/crates/storybook2/src/story_selector.rs
@@ -5,7 +5,7 @@ use crate::stories::*;
 use anyhow::anyhow;
 use clap::builder::PossibleValue;
 use clap::ValueEnum;
-use gpui2::{AnyView, VisualContext};
+use gpui::{AnyView, VisualContext};
 use strum::{EnumIter, EnumString, IntoEnumIterator};
 use ui::prelude::*;
 use ui::{AvatarStory, ButtonStory, DetailsStory, IconStory, InputStory, LabelStory};
diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs
index 4e2c439db0c723baf4f8d7585281020474eec952..c8849c134278ebe36d583c34a14b6e8961f4885b 100644
--- a/crates/storybook2/src/storybook2.rs
+++ b/crates/storybook2/src/storybook2.rs
@@ -8,7 +8,7 @@ mod story_selector;
 use std::sync::Arc;
 
 use clap::Parser;
-use gpui2::{
+use gpui::{
     div, px, size, AnyView, AppContext, Bounds, Div, Render, ViewContext, VisualContext,
     WindowBounds, WindowOptions,
 };
@@ -22,7 +22,7 @@ use ui::prelude::*;
 use crate::assets::Assets;
 use crate::story_selector::StorySelector;
 
-// gpui2::actions! {
+// gpui::actions! {
 //     storybook,
 //     [ToggleInspector]
 // }
@@ -51,7 +51,7 @@ fn main() {
     let theme_name = args.theme.unwrap_or("Zed Pro Moonlight".to_string());
 
     let asset_source = Arc::new(Assets);
-    gpui2::App::production(asset_source).run(move |cx| {
+    gpui::App::production(asset_source).run(move |cx| {
         load_embedded_fonts(cx).unwrap();
 
         let mut store = SettingsStore::default();
@@ -116,7 +116,7 @@ impl Render for StoryWrapper {
     }
 }
 
-fn load_embedded_fonts(cx: &AppContext) -> gpui2::Result<()> {
+fn load_embedded_fonts(cx: &AppContext) -> gpui::Result<()> {
     let font_paths = cx.asset_source().list("fonts")?;
     let mut embedded_fonts = Vec::new();
     for font_path in font_paths {
diff --git a/crates/terminal2/src/mappings/colors.rs b/crates/terminal2/src/mappings/colors.rs
index fc3557b4e80c3095c8cc63278d0a86e250230362..d3c8443cbf962c68dc3dd124aff2495d0a88ddc0 100644
--- a/crates/terminal2/src/mappings/colors.rs
+++ b/crates/terminal2/src/mappings/colors.rs
@@ -1,6 +1,6 @@
 // todo!()
 use alacritty_terminal::term::color::Rgb as AlacRgb;
-// use gpui2::color::Color;
+// use gpui::color::Color;
 // use theme2::TerminalStyle;
 
 ///Converts a 2, 8, or 24 bit color ANSI color to the GPUI equivalent
diff --git a/crates/ui2/Cargo.toml b/crates/ui2/Cargo.toml
index f11fd652b61d4b5be02ef0f06eb0095a3c3fda44..754bca371f41e741356f1ad9df670de2154e9978 100644
--- a/crates/ui2/Cargo.toml
+++ b/crates/ui2/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 [dependencies]
 anyhow.workspace = true
 chrono = "0.4"
-gpui2 = { path = "../gpui2" }
+gpui = { package = "gpui2", path = "../gpui2" }
 itertools = { version = "0.11.0", optional = true }
 serde.workspace = true
 settings2 = { path = "../settings2" }
diff --git a/crates/ui2/docs/hello-world.md b/crates/ui2/docs/hello-world.md
index c6ded9ce34144495e911736669b2e07d56acc346..e8ed3bb9445464e310e22dbc40d9773bf419d2b3 100644
--- a/crates/ui2/docs/hello-world.md
+++ b/crates/ui2/docs/hello-world.md
@@ -40,12 +40,12 @@ impl<V: 'static> TodoList<V> {
 
 All of this is relatively straightforward.
 
-We use [gpui2::SharedString] in components instead of [std::string::String]. This allows us to [TODO: someone who actually knows please explain why we use SharedString].
+We use [gpui::SharedString] in components instead of [std::string::String]. This allows us to [TODO: someone who actually knows please explain why we use SharedString].
 
 When we want to pass an action we pass a `ClickHandler`. Whenever we want to add an action, the struct it belongs to needs to be generic over the view type `V`.
 
 ~~~rust
-use gpui2::hsla
+use gpui::hsla
 
 impl<V: 'static> TodoList<V> {
     // ...
@@ -74,7 +74,7 @@ As you start using the Tailwind-style conventions you will be surprised how quic
 
 **Why `50.0/360.0` in `hsla()`?**
 
-gpui [gpui2::Hsla] use `0.0-1.0` for all it's values, but it is common for tools to use `0-360` for hue.
+gpui [gpui::Hsla] use `0.0-1.0` for all it's values, but it is common for tools to use `0-360` for hue.
 
 This may change in the future, but this is a little trick that let's you use familiar looking values.
 
@@ -98,7 +98,7 @@ impl<V: 'static> TodoList<V> {
 Now we have access to the complete set of colors defined in the theme.
 
 ~~~rust
-use gpui2::hsla
+use gpui::hsla
 
 impl<V: 'static> TodoList<V> {
     // ...
@@ -113,7 +113,7 @@ impl<V: 'static> TodoList<V> {
 Let's finish up some basic styles for the container then move on to adding the other elements.
 
 ~~~rust
-use gpui2::hsla
+use gpui::hsla
 
 impl<V: 'static> TodoList<V> {
     // ...
diff --git a/crates/ui2/src/components/avatar.rs b/crates/ui2/src/components/avatar.rs
index ff574a2042d2805a08a64867916b1cdea9802271..9c993dfc062c2df288c5345c8bcc4019cd11d6a4 100644
--- a/crates/ui2/src/components/avatar.rs
+++ b/crates/ui2/src/components/avatar.rs
@@ -1,4 +1,4 @@
-use gpui2::img;
+use gpui::img;
 
 use crate::prelude::*;
 
@@ -33,7 +33,7 @@ impl Avatar {
         img.uri(self.src.clone())
             .size_4()
             // todo!(Pull the avatar fallback background from the theme.)
-            .bg(gpui2::red())
+            .bg(gpui::red())
     }
 }
 
@@ -44,7 +44,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct AvatarStory;
 
diff --git a/crates/ui2/src/components/button.rs b/crates/ui2/src/components/button.rs
index 178813dd5fc424715af72ebbf35c9fb535af21ed..437daaa982b21d4e938c3ca823fe2a40432427b3 100644
--- a/crates/ui2/src/components/button.rs
+++ b/crates/ui2/src/components/button.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui2::{div, rems, DefiniteLength, Hsla, MouseButton, WindowContext};
+use gpui::{div, rems, DefiniteLength, Hsla, MouseButton, WindowContext};
 
 use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor, LineHeightStyle};
 use crate::{prelude::*, IconButton};
@@ -234,7 +234,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{h_stack, v_stack, LabelColor, Story};
-    use gpui2::{rems, Div, Render};
+    use gpui::{rems, Div, Render};
     use strum::IntoEnumIterator;
 
     pub struct ButtonStory;
diff --git a/crates/ui2/src/components/checkbox.rs b/crates/ui2/src/components/checkbox.rs
index 9632a6681066f06e35bebfb834dd78ab9b983929..9f7c10a10433eef59249e3ab0df408b94a8a2aff 100644
--- a/crates/ui2/src/components/checkbox.rs
+++ b/crates/ui2/src/components/checkbox.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui2::{
+use gpui::{
     div, Component, ElementId, ParentElement, StatefulInteractive, StatelessInteractive, Styled,
     ViewContext,
 };
@@ -175,7 +175,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{h_stack, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct CheckboxStory;
 
diff --git a/crates/ui2/src/components/context_menu.rs b/crates/ui2/src/components/context_menu.rs
index 87be445c1990c486345d96263976080b1d96b157..117be127798bd56f9d0c3963f8119832aa170550 100644
--- a/crates/ui2/src/components/context_menu.rs
+++ b/crates/ui2/src/components/context_menu.rs
@@ -65,7 +65,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::story::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct ContextMenuStory;
 
diff --git a/crates/ui2/src/components/details.rs b/crates/ui2/src/components/details.rs
index 1d22c817740804b7dd2e2a6121d130e28b336dbe..c7f6cc1839df780cef995a1e98b9b3f68aa3ca57 100644
--- a/crates/ui2/src/components/details.rs
+++ b/crates/ui2/src/components/details.rs
@@ -47,7 +47,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Button, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct DetailsStory;
 
diff --git a/crates/ui2/src/components/facepile.rs b/crates/ui2/src/components/facepile.rs
index 21dd848a281a2ed655c473c53f980958e778de75..efac4925f80a579bfc9deeca273fbf64aad10c5f 100644
--- a/crates/ui2/src/components/facepile.rs
+++ b/crates/ui2/src/components/facepile.rs
@@ -33,7 +33,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{static_players, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct FacepileStory;
 
diff --git a/crates/ui2/src/components/icon.rs b/crates/ui2/src/components/icon.rs
index fa1e1c63151a2ad4a80a4e68382f2137a28d9be1..907f3f91871b5c614944e821244d10228d2853bb 100644
--- a/crates/ui2/src/components/icon.rs
+++ b/crates/ui2/src/components/icon.rs
@@ -1,4 +1,4 @@
-use gpui2::{rems, svg, Hsla};
+use gpui::{rems, svg, Hsla};
 use strum::EnumIter;
 
 use crate::prelude::*;
@@ -204,7 +204,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
     use strum::IntoEnumIterator;
 
     use crate::Story;
diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs
index 8fe1a1fa9bc37d08002ed07e07bb167e05a2bd2e..cb4fb4d7f00463b6a8b4dd0d661fb77d82c62419 100644
--- a/crates/ui2/src/components/icon_button.rs
+++ b/crates/ui2/src/components/icon_button.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui2::{rems, MouseButton};
+use gpui::{rems, MouseButton};
 
 use crate::{h_stack, prelude::*};
 use crate::{ClickHandler, Icon, IconColor, IconElement};
diff --git a/crates/ui2/src/components/indicator.rs b/crates/ui2/src/components/indicator.rs
index 94398ab7f6016640d55e20a69d8e6939ca75c51a..83030ebbee066b213ab9594106b7c6610e7f64e3 100644
--- a/crates/ui2/src/components/indicator.rs
+++ b/crates/ui2/src/components/indicator.rs
@@ -1,4 +1,4 @@
-use gpui2::px;
+use gpui::px;
 
 use crate::prelude::*;
 
diff --git a/crates/ui2/src/components/input.rs b/crates/ui2/src/components/input.rs
index f288f3ca563d861bfb9b17e38d9ea7b9a2bea40a..e9f520346c5bb2d036d3f754f13c9452406266c5 100644
--- a/crates/ui2/src/components/input.rs
+++ b/crates/ui2/src/components/input.rs
@@ -111,7 +111,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct InputStory;
 
diff --git a/crates/ui2/src/components/keybinding.rs b/crates/ui2/src/components/keybinding.rs
index 8b8fba8c08d2da0ab097a82adc0a852925f1c30f..22bbc747a2e5d503d46aff06b9ba1d03d8de5e0b 100644
--- a/crates/ui2/src/components/keybinding.rs
+++ b/crates/ui2/src/components/keybinding.rs
@@ -158,7 +158,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
     use itertools::Itertools;
 
     pub struct KeybindingStory;
diff --git a/crates/ui2/src/components/label.rs b/crates/ui2/src/components/label.rs
index d1d4d6630c49437979421de52b370a67be5d78ac..dd078d2331305dcfd87a66a52c290b0bfe8cb1fa 100644
--- a/crates/ui2/src/components/label.rs
+++ b/crates/ui2/src/components/label.rs
@@ -1,4 +1,4 @@
-use gpui2::{relative, rems, Hsla, WindowContext};
+use gpui::{relative, rems, Hsla, WindowContext};
 use smallvec::SmallVec;
 
 use crate::prelude::*;
@@ -194,7 +194,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct LabelStory;
 
diff --git a/crates/ui2/src/components/list.rs b/crates/ui2/src/components/list.rs
index b30beacd9837af2bf6fa83e5810425cde600c010..c11860e9a5a653025f0f2fbae7c5733dd6f21537 100644
--- a/crates/ui2/src/components/list.rs
+++ b/crates/ui2/src/components/list.rs
@@ -1,4 +1,4 @@
-use gpui2::div;
+use gpui::div;
 
 use crate::settings::user_settings;
 use crate::{
diff --git a/crates/ui2/src/components/modal.rs b/crates/ui2/src/components/modal.rs
index 26986474e09dc012b039d36325347a33c7924f4e..75528b5c3460defeb139f7a16d8d311d87a5093b 100644
--- a/crates/ui2/src/components/modal.rs
+++ b/crates/ui2/src/components/modal.rs
@@ -1,4 +1,4 @@
-use gpui2::AnyElement;
+use gpui::AnyElement;
 use smallvec::SmallVec;
 
 use crate::{h_stack, prelude::*, v_stack, Button, Icon, IconButton, Label};
diff --git a/crates/ui2/src/components/notification_toast.rs b/crates/ui2/src/components/notification_toast.rs
index e8739b925c7e03c2a4fb2eb77cf005ea72ec665e..aeb2aa6ed901f8f867109f6687e100d0dc061ccb 100644
--- a/crates/ui2/src/components/notification_toast.rs
+++ b/crates/ui2/src/components/notification_toast.rs
@@ -1,4 +1,4 @@
-use gpui2::rems;
+use gpui::rems;
 
 use crate::prelude::*;
 use crate::{h_stack, Icon};
diff --git a/crates/ui2/src/components/palette.rs b/crates/ui2/src/components/palette.rs
index 269b39d86d5bc4fbbfa34fa20f9418a335b47641..7f736433fcd4d376534e265d3bf412aaa068888c 100644
--- a/crates/ui2/src/components/palette.rs
+++ b/crates/ui2/src/components/palette.rs
@@ -153,13 +153,13 @@ impl PaletteItem {
     }
 }
 
-use gpui2::ElementId;
+use gpui::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::{ModifierKeys, Story};
 
diff --git a/crates/ui2/src/components/panel.rs b/crates/ui2/src/components/panel.rs
index ba88abb337259e2e56d1b9b5e1eabb169fc0827c..1762003a2c2f8b6a8569a5ffd99770d90aef130d 100644
--- a/crates/ui2/src/components/panel.rs
+++ b/crates/ui2/src/components/panel.rs
@@ -1,4 +1,4 @@
-use gpui2::{AbsoluteLength, AnyElement};
+use gpui::{AbsoluteLength, AnyElement};
 use smallvec::SmallVec;
 
 use crate::prelude::*;
@@ -126,7 +126,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Label, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct PanelStory;
 
diff --git a/crates/ui2/src/components/player.rs b/crates/ui2/src/components/player.rs
index b6c80400cf373dd716cc9cb1686a7aee8af05cc0..dc034a5373e5347fa214a57f6e025326c89f62f8 100644
--- a/crates/ui2/src/components/player.rs
+++ b/crates/ui2/src/components/player.rs
@@ -1,4 +1,4 @@
-use gpui2::{Hsla, ViewContext};
+use gpui::{Hsla, ViewContext};
 
 use crate::prelude::*;
 
diff --git a/crates/ui2/src/components/slot.rs b/crates/ui2/src/components/slot.rs
index f980e2fbda51a3b86ae5d677ac5838cb94ea09d2..a672694dc5781c6a474211d621a71ee640e7dcaa 100644
--- a/crates/ui2/src/components/slot.rs
+++ b/crates/ui2/src/components/slot.rs
@@ -1,4 +1,4 @@
-use gpui2::SharedString;
+use gpui::SharedString;
 
 use crate::Icon;
 
diff --git a/crates/ui2/src/components/stack.rs b/crates/ui2/src/components/stack.rs
index 1b019ad4d949f838c1afc1b4c995edcc0a5a2f1a..d7bd0eb04f23b67b0797d86ba04fe3f4ee818b84 100644
--- a/crates/ui2/src/components/stack.rs
+++ b/crates/ui2/src/components/stack.rs
@@ -1,4 +1,4 @@
-use gpui2::{div, Div};
+use gpui::{div, Div};
 
 use crate::prelude::*;
 
diff --git a/crates/ui2/src/components/tab.rs b/crates/ui2/src/components/tab.rs
index 47de0541f1d6287a0e800c298e45c76486c3ef57..416db2d17294d5c62e654f136b3f82c714f43b85 100644
--- a/crates/ui2/src/components/tab.rs
+++ b/crates/ui2/src/components/tab.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 use crate::{Icon, IconColor, IconElement, Label, LabelColor};
-use gpui2::{red, Div, ElementId, Render, View, VisualContext};
+use gpui::{red, Div, ElementId, Render, View, VisualContext};
 
 #[derive(Component, Clone)]
 pub struct Tab {
diff --git a/crates/ui2/src/components/toast.rs b/crates/ui2/src/components/toast.rs
index 4ab6625dbaed89311a78227610b27434f91f7925..4164be2c3e71fdf22b0b9a852588b796d0d1de21 100644
--- a/crates/ui2/src/components/toast.rs
+++ b/crates/ui2/src/components/toast.rs
@@ -1,4 +1,4 @@
-use gpui2::AnyElement;
+use gpui::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;
@@ -70,7 +70,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::{Label, Story};
 
diff --git a/crates/ui2/src/components/toggle.rs b/crates/ui2/src/components/toggle.rs
index adde36758159cf6a1ea93ec2f152f0dfcf904f6b..368c95662fa51ed804c3d73f0d456d4f071a76d1 100644
--- a/crates/ui2/src/components/toggle.rs
+++ b/crates/ui2/src/components/toggle.rs
@@ -1,4 +1,4 @@
-use gpui2::{div, Component, ParentElement};
+use gpui::{div, Component, ParentElement};
 
 use crate::{Icon, IconColor, IconElement, IconSize};
 
diff --git a/crates/ui2/src/components/tooltip.rs b/crates/ui2/src/components/tooltip.rs
index c05214eea4e8d977ab85d875b341e1165a785b3a..84630920128a3a107a31e5a7fecb8dca2b139037 100644
--- a/crates/ui2/src/components/tooltip.rs
+++ b/crates/ui2/src/components/tooltip.rs
@@ -1,4 +1,4 @@
-use gpui2::{div, px, Div, ParentElement, Render, SharedString, Styled, ViewContext};
+use gpui::{div, px, Div, ParentElement, Render, SharedString, Styled, ViewContext};
 use theme2::ActiveTheme;
 
 #[derive(Clone, Debug)]
diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs
index 134b293d3daa0a5b14f5d3916e0ae44f77f291a3..c942f0aa3b883141a6178533c83e45c2a3a9f48c 100644
--- a/crates/ui2/src/prelude.rs
+++ b/crates/ui2/src/prelude.rs
@@ -1,4 +1,4 @@
-pub use gpui2::{
+pub use gpui::{
     div, Component, Element, ElementId, ParentElement, SharedString, StatefulInteractive,
     StatelessInteractive, Styled, ViewContext, WindowContext,
 };
@@ -7,7 +7,7 @@ pub use crate::elevation::*;
 pub use crate::ButtonVariant;
 pub use theme2::ActiveTheme;
 
-use gpui2::Hsla;
+use gpui::Hsla;
 use strum::EnumIter;
 
 #[derive(Debug, Default, PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Copy, EnumIter)]
diff --git a/crates/ui2/src/settings.rs b/crates/ui2/src/settings.rs
index 6a9426f623ef167d8ec3a24054d2586f1536b7f1..c3ac78316e9e6138195225c92cdad96542e808cd 100644
--- a/crates/ui2/src/settings.rs
+++ b/crates/ui2/src/settings.rs
@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use gpui2::{rems, AbsoluteLength, AppContext, WindowContext};
+use gpui::{rems, AbsoluteLength, AppContext, WindowContext};
 
 use crate::prelude::*;
 
diff --git a/crates/ui2/src/static_data.rs b/crates/ui2/src/static_data.rs
index 5342e1fb165606a8316fbb542aad2b78104ec4ea..ffdd3fee9849147719f89dcf08c23bff17dee4d9 100644
--- a/crates/ui2/src/static_data.rs
+++ b/crates/ui2/src/static_data.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 
 use chrono::DateTime;
-use gpui2::{AppContext, ViewContext};
+use gpui::{AppContext, ViewContext};
 use rand::Rng;
 use theme2::ActiveTheme;
 
diff --git a/crates/ui2/src/story.rs b/crates/ui2/src/story.rs
index dea4e342b4eda0520251c3685e8dbd50be2aedb2..94e38267f4c5b160365317c4e597a76748c05d6f 100644
--- a/crates/ui2/src/story.rs
+++ b/crates/ui2/src/story.rs
@@ -1,4 +1,4 @@
-use gpui2::Div;
+use gpui::Div;
 
 use crate::prelude::*;
 
diff --git a/crates/ui2/src/to_extract/assistant_panel.rs b/crates/ui2/src/to_extract/assistant_panel.rs
index 51c123ad9ea7db7947673e3905313fdfa28bfcfc..8a35757f5c484315daebea12c0af7186c418f96e 100644
--- a/crates/ui2/src/to_extract/assistant_panel.rs
+++ b/crates/ui2/src/to_extract/assistant_panel.rs
@@ -1,6 +1,6 @@
 use crate::prelude::*;
 use crate::{Icon, IconButton, Label, Panel, PanelSide};
-use gpui2::{rems, AbsoluteLength};
+use gpui::{rems, AbsoluteLength};
 
 #[derive(Component)]
 pub struct AssistantPanel {
@@ -77,7 +77,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
     pub struct AssistantPanelStory;
 
     impl Render for AssistantPanelStory {
diff --git a/crates/ui2/src/to_extract/breadcrumb.rs b/crates/ui2/src/to_extract/breadcrumb.rs
index 163dfabfb0b5ed73e72df5346f998c1e1cf7b651..cd7df87646a026f352d580ef47e1c1ef90fdb441 100644
--- a/crates/ui2/src/to_extract/breadcrumb.rs
+++ b/crates/ui2/src/to_extract/breadcrumb.rs
@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use crate::prelude::*;
 use crate::{h_stack, HighlightedText};
-use gpui2::Div;
+use gpui::Div;
 
 #[derive(Clone)]
 pub struct Symbol(pub Vec<HighlightedText>);
@@ -73,7 +73,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::Render;
+    use gpui::Render;
     use std::str::FromStr;
 
     pub struct BreadcrumbStory;
diff --git a/crates/ui2/src/to_extract/buffer.rs b/crates/ui2/src/to_extract/buffer.rs
index e12beff2fce5e8c8d081c44e832c3a19465e7b3f..8ab435e9947bb4746613a4f1fd1ba2f5576a2a9f 100644
--- a/crates/ui2/src/to_extract/buffer.rs
+++ b/crates/ui2/src/to_extract/buffer.rs
@@ -1,4 +1,4 @@
-use gpui2::{Hsla, WindowContext};
+use gpui::{Hsla, WindowContext};
 
 use crate::prelude::*;
 use crate::{h_stack, v_stack, Icon, IconElement};
@@ -235,7 +235,7 @@ mod stories {
         empty_buffer_example, hello_world_rust_buffer_example,
         hello_world_rust_buffer_with_status_example, Story,
     };
-    use gpui2::{rems, Div, Render};
+    use gpui::{rems, Div, Render};
 
     pub struct BufferStory;
 
diff --git a/crates/ui2/src/to_extract/buffer_search.rs b/crates/ui2/src/to_extract/buffer_search.rs
index 02f689ca3e009bca7dbedc6fc015b185321e8f90..9993cd361294067112c6b629ef9f5e2698e4e3cb 100644
--- a/crates/ui2/src/to_extract/buffer_search.rs
+++ b/crates/ui2/src/to_extract/buffer_search.rs
@@ -1,4 +1,4 @@
-use gpui2::{Div, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::{h_stack, Icon, IconButton, IconColor, Input};
diff --git a/crates/ui2/src/to_extract/chat_panel.rs b/crates/ui2/src/to_extract/chat_panel.rs
index f4f1ddf4337c30f5fcfc5f19d1731c846ab3a5f8..538b5dfceba5bb753feb0504b1eb880140aef291 100644
--- a/crates/ui2/src/to_extract/chat_panel.rs
+++ b/crates/ui2/src/to_extract/chat_panel.rs
@@ -108,7 +108,7 @@ pub use stories::*;
 #[cfg(feature = "stories")]
 mod stories {
     use chrono::DateTime;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::{Panel, Story};
 
diff --git a/crates/ui2/src/to_extract/collab_panel.rs b/crates/ui2/src/to_extract/collab_panel.rs
index 9d9dc861e2a1c2ce073040334e6ccaaf5ab2562e..7b785ae9e1dbbda8c5392baa1473a7a31d6ce1eb 100644
--- a/crates/ui2/src/to_extract/collab_panel.rs
+++ b/crates/ui2/src/to_extract/collab_panel.rs
@@ -92,7 +92,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct CollabPanelStory;
 
diff --git a/crates/ui2/src/to_extract/command_palette.rs b/crates/ui2/src/to_extract/command_palette.rs
index 63db4359e7e84c6608f737bc1e3762f2d4b53eec..8a9461c796d053e45fb768f3db4c14f1364f0d27 100644
--- a/crates/ui2/src/to_extract/command_palette.rs
+++ b/crates/ui2/src/to_extract/command_palette.rs
@@ -27,7 +27,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
diff --git a/crates/ui2/src/to_extract/copilot.rs b/crates/ui2/src/to_extract/copilot.rs
index 51523d48f07bf9f7c4eed4d5edf07f0b7ff7fb3b..8750ab3c51a28cd1f91f67f09c4cd7d419a7b98b 100644
--- a/crates/ui2/src/to_extract/copilot.rs
+++ b/crates/ui2/src/to_extract/copilot.rs
@@ -25,7 +25,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
diff --git a/crates/ui2/src/to_extract/editor_pane.rs b/crates/ui2/src/to_extract/editor_pane.rs
index 8e54d2c2e888f5b75599d85f779d9ebae3c96ad7..fd21e81242c34237f9d16fb63f66312ebc678fbf 100644
--- a/crates/ui2/src/to_extract/editor_pane.rs
+++ b/crates/ui2/src/to_extract/editor_pane.rs
@@ -1,6 +1,6 @@
 use std::path::PathBuf;
 
-use gpui2::{Div, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::{
diff --git a/crates/ui2/src/to_extract/language_selector.rs b/crates/ui2/src/to_extract/language_selector.rs
index fa7f5b2bd7b9cae4135f321e34ad559834f8d539..694ca78e9c92353a7097f33d7ec133278b063bb0 100644
--- a/crates/ui2/src/to_extract/language_selector.rs
+++ b/crates/ui2/src/to_extract/language_selector.rs
@@ -40,7 +40,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct LanguageSelectorStory;
 
diff --git a/crates/ui2/src/to_extract/multi_buffer.rs b/crates/ui2/src/to_extract/multi_buffer.rs
index 1334703015b1373255ba5113bcce143ee790413b..78a22d51d078bc6293e849f8898b53ee2c363109 100644
--- a/crates/ui2/src/to_extract/multi_buffer.rs
+++ b/crates/ui2/src/to_extract/multi_buffer.rs
@@ -40,7 +40,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{hello_world_rust_buffer_example, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct MultiBufferStory;
 
diff --git a/crates/ui2/src/to_extract/notifications_panel.rs b/crates/ui2/src/to_extract/notifications_panel.rs
index 84794b71b21993cf1c41e9e15d8d388c39d5a140..b2cc4a7846c00acf32b4afb1d65d196f8caeda8a 100644
--- a/crates/ui2/src/to_extract/notifications_panel.rs
+++ b/crates/ui2/src/to_extract/notifications_panel.rs
@@ -345,7 +345,7 @@ impl<V> Notification<V> {
 }
 
 use chrono::NaiveDateTime;
-use gpui2::{px, Styled};
+use gpui::{px, Styled};
 #[cfg(feature = "stories")]
 pub use stories::*;
 
@@ -353,7 +353,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Panel, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct NotificationsPanelStory;
 
diff --git a/crates/ui2/src/to_extract/panes.rs b/crates/ui2/src/to_extract/panes.rs
index a1e040b0cad9a5365548feb150f1084f4fa3404e..b57b77d5eeb8ec71dc4ab075d63269fcac158cbe 100644
--- a/crates/ui2/src/to_extract/panes.rs
+++ b/crates/ui2/src/to_extract/panes.rs
@@ -1,4 +1,4 @@
-use gpui2::{hsla, red, AnyElement, ElementId, ExternalPaths, Hsla, Length, Size, View};
+use gpui::{hsla, red, AnyElement, ElementId, ExternalPaths, Hsla, Length, Size, View};
 use smallvec::SmallVec;
 
 use crate::prelude::*;
diff --git a/crates/ui2/src/to_extract/project_panel.rs b/crates/ui2/src/to_extract/project_panel.rs
index a34a30bcbcf0ae71a19caff2884039933d1bcce4..d4f5c724265f549eaed54040364abf655c6a5bfd 100644
--- a/crates/ui2/src/to_extract/project_panel.rs
+++ b/crates/ui2/src/to_extract/project_panel.rs
@@ -46,7 +46,7 @@ impl ProjectPanel {
     }
 }
 
-use gpui2::ElementId;
+use gpui::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 
@@ -54,7 +54,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::{Panel, Story};
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct ProjectPanelStory;
 
diff --git a/crates/ui2/src/to_extract/recent_projects.rs b/crates/ui2/src/to_extract/recent_projects.rs
index d5a9dd1b228122db6475d434b897e48392d0d38a..3d4f551490a47ef5eab616ebf1e2b1f6f0a0a726 100644
--- a/crates/ui2/src/to_extract/recent_projects.rs
+++ b/crates/ui2/src/to_extract/recent_projects.rs
@@ -36,7 +36,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct RecentProjectsStory;
 
diff --git a/crates/ui2/src/to_extract/tab_bar.rs b/crates/ui2/src/to_extract/tab_bar.rs
index a1280441832f1a6a8caee0c1a63ec989d021ad37..aff095c639ea48c560b35e738e18f60ea38e8264 100644
--- a/crates/ui2/src/to_extract/tab_bar.rs
+++ b/crates/ui2/src/to_extract/tab_bar.rs
@@ -92,7 +92,7 @@ impl TabBar {
     }
 }
 
-use gpui2::ElementId;
+use gpui::ElementId;
 #[cfg(feature = "stories")]
 pub use stories::*;
 
@@ -100,7 +100,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     pub struct TabBarStory;
 
diff --git a/crates/ui2/src/to_extract/terminal.rs b/crates/ui2/src/to_extract/terminal.rs
index b912a5960768e3b17a11988560a0201ac6ee2902..6c36f35152d8082a3da7fda855a5fc58084b3ae2 100644
--- a/crates/ui2/src/to_extract/terminal.rs
+++ b/crates/ui2/src/to_extract/terminal.rs
@@ -1,4 +1,4 @@
-use gpui2::{relative, rems, Size};
+use gpui::{relative, rems, Size};
 
 use crate::prelude::*;
 use crate::{Icon, IconButton, Pane, Tab};
@@ -83,7 +83,7 @@ pub use stories::*;
 mod stories {
     use super::*;
     use crate::Story;
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
     pub struct TerminalStory;
 
     impl Render for TerminalStory {
diff --git a/crates/ui2/src/to_extract/theme_selector.rs b/crates/ui2/src/to_extract/theme_selector.rs
index 5c67f1cd3ef987c5181734fedfdf061cf50465fe..7f911b50bfa8d9b6273126053a7e791e41754989 100644
--- a/crates/ui2/src/to_extract/theme_selector.rs
+++ b/crates/ui2/src/to_extract/theme_selector.rs
@@ -39,7 +39,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
diff --git a/crates/ui2/src/to_extract/title_bar.rs b/crates/ui2/src/to_extract/title_bar.rs
index 2fa201440a9ca0301cb6b7c04ca9246597f9c409..87d7dd4146d051aa5c8e4b8ae6697f487bfb34fa 100644
--- a/crates/ui2/src/to_extract/title_bar.rs
+++ b/crates/ui2/src/to_extract/title_bar.rs
@@ -1,7 +1,7 @@
 use std::sync::atomic::AtomicBool;
 use std::sync::Arc;
 
-use gpui2::{Div, Render, View, VisualContext};
+use gpui::{Div, Render, View, VisualContext};
 
 use crate::prelude::*;
 use crate::settings::user_settings;
diff --git a/crates/ui2/src/to_extract/toolbar.rs b/crates/ui2/src/to_extract/toolbar.rs
index 0e3e7c259ff971622feb5b89fbeddc3bf5023a2f..81918f34a790b1ec91aa4ac33cad210972b191cf 100644
--- a/crates/ui2/src/to_extract/toolbar.rs
+++ b/crates/ui2/src/to_extract/toolbar.rs
@@ -1,4 +1,4 @@
-use gpui2::AnyElement;
+use gpui::AnyElement;
 use smallvec::SmallVec;
 
 use crate::prelude::*;
@@ -73,7 +73,7 @@ mod stories {
     use std::path::PathBuf;
     use std::str::FromStr;
 
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::{Breadcrumb, HighlightedText, Icon, IconButton, Story, Symbol};
 
diff --git a/crates/ui2/src/to_extract/traffic_lights.rs b/crates/ui2/src/to_extract/traffic_lights.rs
index 677fae886c838c03cc42ed300ce9df4f79d1d883..245ff377f2146579f5532123a456f2f1ae498cfc 100644
--- a/crates/ui2/src/to_extract/traffic_lights.rs
+++ b/crates/ui2/src/to_extract/traffic_lights.rs
@@ -77,7 +77,7 @@ pub use stories::*;
 
 #[cfg(feature = "stories")]
 mod stories {
-    use gpui2::{Div, Render};
+    use gpui::{Div, Render};
 
     use crate::Story;
 
diff --git a/crates/ui2/src/to_extract/workspace.rs b/crates/ui2/src/to_extract/workspace.rs
index 77b9bc45393db4d905be3c3c08c8c2b18150f4e8..d6de8a828807606a6d55086af724983ca1a93df0 100644
--- a/crates/ui2/src/to_extract/workspace.rs
+++ b/crates/ui2/src/to_extract/workspace.rs
@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use chrono::DateTime;
-use gpui2::{px, relative, Div, Render, Size, View, VisualContext};
+use gpui::{px, relative, Div, Render, Size, View, VisualContext};
 use settings2::Settings;
 use theme2::ThemeSettings;
 
@@ -373,7 +373,7 @@ pub use stories::*;
 #[cfg(feature = "stories")]
 mod stories {
     use super::*;
-    use gpui2::VisualContext;
+    use gpui::VisualContext;
 
     pub struct WorkspaceStory {
         workspace: View<Workspace>,
diff --git a/crates/zed2/src/languages/language_plugin.rs b/crates/zed2/src/languages/language_plugin.rs
index a160cca228faa2d91285ec5ed1e8b499833cffd6..968cc819fde558f939de6c7f655023e0b431bd37 100644
--- a/crates/zed2/src/languages/language_plugin.rs
+++ b/crates/zed2/src/languages/language_plugin.rs
@@ -2,7 +2,7 @@ use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use collections::HashMap;
 use futures::lock::Mutex;
-use gpui2::executor::Background;
+use gpui::executor::Background;
 use language2::{LanguageServerName, LspAdapter, LspAdapterDelegate};
 use lsp2::LanguageServerBinary;
 use plugin_runtime::{Plugin, PluginBinary, PluginBuilder, WasiFn};
diff --git a/test.rs b/test.rs
index 6553e633c8e82597b9ca32b34d68a2f475d586ce..4a7b9faa8ff9b56cc0779b79f5152b3b1694c2c7 100644
--- a/test.rs
+++ b/test.rs
@@ -410,7 +410,7 @@ mod components {
         themes::rose_pine,
     };
     use gpui::{platform::MouseButton, ViewContext};
-    use gpui2_macros::Element;
+    use gpui_macros::Element;
     use std::{marker::PhantomData, rc::Rc};
     struct ButtonHandlers<V, D> {
         click: Option<Rc<dyn Fn(&mut V, &D, &mut ViewContext<V>)>>,
@@ -535,7 +535,7 @@ mod element {
         platform::{MouseButton, MouseButtonEvent},
         EngineLayout, EventContext, RenderContext, ViewContext,
     };
-    use gpui2_macros::tailwind_lengths;
+    use gpui_macros::tailwind_lengths;
     use std::{
         any::{Any, TypeId},
         cell::Cell,
@@ -4572,7 +4572,7 @@ mod frame {
     };
     use anyhow::{anyhow, Result};
     use gpui::LayoutNodeId;
-    use gpui2_macros::IntoElement;
+    use gpui_macros::IntoElement;
     #[element_crate = "crate"]
     pub struct Frame<V: 'static> {
         style: OptionalStyle,