diff --git a/packages/coding-agent/test/interactive-mode-status.test.ts b/packages/coding-agent/test/interactive-mode-status.test.ts
index 166cafc02..a97a11bc6 100644
--- a/packages/coding-agent/test/interactive-mode-status.test.ts
+++ b/packages/coding-agent/test/interactive-mode-status.test.ts
@@ -2,8 +2,8 @@ import { homedir } from "node:os";
 import * as path from "node:path";
 import { type AutocompleteProvider, CombinedAutocompleteProvider } from "@earendil-works/pi-tui";
 import { beforeAll, describe, expect, test, vi } from "vitest";
-import { TuiMainScreen } from "../../tui/src/TuiMainScreen.ts";
 import { type Component, Container, type Focusable, type TUI } from "../../tui/src/tui.ts";
+import { TuiMainScreen } from "../../tui/src/tui-main-screen.ts";
 import { VirtualTerminal } from "../../tui/test/virtual-terminal.ts";
 import type { AutocompleteProviderFactory } from "../src/core/extensions/types.ts";
 import type { SourceInfo } from "../src/core/source-info.ts";
diff --git a/packages/tui/src/index.ts b/packages/tui/src/index.ts
index ab5f875dc..5c7d68e9c 100644
--- a/packages/tui/src/index.ts
+++ b/packages/tui/src/index.ts
@@ -69,8 +69,6 @@ export {
 } from "./keys.ts";
 // Input buffering for batch splitting
 export { StdinBuffer, type StdinBufferEventMap, type StdinBufferOptions } from "./stdin-buffer.ts";
-export { TuiAltScreen, type TuiAltScreenOptions } from "./TuiAltScreen.ts";
-export { TuiMainScreen } from "./TuiMainScreen.ts";
 // Terminal interface and implementations
 export { ProcessTerminal, type Terminal } from "./terminal.ts";
 // Terminal colors
@@ -127,6 +125,8 @@ export {
 	type TuiInputListenerResult,
 	type ViewportTUI,
 } from "./tui.ts";
+export { TuiAltScreen, type TuiAltScreenOptions } from "./tui-alt-screen.ts";
+export { TuiMainScreen } from "./tui-main-screen.ts";
 // Utilities
 export {
 	getOsc8LinkAtColumn,
diff --git a/packages/tui/src/TuiAltScreen.ts b/packages/tui/src/tui-alt-screen.ts
similarity index 100%
rename from packages/tui/src/TuiAltScreen.ts
rename to packages/tui/src/tui-alt-screen.ts
diff --git a/packages/tui/src/TuiMainScreen.ts b/packages/tui/src/tui-main-screen.ts
similarity index 100%
rename from packages/tui/src/TuiMainScreen.ts
rename to packages/tui/src/tui-main-screen.ts
diff --git a/packages/tui/test/chat-simple.ts b/packages/tui/test/chat-simple.ts
index 03851e98b..5f2c2802e 100644
--- a/packages/tui/test/chat-simple.ts
+++ b/packages/tui/test/chat-simple.ts
@@ -8,9 +8,9 @@ import { Editor } from "../src/components/editor.ts";
 import { Loader } from "../src/components/loader.ts";
 import { Markdown } from "../src/components/markdown.ts";
 import { Text } from "../src/components/text.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { ProcessTerminal } from "../src/terminal.ts";
 import type { TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { defaultEditorTheme, defaultMarkdownTheme } from "./test-themes.ts";
 
 // Create terminal
diff --git a/packages/tui/test/editor.test.ts b/packages/tui/test/editor.test.ts
index 317c76ef9..0862e6cc8 100644
--- a/packages/tui/test/editor.test.ts
+++ b/packages/tui/test/editor.test.ts
@@ -3,8 +3,8 @@ import { describe, it } from "node:test";
 import { stripVTControlCharacters } from "node:util";
 import { type AutocompleteProvider, CombinedAutocompleteProvider } from "../src/autocomplete.ts";
 import { Editor, wordWrapLine } from "../src/components/editor.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { visibleWidth } from "../src/utils.ts";
 import { defaultEditorTheme } from "./test-themes.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
diff --git a/packages/tui/test/image-test.ts b/packages/tui/test/image-test.ts
index 4b20c2ec2..73a26862d 100644
--- a/packages/tui/test/image-test.ts
+++ b/packages/tui/test/image-test.ts
@@ -2,10 +2,10 @@ import { readFileSync } from "fs";
 import { Image } from "../src/components/image.ts";
 import { Spacer } from "../src/components/spacer.ts";
 import { Text } from "../src/components/text.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { ProcessTerminal } from "../src/terminal.ts";
 import { getCapabilities, getImageDimensions } from "../src/terminal-image.ts";
 import type { TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 
 const testImagePath = process.argv[2] || "/tmp/test-image.png";
 
diff --git a/packages/tui/test/key-tester.ts b/packages/tui/test/key-tester.ts
index b28a689c6..06373c7d7 100755
--- a/packages/tui/test/key-tester.ts
+++ b/packages/tui/test/key-tester.ts
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { matchesKey } from "../src/keys.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { ProcessTerminal } from "../src/terminal.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { truncateToWidth } from "../src/utils.ts";
 
 /**
diff --git a/packages/tui/test/markdown.test.ts b/packages/tui/test/markdown.test.ts
index 45d13d24a..0f6b61d88 100644
--- a/packages/tui/test/markdown.test.ts
+++ b/packages/tui/test/markdown.test.ts
@@ -3,9 +3,9 @@ import { afterEach, describe, it } from "node:test";
 import type { Terminal as XtermTerminalType } from "@xterm/headless";
 import { Chalk } from "chalk";
 import { Markdown } from "../src/components/markdown.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { resetCapabilitiesCache, setCapabilities } from "../src/terminal-image.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { defaultMarkdownTheme } from "./test-themes.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
diff --git a/packages/tui/test/overlay-non-capturing.test.ts b/packages/tui/test/overlay-non-capturing.test.ts
index 76d5368c3..075fed08b 100644
--- a/packages/tui/test/overlay-non-capturing.test.ts
+++ b/packages/tui/test/overlay-non-capturing.test.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, Focusable } from "../src/tui.ts";
 import { Container, type TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class StaticOverlay implements Component {
diff --git a/packages/tui/test/overlay-options.test.ts b/packages/tui/test/overlay-options.test.ts
index 45ec8dd5a..db50f5db9 100644
--- a/packages/tui/test/overlay-options.test.ts
+++ b/packages/tui/test/overlay-options.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class StaticOverlay implements Component {
diff --git a/packages/tui/test/overlay-short-content.test.ts b/packages/tui/test/overlay-short-content.test.ts
index e7fd0ccf5..3a3b423af 100644
--- a/packages/tui/test/overlay-short-content.test.ts
+++ b/packages/tui/test/overlay-short-content.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class SimpleContent implements Component {
diff --git a/packages/tui/test/tab-width.test.ts b/packages/tui/test/tab-width.test.ts
index 090d17e5b..b7396e485 100644
--- a/packages/tui/test/tab-width.test.ts
+++ b/packages/tui/test/tab-width.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { extractSegments, normalizeTerminalOutput, sliceWithWidth, visibleWidth } from "../src/utils.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
diff --git a/packages/tui/test/tui-alt-screen.test.ts b/packages/tui/test/tui-alt-screen.test.ts
index 166c6b155..17852e5c4 100644
--- a/packages/tui/test/tui-alt-screen.test.ts
+++ b/packages/tui/test/tui-alt-screen.test.ts
@@ -5,7 +5,6 @@ import { Image } from "../src/components/image.ts";
 import { ScrollView } from "../src/components/scroll-view.ts";
 import { Text } from "../src/components/text.ts";
 import { VStack } from "../src/components/v-stack.ts";
-import { TuiAltScreen } from "../src/TuiAltScreen.ts";
 import {
 	encodeKitty,
 	hyperlink,
@@ -13,6 +12,7 @@ import {
 	resetCapabilitiesCache,
 	setCapabilities,
 } from "../src/terminal-image.ts";
+import { TuiAltScreen } from "../src/tui-alt-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 const OSC133_ZONE_START = "\x1b]133;A\x07";
diff --git a/packages/tui/test/tui-cell-size-input.test.ts b/packages/tui/test/tui-cell-size-input.test.ts
index 9b6f9cac1..c0e370b4f 100644
--- a/packages/tui/test/tui-cell-size-input.test.ts
+++ b/packages/tui/test/tui-cell-size-input.test.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { getCellDimensions, resetCapabilitiesCache, setCellDimensions } from "../src/terminal-image.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class InputRecorder implements Component {
diff --git a/packages/tui/test/tui-overlay-style-leak.test.ts b/packages/tui/test/tui-overlay-style-leak.test.ts
index a1215ffdb..dc575059d 100644
--- a/packages/tui/test/tui-overlay-style-leak.test.ts
+++ b/packages/tui/test/tui-overlay-style-leak.test.ts
@@ -1,8 +1,8 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
 import type { Terminal as XtermTerminalType } from "@xterm/headless";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class StaticLines implements Component {
diff --git a/packages/tui/test/tui-render.test.ts b/packages/tui/test/tui-render.test.ts
index 6c5af86f4..ea28c7c96 100644
--- a/packages/tui/test/tui-render.test.ts
+++ b/packages/tui/test/tui-render.test.ts
@@ -5,7 +5,6 @@ import { join } from "node:path";
 import { describe, it } from "node:test";
 import type { Terminal as XtermTerminalType } from "@xterm/headless";
 import { Image } from "../src/components/image.ts";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import {
 	deleteKittyImage,
 	encodeKitty,
@@ -14,6 +13,7 @@ import {
 	setCellDimensions,
 } from "../src/terminal-image.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class TestComponent implements Component {
diff --git a/packages/tui/test/tui-shrink.test.ts b/packages/tui/test/tui-shrink.test.ts
index 62ac3760e..dac98a4ee 100644
--- a/packages/tui/test/tui-shrink.test.ts
+++ b/packages/tui/test/tui-shrink.test.ts
@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { describe, it } from "node:test";
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 import { VirtualTerminal } from "./virtual-terminal.ts";
 
 class Lines implements Component {
diff --git a/packages/tui/test/viewport-overwrite-repro.ts b/packages/tui/test/viewport-overwrite-repro.ts
index 369264c87..1826af068 100644
--- a/packages/tui/test/viewport-overwrite-repro.ts
+++ b/packages/tui/test/viewport-overwrite-repro.ts
@@ -18,9 +18,9 @@
  *   some earlier PRE-TOOL lines near the bottom are overwritten by POST-TOOL lines.
  */
 
-import { TuiMainScreen } from "../src/TuiMainScreen.ts";
 import { ProcessTerminal } from "../src/terminal.ts";
 import type { Component, TUI } from "../src/tui.ts";
+import { TuiMainScreen } from "../src/tui-main-screen.ts";
 
 const sleep = (ms: number): Promise<void> => new Promise((resolve) => setTimeout(resolve, ms));
 
diff --git a/tui-plan.md b/tui-plan.md
index fe76f8c9f..814736f8b 100644
--- a/tui-plan.md
+++ b/tui-plan.md
@@ -821,7 +821,7 @@ Likely new files:
 Likely modified files:
 
 - `packages/tui/src/tui.ts`
-- `packages/tui/src/TuiAltScreen.ts`
+- `packages/tui/src/tui-alt-screen.ts`
 - `packages/tui/src/index.ts`
 - `packages/tui/src/keybindings.ts` only if new configurable actions are required
 - `packages/coding-agent/src/modes/interactive/interactive-mode.ts`