diff --git a/zed/src/main.rs b/zed/src/main.rs
index 8df011e7d2bba5f6d9222d64f29ad88a947aa3d4..5340cedc616203f2ebc378633ac74181632e72ff 100644
--- a/zed/src/main.rs
+++ b/zed/src/main.rs
@@ -24,19 +24,19 @@ fn main() {
         settings,
     };
 
-    app.run(move |ctx| {
-        ctx.set_menus(menus::menus(app_state.settings.clone()));
-        workspace::init(ctx);
-        editor::init(ctx);
-        file_finder::init(ctx);
+    app.run(move |cx| {
+        cx.set_menus(menus::menus(app_state.settings.clone()));
+        workspace::init(cx);
+        editor::init(cx);
+        file_finder::init(cx);
 
         if stdout_is_a_pty() {
-            ctx.platform().activate(true);
+            cx.platform().activate(true);
         }
 
         let paths = collect_path_args();
         if !paths.is_empty() {
-            ctx.dispatch_global_action(
+            cx.dispatch_global_action(
                 "workspace:open_paths",
                 OpenParams {
                     paths,
diff --git a/zed/src/test.rs b/zed/src/test.rs
index 5efb0f3e3573f3165596b299b02c6dd844e10a4d..90ef48e6c088d815f6cecbeeebb58db1826f40bf 100644
--- a/zed/src/test.rs
+++ b/zed/src/test.rs
@@ -144,8 +144,8 @@ fn write_tree(path: &Path, tree: serde_json::Value) {
     }
 }
 
-pub fn build_app_state(ctx: &AppContext) -> AppState {
-    let settings = settings::channel(&ctx.font_cache()).unwrap().1;
+pub fn build_app_state(cx: &AppContext) -> AppState {
+    let settings = settings::channel(&cx.font_cache()).unwrap().1;
     let language_registry = Arc::new(LanguageRegistry::new());
     AppState {
         settings,