diff --git a/crates/codegen/kigi-pager-render/src/theme/mod.rs b/crates/codegen/kigi-pager-render/src/theme/mod.rs
index cffbd0c..47dd4f4 100644
--- a/crates/codegen/kigi-pager-render/src/theme/mod.rs
+++ b/crates/codegen/kigi-pager-render/src/theme/mod.rs
@@ -139,12 +139,12 @@ pub fn canonical_name(value: &str) -> Option<&'static str> {
 }
 
 /// Human-friendly display name for a canonical theme value (e.g.
-/// `"groknight"` → `"Grok Night"`). Falls back to `value` verbatim.
+/// `"groknight"` → `"Kigi Night"`). Falls back to `value` verbatim.
 pub fn display_name_for_canonical(value: &str) -> &str {
     match value {
         "auto" => "Auto",
-        "groknight" => "Grok Night",
-        "grokday" => "Grok Day",
+        "groknight" => "Kigi Night",
+        "grokday" => "Kigi Day",
         "tokyonight" => "Tokyo Night",
         "rosepine-moon" => "Rose Pine Moon",
         other => other,
diff --git a/crates/codegen/kigi-tui/src/app/acp_handler/permissions.rs b/crates/codegen/kigi-tui/src/app/acp_handler/permissions.rs
index 0ea968e..873ec78 100644
--- a/crates/codegen/kigi-tui/src/app/acp_handler/permissions.rs
+++ b/crates/codegen/kigi-tui/src/app/acp_handler/permissions.rs
@@ -74,7 +74,7 @@ pub(super) fn handle_permission_request(
     {
         app.notification_service.notify(NotificationEvent {
             kind: NotificationEventKind::ApprovalRequired,
-            title: "Grok".into(),
+            title: "Kigi".into(),
             body: NotificationEventKind::ApprovalRequired.as_str().into(),
             session_id: Some(perm.request.session_id.0.to_string()),
         });
diff --git a/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs b/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
index e0c4a1b..54a6ac4 100644
--- a/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
+++ b/crates/codegen/kigi-tui/src/app/agent_view/interactions.rs
@@ -1619,8 +1619,8 @@ mod question_no_freeform_tests {
         Question {
             question: "You hit your free usage limit.".into(),
             options: vec![
-                opt("Upgrade to SuperGrok", "For everyday coding"),
-                opt("Upgrade to SuperGrok Heavy", "Highest usage limits"),
+                opt("Option A", "For everyday coding"),
+                opt("Option B", "Highest usage limits"),
             ],
             multi_select: Some(false),
             id: None,
diff --git a/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs b/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
index a0ee8d7..73af573 100644
--- a/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
+++ b/crates/codegen/kigi-tui/src/app/dispatch/tests/settings.rs
@@ -2993,8 +2993,8 @@ fn set_theme_toast_format_uses_display_name() {
             "toast must contain label, got: {toast:?}",
         );
         assert!(
-            toast.contains("Grok Day"),
-            "toast must use display name `Grok Day`, not canonical `grokday`, got: {toast:?}",
+            toast.contains("Kigi Day"),
+            "toast must use display name `Kigi Day`, not canonical `grokday`, got: {toast:?}",
         );
         assert!(toast.contains('\u{2713}'), "toast must contain the ✓ glyph");
     });
@@ -3006,7 +3006,7 @@ fn set_auto_dark_theme_toast_format_uses_display_name() {
         let _ = dispatch(Action::SetAutoDarkTheme("grokday".into()), &mut app);
         let toast = read_toast(&app);
         assert!(toast.contains("Auto dark theme"));
-        assert!(toast.contains("Grok Day"));
+        assert!(toast.contains("Kigi Day"));
         assert!(toast.contains('\u{2713}'));
     });
 }
@@ -3017,7 +3017,7 @@ fn set_auto_light_theme_toast_format_uses_display_name() {
         let _ = dispatch(Action::SetAutoLightTheme("groknight".into()), &mut app);
         let toast = read_toast(&app);
         assert!(toast.contains("Auto light theme"));
-        assert!(toast.contains("Grok Night"));
+        assert!(toast.contains("Kigi Night"));
     });
 }
 /// `apply_setting_rollback` for theme keys: a failed persist
diff --git a/crates/codegen/kigi-tui/src/diagnostics.rs b/crates/codegen/kigi-tui/src/diagnostics.rs
index 19ac5e5..f07f2f1 100644
--- a/crates/codegen/kigi-tui/src/diagnostics.rs
+++ b/crates/codegen/kigi-tui/src/diagnostics.rs
@@ -640,7 +640,7 @@ pub fn color_support_warning(
             None,
             None,
         );
-        warning.note = Some("Unset NO_COLOR and restart Grok.".to_string());
+        warning.note = Some("Unset NO_COLOR and restart Kigi.".to_string());
         return Some(warning);
     }
 
@@ -677,7 +677,7 @@ pub fn color_support_warning(
         Some("export COLORTERM=truecolor"),
         None,
     );
-    warning.note = Some("Persist in ~/.zshrc / ~/.bashrc and restart Grok.".to_string());
+    warning.note = Some("Persist in ~/.zshrc / ~/.bashrc and restart Kigi.".to_string());
     Some(warning)
 }
 
diff --git a/crates/codegen/kigi-tui/src/settings/defs.rs b/crates/codegen/kigi-tui/src/settings/defs.rs
index a5f3cc7..dd2e662 100644
--- a/crates/codegen/kigi-tui/src/settings/defs.rs
+++ b/crates/codegen/kigi-tui/src/settings/defs.rs
@@ -46,12 +46,12 @@ const THEME_CHOICES: &[EnumChoice] = &[
     },
     EnumChoice {
         canonical: "groknight",
-        display: "Grok Night",
+        display: "Kigi Night",
         description: "Neutral dark with magenta accent.",
     },
     EnumChoice {
         canonical: "grokday",
-        display: "Grok Day",
+        display: "Kigi Day",
         description: "Light theme for bright environments.",
     },
     EnumChoice {
@@ -295,12 +295,12 @@ const SCREEN_MODE_CHOICES: &[EnumChoice] = &[
 const CONCRETE_THEME_CHOICES: &[EnumChoice] = &[
     EnumChoice {
         canonical: "groknight",
-        display: "Grok Night",
+        display: "Kigi Night",
         description: "Neutral dark with magenta accent.",
     },
     EnumChoice {
         canonical: "grokday",
-        display: "Grok Day",
+        display: "Kigi Day",
         description: "Light theme for bright environments.",
     },
     EnumChoice {
diff --git a/crates/codegen/kigi-tui/src/settings/registry.rs b/crates/codegen/kigi-tui/src/settings/registry.rs
index f50e45b..a9b778d 100644
--- a/crates/codegen/kigi-tui/src/settings/registry.rs
+++ b/crates/codegen/kigi-tui/src/settings/registry.rs
@@ -74,7 +74,7 @@ impl SettingCategory {
 pub struct EnumChoice {
     /// Canonical persisted value (e.g. `"groknight"`).
     pub canonical: &'static str,
-    /// Display label shown in the chooser (e.g. `"Grok Night"`).
+    /// Display label shown in the chooser (e.g. `"Kigi Night"`).
     pub display: &'static str,
     /// Sub-text shown in the chooser sheet (e.g. `"Dark + magenta accent"`).
     pub description: &'static str,
diff --git a/crates/codegen/kigi-tui/src/views/welcome/hero_box.rs b/crates/codegen/kigi-tui/src/views/welcome/hero_box.rs
index ca4de7e..c36256e 100644
--- a/crates/codegen/kigi-tui/src/views/welcome/hero_box.rs
+++ b/crates/codegen/kigi-tui/src/views/welcome/hero_box.rs
@@ -23,7 +23,7 @@ const H_INSET: u16 = 2;
 /// Horizontal gap (cols) between the logo and the right column inside the box.
 const LOGO_H_PAD: u16 = 3;
 
-const HERO_SUBTITLE: &str = "Thanks for trying Grok Build, give feedback with /feedback!";
+const HERO_SUBTITLE: &str = "Thanks for trying Kigi, give feedback with /feedback!";
 
 use super::{PROMPT_HEIGHT, VERSION_GAP};
 
diff --git a/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs b/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
index 2d5477e..df4f4c1 100644
--- a/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
+++ b/crates/codegen/kigi-tui/src/wrap_clipboard_image.rs
@@ -19,7 +19,7 @@ use base64::Engine as _;
 use kigi_pager_render::clipboard::{ImageData, osc52_sink_active};
 
 /// OSC body after `ESC ]` for a host image request.
-pub const REQUEST_BODY: &[u8] = b"999;GrokWrapClipboardImage?";
+pub const REQUEST_BODY: &[u8] = b"999;KigiWrapClipboardImage?";
 
 /// Full request sequence written to stderr by the remote pager (`ESC ]` body `BEL`).
 pub fn request_osc_bytes() -> Vec<u8> {
diff --git a/crates/codegen/kigi-update/src/auto_update.rs b/crates/codegen/kigi-update/src/auto_update.rs
index a645d8f..58606a1 100644
--- a/crates/codegen/kigi-update/src/auto_update.rs
+++ b/crates/codegen/kigi-update/src/auto_update.rs
@@ -2206,8 +2206,8 @@ pub async fn run_update(
         {
             tracing::warn!("Failed to persist auto_update=false for pinned install: {e}");
         }
-        eprintln!("  ✓ grok v{} installed successfully!", version);
-        eprintln!("  Please restart Grok.");
+        eprintln!("  ✓ kigi v{} installed successfully!", version);
+        eprintln!("  Please restart Kigi.");
         return Ok(Some(version.to_string()));
     }
 
@@ -2324,7 +2324,7 @@ pub async fn run_update(
     eprintln!("  ✓ grok v{} installed successfully!", target_version);
 
     if !force && std::env::var_os("KIGI_AUTO_UPDATE").is_none() {
-        eprintln!("  Please restart Grok.");
+        eprintln!("  Please restart Kigi.");
     }
     Ok(Some(target_version.to_string()))
 }