diff --git a/src/client/WebGLFrameBuilder.ts b/src/client/WebGLFrameBuilder.ts
index b98228ef2..065fc4ebb 100644
--- a/src/client/WebGLFrameBuilder.ts
+++ b/src/client/WebGLFrameBuilder.ts
@@ -1,6 +1,6 @@
 import { Colord } from "colord";
 import { GameView } from "../core/game/GameView";
-import { uploadFrameData } from "./render/frame/upload";
+import { uploadFrameData } from "./render/frame/Upload";
 import { PlayerStatic, GameView as WebGLGameView } from "./render/gl";
 
 const PALETTE_SIZE = 4096;
diff --git a/src/client/controllers/BuildPreviewController.ts b/src/client/controllers/BuildPreviewController.ts
index f4de2d842..661a65805 100644
--- a/src/client/controllers/BuildPreviewController.ts
+++ b/src/client/controllers/BuildPreviewController.ts
@@ -23,7 +23,7 @@ import {
   MouseUpEvent,
 } from "../InputHandler";
 import { GameView as WebGLGameView, buildNukeTrajectory } from "../render/gl";
-import type { SAMInfo } from "../render/gl/utils/nuke-trajectory";
+import type { SAMInfo } from "../render/gl/utils/NukeTrajectory";
 import type { GhostPreviewData } from "../render/types";
 import { TransformHandler } from "../TransformHandler";
 import {
diff --git a/src/client/controllers/HoverHighlightController.ts b/src/client/controllers/HoverHighlightController.ts
index 9a0e35aa2..bf1f69552 100644
--- a/src/client/controllers/HoverHighlightController.ts
+++ b/src/client/controllers/HoverHighlightController.ts
@@ -13,7 +13,7 @@ import { GameView } from "../../core/game/GameView";
 import { Controller } from "../Controller";
 import { MouseMoveEvent } from "../InputHandler";
 import { GameView as WebGLGameView } from "../render/gl";
-import { OWNER_MASK } from "../render/gl/utils/tile-codec";
+import { OWNER_MASK } from "../render/gl/utils/TileCodec";
 import { TransformHandler } from "../TransformHandler";
 
 export class HoverHighlightController implements Controller {
diff --git a/src/client/render/game-constants.ts b/src/client/render/GameConstants.ts
similarity index 100%
rename from src/client/render/game-constants.ts
rename to src/client/render/GameConstants.ts
diff --git a/src/client/render/frame/railroad-cache.ts b/src/client/render/frame/RailroadCache.ts
similarity index 100%
rename from src/client/render/frame/railroad-cache.ts
rename to src/client/render/frame/RailroadCache.ts
diff --git a/src/client/render/frame/trail-manager.ts b/src/client/render/frame/TrailManager.ts
similarity index 100%
rename from src/client/render/frame/trail-manager.ts
rename to src/client/render/frame/TrailManager.ts
diff --git a/src/client/render/frame/upload.ts b/src/client/render/frame/Upload.ts
similarity index 100%
rename from src/client/render/frame/upload.ts
rename to src/client/render/frame/Upload.ts
diff --git a/src/client/render/frame/derive/alliance-clusters.ts b/src/client/render/frame/derive/AllianceClusters.ts
similarity index 100%
rename from src/client/render/frame/derive/alliance-clusters.ts
rename to src/client/render/frame/derive/AllianceClusters.ts
diff --git a/src/client/render/frame/derive/attack-rings.ts b/src/client/render/frame/derive/AttackRings.ts
similarity index 100%
rename from src/client/render/frame/derive/attack-rings.ts
rename to src/client/render/frame/derive/AttackRings.ts
diff --git a/src/client/render/frame/derive/nuke-telegraphs.ts b/src/client/render/frame/derive/NukeTelegraphs.ts
similarity index 100%
rename from src/client/render/frame/derive/nuke-telegraphs.ts
rename to src/client/render/frame/derive/NukeTelegraphs.ts
diff --git a/src/client/render/frame/derive/player-status.ts b/src/client/render/frame/derive/PlayerStatus.ts
similarity index 100%
rename from src/client/render/frame/derive/player-status.ts
rename to src/client/render/frame/derive/PlayerStatus.ts
diff --git a/src/client/render/frame/derive/relation-matrix.ts b/src/client/render/frame/derive/RelationMatrix.ts
similarity index 100%
rename from src/client/render/frame/derive/relation-matrix.ts
rename to src/client/render/frame/derive/RelationMatrix.ts
diff --git a/src/client/render/frame/index.ts b/src/client/render/frame/index.ts
index fcac13180..ddcb4fa55 100644
--- a/src/client/render/frame/index.ts
+++ b/src/client/render/frame/index.ts
@@ -2,19 +2,19 @@
 export type { FrameData } from "../types";
 
 // Shared derive functions
-export { computeAllianceClusters } from "./derive/alliance-clusters";
+export { computeAllianceClusters } from "./derive/AllianceClusters";
 export {
   extractAttackRings,
   extractAttackRingsFromIds,
-} from "./derive/attack-rings";
+} from "./derive/AttackRings";
 export {
   extractNukeTelegraphs,
   extractNukeTelegraphsFromIds,
-} from "./derive/nuke-telegraphs";
-export { computePlayerStatus } from "./derive/player-status";
-export { buildRelationMatrix, buildTeamMap } from "./derive/relation-matrix";
+} from "./derive/NukeTelegraphs";
+export { computePlayerStatus } from "./derive/PlayerStatus";
+export { buildRelationMatrix, buildTeamMap } from "./derive/RelationMatrix";
 
 // Upload
-export type { RelationMatrixResult } from "./derive/relation-matrix";
-export { uploadFrameData } from "./upload";
-export type { FrameUploadTarget, UploadOptions } from "./upload";
+export type { RelationMatrixResult } from "./derive/RelationMatrix";
+export { uploadFrameData } from "./Upload";
+export type { FrameUploadTarget, UploadOptions } from "./Upload";
diff --git a/src/client/render/gl/camera.ts b/src/client/render/gl/Camera.ts
similarity index 100%
rename from src/client/render/gl/camera.ts
rename to src/client/render/gl/Camera.ts
diff --git a/src/client/render/gl/dynamic-buffer.ts b/src/client/render/gl/DynamicBuffer.ts
similarity index 100%
rename from src/client/render/gl/dynamic-buffer.ts
rename to src/client/render/gl/DynamicBuffer.ts
diff --git a/src/client/render/gl/events.ts b/src/client/render/gl/Events.ts
similarity index 100%
rename from src/client/render/gl/events.ts
rename to src/client/render/gl/Events.ts
diff --git a/src/client/render/gl/game-view.ts b/src/client/render/gl/GameView.ts
similarity index 98%
rename from src/client/render/gl/game-view.ts
rename to src/client/render/gl/GameView.ts
index 21562ce81..d0f68b4fa 100644
--- a/src/client/render/gl/game-view.ts
+++ b/src/client/render/gl/GameView.ts
@@ -28,10 +28,10 @@ import type {
   GameViewEventMap,
   GameViewEventType,
   RadialMenuItem,
-} from "./events";
-import type { SpawnCenter } from "./passes/spawn-overlay-pass";
-import type { RenderSettings } from "./render-settings";
-import { GPURenderer } from "./renderer";
+} from "./Events";
+import type { SpawnCenter } from "./passes/SpawnOverlayPass";
+import { GPURenderer } from "./Renderer";
+import type { RenderSettings } from "./RenderSettings";
 
 export class GameView {
   private renderer: GPURenderer;
diff --git a/src/client/render/gl/render-settings.ts b/src/client/render/gl/RenderSettings.ts
similarity index 100%
rename from src/client/render/gl/render-settings.ts
rename to src/client/render/gl/RenderSettings.ts
diff --git a/src/client/render/gl/renderer.ts b/src/client/render/gl/Renderer.ts
similarity index 94%
rename from src/client/render/gl/renderer.ts
rename to src/client/render/gl/Renderer.ts
index d71521712..c174aa32d 100644
--- a/src/client/render/gl/renderer.ts
+++ b/src/client/render/gl/Renderer.ts
@@ -25,52 +25,52 @@ import type {
   TilePair,
   UnitState,
 } from "../types";
-import { Camera } from "./camera";
-import type { RadialMenuItem } from "./events";
-import { BarPass } from "./passes/bar-pass";
-import { BorderComputePass } from "./passes/border-compute-pass";
-import { BorderStampPass } from "./passes/border-stamp-pass";
-import { ConquestPopupPass } from "./passes/conquest-popup-pass";
-import { CoordinateGridPass } from "./passes/coordinate-grid-pass";
-import { CrosshairPass } from "./passes/crosshair-pass";
-import { FalloutBloomPass } from "./passes/fallout-bloom-pass";
-import { FalloutLightPass } from "./passes/fallout-light-pass";
+import { Camera } from "./Camera";
+import type { RadialMenuItem } from "./Events";
+import { BarPass } from "./passes/BarPass";
+import { BorderComputePass } from "./passes/BorderComputePass";
+import { BorderStampPass } from "./passes/BorderStampPass";
+import { ConquestPopupPass } from "./passes/ConquestPopupPass";
+import { CoordinateGridPass } from "./passes/CoordinateGridPass";
+import { CrosshairPass } from "./passes/CrosshairPass";
+import { FalloutBloomPass } from "./passes/FalloutBloomPass";
+import { FalloutLightPass } from "./passes/FalloutLightPass";
 import { FxPass } from "./passes/fx-pass";
-import { LightmapPass } from "./passes/lightmap-pass";
-import { MoveIndicatorPass } from "./passes/move-indicator-pass";
+import { LightmapPass } from "./passes/LightmapPass";
+import { MoveIndicatorPass } from "./passes/MoveIndicatorPass";
 import { NamePass } from "./passes/name-pass";
-import { NightCompositePass } from "./passes/night-composite-pass";
-import { NukeTelegraphPass } from "./passes/nuke-telegraph-pass";
-import { NukeTrajectoryPass } from "./passes/nuke-trajectory-pass";
-import { PointLightPass } from "./passes/point-light-pass";
-import { RadialMenuPass } from "./passes/radial-menu-pass";
-import { RailroadPass } from "./passes/railroad-pass";
-import { RangeCirclePass } from "./passes/range-circle-pass";
-import { SAMRadiusPass } from "./passes/sam-radius-pass";
-import { SelectionBoxPass } from "./passes/selection-box-pass";
-import type { SpawnCenter } from "./passes/spawn-overlay-pass";
-import { SpawnOverlayPass } from "./passes/spawn-overlay-pass";
-import { StructureLevelPass } from "./passes/structure-level-pass";
-import { StructurePass } from "./passes/structure-pass";
-import { TerrainPass } from "./passes/terrain-pass";
-import { TerritoryPass } from "./passes/territory-pass";
-import { TrailPass } from "./passes/trail-pass";
-import { UnitPass } from "./passes/unit-pass";
-import { createRenderSettings, type RenderSettings } from "./render-settings";
-import { AffiliationPalette } from "./utils/affiliation";
-import { buildTerrainRGBA, getPaletteSize } from "./utils/color-utils";
+import { NightCompositePass } from "./passes/NightCompositePass";
+import { NukeTelegraphPass } from "./passes/NukeTelegraphPass";
+import { NukeTrajectoryPass } from "./passes/NukeTrajectoryPass";
+import { PointLightPass } from "./passes/PointLightPass";
+import { RadialMenuPass } from "./passes/RadialMenuPass";
+import { RailroadPass } from "./passes/RailroadPass";
+import { RangeCirclePass } from "./passes/RangeCirclePass";
+import { SAMRadiusPass } from "./passes/SamRadiusPass";
+import { SelectionBoxPass } from "./passes/SelectionBoxPass";
+import type { SpawnCenter } from "./passes/SpawnOverlayPass";
+import { SpawnOverlayPass } from "./passes/SpawnOverlayPass";
+import { StructureLevelPass } from "./passes/StructureLevelPass";
+import { StructurePass } from "./passes/StructurePass";
+import { TerrainPass } from "./passes/TerrainPass";
+import { TerritoryPass } from "./passes/TerritoryPass";
+import { TrailPass } from "./passes/TrailPass";
+import { UnitPass } from "./passes/UnitPass";
+import { createRenderSettings, type RenderSettings } from "./RenderSettings";
+import { AffiliationPalette } from "./utils/Affiliation";
+import { buildTerrainRGBA, getPaletteSize } from "./utils/ColorUtils";
 import {
   createTexture2D,
   toScreen,
   toTarget,
   type RenderTarget,
-} from "./utils/gl-utils";
+} from "./utils/GlUtils";
 import {
   createGPUResources,
   disposeGPUResources,
   type GPUResources,
-} from "./utils/gpu-resources";
-import { HeatManager } from "./utils/heat-manager";
+} from "./utils/GpuResources";
+import { HeatManager } from "./utils/HeatManager";
 
 /** Ghost types that trigger SAM radius overlay (matches upstream SAMRadiusLayer). */
 const SAM_RADIUS_GHOST_TYPES = new Set([
@@ -166,7 +166,7 @@ export class GPURenderer {
   // Warship selection — supports any number of selections.
   private selectedUnitIds: number[] = [];
   /** Reusable scratch buffer of {x,y,r,g,b} for the selection-box pass. */
-  private readonly selectionBoxEntries: import("./passes/selection-box-pass").SelectionEntry[] =
+  private readonly selectionBoxEntries: import("./passes/SelectionBoxPass").SelectionEntry[] =
     [];
 
   constructor(
diff --git a/src/client/render/gl/settings-utils.ts b/src/client/render/gl/SettingsUtils.ts
similarity index 100%
rename from src/client/render/gl/settings-utils.ts
rename to src/client/render/gl/SettingsUtils.ts
diff --git a/src/client/render/gl/debug/config-prop.ts b/src/client/render/gl/debug/ConfigProp.ts
similarity index 100%
rename from src/client/render/gl/debug/config-prop.ts
rename to src/client/render/gl/debug/ConfigProp.ts
diff --git a/src/client/render/gl/debug/folder.ts b/src/client/render/gl/debug/Folder.ts
similarity index 87%
rename from src/client/render/gl/debug/folder.ts
rename to src/client/render/gl/debug/Folder.ts
index 97e9e2077..69bb0e44b 100644
--- a/src/client/render/gl/debug/folder.ts
+++ b/src/client/render/gl/debug/Folder.ts
@@ -1,4 +1,4 @@
-import type { ConfigProp } from "./config-prop";
+import type { ConfigProp } from "./ConfigProp";
 
 export interface FolderNode {
   kind: "folder";
diff --git a/src/client/render/gl/debug/layout.ts b/src/client/render/gl/debug/Layout.ts
similarity index 98%
rename from src/client/render/gl/debug/layout.ts
rename to src/client/render/gl/debug/Layout.ts
index e94f2ef9b..67077228e 100644
--- a/src/client/render/gl/debug/layout.ts
+++ b/src/client/render/gl/debug/Layout.ts
@@ -1,10 +1,10 @@
-import type { RenderSettings } from "../render-settings";
-import type { DebugNode } from "./folder";
-import { folder } from "./folder";
-import { color } from "./props/color";
-import { select } from "./props/select";
-import { slider } from "./props/slider";
-import { toggle } from "./props/toggle";
+import type { RenderSettings } from "../RenderSettings";
+import type { DebugNode } from "./Folder";
+import { folder } from "./Folder";
+import { color } from "./props/Color";
+import { select } from "./props/Select";
+import { slider } from "./props/Slider";
+import { toggle } from "./props/Toggle";
 
 export function buildTree(s: RenderSettings, d: RenderSettings): DebugNode[] {
   return [
diff --git a/src/client/render/gl/debug/tree.ts b/src/client/render/gl/debug/Tree.ts
similarity index 85%
rename from src/client/render/gl/debug/tree.ts
rename to src/client/render/gl/debug/Tree.ts
index e7caa6995..8b5a06a23 100644
--- a/src/client/render/gl/debug/tree.ts
+++ b/src/client/render/gl/debug/Tree.ts
@@ -1,6 +1,6 @@
 import GUI from "lil-gui";
-import type { ConfigProp } from "./config-prop";
-import type { DebugNode, FolderNode } from "./folder";
+import type { ConfigProp } from "./ConfigProp";
+import type { DebugNode, FolderNode } from "./Folder";
 
 /** Walk the debug tree, drawing each node onto the GUI. Returns all leaf props. */
 export function walkTree(nodes: DebugNode[], parent: GUI): ConfigProp[] {
diff --git a/src/client/render/gl/debug/wiring.ts b/src/client/render/gl/debug/Wiring.ts
similarity index 96%
rename from src/client/render/gl/debug/wiring.ts
rename to src/client/render/gl/debug/Wiring.ts
index 1af7ef0ae..9511ac9c4 100644
--- a/src/client/render/gl/debug/wiring.ts
+++ b/src/client/render/gl/debug/Wiring.ts
@@ -1,8 +1,8 @@
 import GUI, { FunctionController } from "lil-gui";
-import type { RenderSettings } from "../render-settings";
-import { createRenderSettings, dumpSettings } from "../render-settings";
-import { deepAssign } from "../settings-utils";
-import type { ConfigProp } from "./config-prop";
+import type { RenderSettings } from "../RenderSettings";
+import { createRenderSettings, dumpSettings } from "../RenderSettings";
+import { deepAssign } from "../SettingsUtils";
+import type { ConfigProp } from "./ConfigProp";
 
 // ---------------------------------------------------------------------------
 // Draggable title bar
diff --git a/src/client/render/gl/debug/index.ts b/src/client/render/gl/debug/index.ts
index 10077477d..7a414c464 100644
--- a/src/client/render/gl/debug/index.ts
+++ b/src/client/render/gl/debug/index.ts
@@ -1,9 +1,9 @@
 import GUI from "lil-gui";
-import type { RenderSettings } from "../render-settings";
-import { createRenderSettings } from "../render-settings";
-import { buildTree } from "./layout";
-import { walkTree } from "./tree";
-import { makeDraggable, wireActions, wireModifiedIndicators } from "./wiring";
+import type { RenderSettings } from "../RenderSettings";
+import { createRenderSettings } from "../RenderSettings";
+import { buildTree } from "./Layout";
+import { walkTree } from "./Tree";
+import { makeDraggable, wireActions, wireModifiedIndicators } from "./Wiring";
 
 export function createDebugGui(
   settings: RenderSettings,
diff --git a/src/client/render/gl/debug/props/color.ts b/src/client/render/gl/debug/props/Color.ts
similarity index 97%
rename from src/client/render/gl/debug/props/color.ts
rename to src/client/render/gl/debug/props/Color.ts
index 095072a22..cfcebc4c4 100644
--- a/src/client/render/gl/debug/props/color.ts
+++ b/src/client/render/gl/debug/props/Color.ts
@@ -1,6 +1,6 @@
 import type GUI from "lil-gui";
 import type { ColorController, Controller } from "lil-gui";
-import type { ConfigProp } from "../config-prop";
+import type { ConfigProp } from "../ConfigProp";
 
 export function color<T extends Record<string, unknown>>(
   target: T,
diff --git a/src/client/render/gl/debug/props/select.ts b/src/client/render/gl/debug/props/Select.ts
similarity index 93%
rename from src/client/render/gl/debug/props/select.ts
rename to src/client/render/gl/debug/props/Select.ts
index 34ac0a893..12f6289ef 100644
--- a/src/client/render/gl/debug/props/select.ts
+++ b/src/client/render/gl/debug/props/Select.ts
@@ -1,6 +1,6 @@
 import type GUI from "lil-gui";
 import type { Controller } from "lil-gui";
-import type { ConfigProp } from "../config-prop";
+import type { ConfigProp } from "../ConfigProp";
 
 export function select<T extends Record<string, unknown>>(
   target: T,
diff --git a/src/client/render/gl/debug/props/slider.ts b/src/client/render/gl/debug/props/Slider.ts
similarity index 93%
rename from src/client/render/gl/debug/props/slider.ts
rename to src/client/render/gl/debug/props/Slider.ts
index 016591dc4..d9b164a40 100644
--- a/src/client/render/gl/debug/props/slider.ts
+++ b/src/client/render/gl/debug/props/Slider.ts
@@ -1,6 +1,6 @@
 import type GUI from "lil-gui";
 import type { Controller } from "lil-gui";
-import type { ConfigProp } from "../config-prop";
+import type { ConfigProp } from "../ConfigProp";
 
 export function slider<T extends Record<string, unknown>>(
   target: T,
diff --git a/src/client/render/gl/debug/props/toggle.ts b/src/client/render/gl/debug/props/Toggle.ts
similarity index 93%
rename from src/client/render/gl/debug/props/toggle.ts
rename to src/client/render/gl/debug/props/Toggle.ts
index 0429fbefe..ec6fb03f7 100644
--- a/src/client/render/gl/debug/props/toggle.ts
+++ b/src/client/render/gl/debug/props/Toggle.ts
@@ -1,6 +1,6 @@
 import type GUI from "lil-gui";
 import type { Controller } from "lil-gui";
-import type { ConfigProp } from "../config-prop";
+import type { ConfigProp } from "../ConfigProp";
 
 export function toggle<T extends Record<string, unknown>>(
   target: T,
diff --git a/src/client/render/gl/index.ts b/src/client/render/gl/index.ts
index 2b0942f03..3f30aab33 100644
--- a/src/client/render/gl/index.ts
+++ b/src/client/render/gl/index.ts
@@ -7,15 +7,15 @@ export type {
   MapScrollEvent,
   RadialMenuItem,
   RadialMenuSelectEvent,
-} from "./events";
-export { GameView } from "./game-view";
-export type { SpawnCenter } from "./passes/spawn-overlay-pass";
-export { createRenderSettings, dumpSettings } from "./render-settings";
-export type { RenderSettings } from "./render-settings";
-export { deepAssign, deepDiff } from "./settings-utils";
-export { buildTerrainRGBA, getPaletteSize } from "./utils/color-utils";
-export { buildNukeTrajectory, samRange } from "./utils/nuke-trajectory";
-export type { SAMInfo } from "./utils/nuke-trajectory";
+} from "./Events";
+export { GameView } from "./GameView";
+export type { SpawnCenter } from "./passes/SpawnOverlayPass";
+export { createRenderSettings, dumpSettings } from "./RenderSettings";
+export type { RenderSettings } from "./RenderSettings";
+export { deepAssign, deepDiff } from "./SettingsUtils";
+export { buildTerrainRGBA, getPaletteSize } from "./utils/ColorUtils";
+export { buildNukeTrajectory, samRange } from "./utils/NukeTrajectory";
+export type { SAMInfo } from "./utils/NukeTrajectory";
 
 // Re-export shared types used in the public API
 export type {
diff --git a/src/client/render/gl/passes/bar-pass.ts b/src/client/render/gl/passes/BarPass.ts
similarity index 98%
rename from src/client/render/gl/passes/bar-pass.ts
rename to src/client/render/gl/passes/BarPass.ts
index 8f14c8466..7e1de3800 100644
--- a/src/client/render/gl/passes/bar-pass.ts
+++ b/src/client/render/gl/passes/BarPass.ts
@@ -15,11 +15,11 @@ import {
   DELETION_MARK_DURATION,
   missileReadiness,
   WARSHIP_MAX_HEALTH,
-} from "../../game-constants";
+} from "../../GameConstants";
 import type { RendererConfig, UnitState } from "../../types";
 import { UT_MISSILE_SILO, UT_SAM_LAUNCHER } from "../../types";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
 
 import barFragSrc from "../shaders/bar/bar.frag.glsl?raw";
 import barVertSrc from "../shaders/bar/bar.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/border-compute-pass.ts b/src/client/render/gl/passes/BorderComputePass.ts
similarity index 98%
rename from src/client/render/gl/passes/border-compute-pass.ts
rename to src/client/render/gl/passes/BorderComputePass.ts
index 625aefd00..e6e0910e5 100644
--- a/src/client/render/gl/passes/border-compute-pass.ts
+++ b/src/client/render/gl/passes/BorderComputePass.ts
@@ -12,7 +12,7 @@
  * computed once here via an N-tile Chebyshev radius expansion.
  */
 
-import type { RenderSettings } from "../render-settings";
+import type { RenderSettings } from "../RenderSettings";
 import borderComputeFragSrc from "../shaders/border-compute/border-compute.frag.glsl?raw";
 import fullscreenNoUvVertSrc from "../shaders/shared/fullscreen-no-uv.vert.glsl?raw";
 import {
@@ -20,8 +20,8 @@ import {
   createProgram,
   createTexture2D,
   shaderSrc,
-} from "../utils/gl-utils";
-import { TILE_DEFINES } from "../utils/tile-codec";
+} from "../utils/GlUtils";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 const MAX_DEFENSE_POSTS = 64;
 
diff --git a/src/client/render/gl/passes/border-stamp-pass.ts b/src/client/render/gl/passes/BorderStampPass.ts
similarity index 96%
rename from src/client/render/gl/passes/border-stamp-pass.ts
rename to src/client/render/gl/passes/BorderStampPass.ts
index 4d247c114..9334a3b92 100644
--- a/src/client/render/gl/passes/border-stamp-pass.ts
+++ b/src/client/render/gl/passes/BorderStampPass.ts
@@ -6,10 +6,10 @@
  * from the BorderComputePass RGBA8 buffer.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { getPaletteSize } from "../utils/color-utils";
-import { createMapQuad, createProgram, shaderSrc } from "../utils/gl-utils";
-import { TILE_DEFINES } from "../utils/tile-codec";
+import type { RenderSettings } from "../RenderSettings";
+import { getPaletteSize } from "../utils/ColorUtils";
+import { createMapQuad, createProgram, shaderSrc } from "../utils/GlUtils";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 import borderStampFragSrc from "../shaders/day-night/border-stamp.frag.glsl?raw";
 import borderStampVertSrc from "../shaders/day-night/border-stamp.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/conquest-popup-pass.ts b/src/client/render/gl/passes/ConquestPopupPass.ts
similarity index 96%
rename from src/client/render/gl/passes/conquest-popup-pass.ts
rename to src/client/render/gl/passes/ConquestPopupPass.ts
index 6af9909d9..ad8959bdd 100644
--- a/src/client/render/gl/passes/conquest-popup-pass.ts
+++ b/src/client/render/gl/passes/ConquestPopupPass.ts
@@ -7,13 +7,13 @@
  */
 
 import type { BonusEvent, ConquestFx } from "../../types";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
-import type { GlyphTables } from "./name-pass/atlas-data";
-import { buildGlyphTables, parseAtlasData } from "./name-pass/atlas-data";
-import { buildGlyphMetricsTex } from "./name-pass/data-textures";
-import { layoutString } from "./name-pass/text-layout";
-import { CHAR_RANGE, MAX_CHARS } from "./name-pass/types";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
+import type { GlyphTables } from "./name-pass/AtlasData";
+import { buildGlyphTables, parseAtlasData } from "./name-pass/AtlasData";
+import { buildGlyphMetricsTex } from "./name-pass/DataTextures";
+import { layoutString } from "./name-pass/TextLayout";
+import { CHAR_RANGE, MAX_CHARS } from "./name-pass/Types";
 
 import { assetUrl } from "src/core/AssetUrls";
 import fragSrc from "../shaders/conquest-popup/conquest-popup.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/coordinate-grid-pass.ts b/src/client/render/gl/passes/CoordinateGridPass.ts
similarity index 97%
rename from src/client/render/gl/passes/coordinate-grid-pass.ts
rename to src/client/render/gl/passes/CoordinateGridPass.ts
index b9a9f0e2f..5993a02d6 100644
--- a/src/client/render/gl/passes/coordinate-grid-pass.ts
+++ b/src/client/render/gl/passes/CoordinateGridPass.ts
@@ -6,8 +6,8 @@
  * the upstream game's CoordinateGridLayer.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { createMapQuad, createProgram } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createMapQuad, createProgram } from "../utils/GlUtils";
 
 import gridFragSrc from "../shaders/grid/grid.frag.glsl?raw";
 import overlayVertSrc from "../shaders/map-overlay/overlay.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/crosshair-pass.ts b/src/client/render/gl/passes/CrosshairPass.ts
similarity index 98%
rename from src/client/render/gl/passes/crosshair-pass.ts
rename to src/client/render/gl/passes/CrosshairPass.ts
index 9d07fe370..77cef1c2b 100644
--- a/src/client/render/gl/passes/crosshair-pass.ts
+++ b/src/client/render/gl/passes/CrosshairPass.ts
@@ -8,7 +8,7 @@
 
 import type { GhostPreviewData } from "../../types";
 import { UT_MIRV, UT_WARSHIP } from "../../types";
-import { createProgram } from "../utils/gl-utils";
+import { createProgram } from "../utils/GlUtils";
 
 import fragSrc from "../shaders/crosshair/crosshair.frag.glsl?raw";
 import vertSrc from "../shaders/crosshair/crosshair.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fallout-bloom-pass.ts b/src/client/render/gl/passes/FalloutBloomPass.ts
similarity index 98%
rename from src/client/render/gl/passes/fallout-bloom-pass.ts
rename to src/client/render/gl/passes/FalloutBloomPass.ts
index 62c6b27f7..dbbc5fdbf 100644
--- a/src/client/render/gl/passes/fallout-bloom-pass.ts
+++ b/src/client/render/gl/passes/FalloutBloomPass.ts
@@ -9,15 +9,15 @@
  * Heat management is handled by HeatManager (shared with LightmapPass).
  */
 
-import type { RenderSettings } from "../render-settings";
+import type { RenderSettings } from "../RenderSettings";
 import {
   createFullscreenQuad,
   createMapQuad,
   createProgram,
   shaderSrc,
-} from "../utils/gl-utils";
-import type { HeatManager } from "../utils/heat-manager";
-import { TILE_DEFINES } from "../utils/tile-codec";
+} from "../utils/GlUtils";
+import type { HeatManager } from "../utils/HeatManager";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 import compositeFragSrc from "../shaders/fallout-bloom/composite.frag.glsl?raw";
 import compositeVertSrc from "../shaders/fallout-bloom/composite.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fallout-light-pass.ts b/src/client/render/gl/passes/FalloutLightPass.ts
similarity index 97%
rename from src/client/render/gl/passes/fallout-light-pass.ts
rename to src/client/render/gl/passes/FalloutLightPass.ts
index 15828cfe5..67d065d9b 100644
--- a/src/client/render/gl/passes/fallout-light-pass.ts
+++ b/src/client/render/gl/passes/FalloutLightPass.ts
@@ -6,15 +6,15 @@
  *   2. Composite into the target lightmap FBO via camera-projected map quad (additive)
  */
 
-import type { RenderSettings } from "../render-settings";
+import type { RenderSettings } from "../RenderSettings";
 import {
   createFullscreenQuad,
   createMapQuad,
   createProgram,
   shaderSrc,
-} from "../utils/gl-utils";
-import type { HeatManager } from "../utils/heat-manager";
-import { TILE_DEFINES } from "../utils/tile-codec";
+} from "../utils/GlUtils";
+import type { HeatManager } from "../utils/HeatManager";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 import falloutCompositeFragSrc from "../shaders/day-night/fallout-composite.frag.glsl?raw";
 import falloutCompositeVertSrc from "../shaders/day-night/fallout-composite.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/lightmap-pass.ts b/src/client/render/gl/passes/LightmapPass.ts
similarity index 95%
rename from src/client/render/gl/passes/lightmap-pass.ts
rename to src/client/render/gl/passes/LightmapPass.ts
index 8107abe6e..8a74a57f2 100644
--- a/src/client/render/gl/passes/lightmap-pass.ts
+++ b/src/client/render/gl/passes/LightmapPass.ts
@@ -5,10 +5,10 @@
  * Delegates light rendering to PointLightPass and FalloutLightPass.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { createFullscreenQuad, createProgram } from "../utils/gl-utils";
-import type { FalloutLightPass } from "./fallout-light-pass";
-import type { PointLightPass } from "./point-light-pass";
+import type { RenderSettings } from "../RenderSettings";
+import { createFullscreenQuad, createProgram } from "../utils/GlUtils";
+import type { FalloutLightPass } from "./FalloutLightPass";
+import type { PointLightPass } from "./PointLightPass";
 
 import blurFragSrc from "../shaders/shared/blur.frag.glsl?raw";
 import fullscreenVertSrc from "../shaders/shared/fullscreen.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/move-indicator-pass.ts b/src/client/render/gl/passes/MoveIndicatorPass.ts
similarity index 97%
rename from src/client/render/gl/passes/move-indicator-pass.ts
rename to src/client/render/gl/passes/MoveIndicatorPass.ts
index 42c8ac30b..0279fbb3e 100644
--- a/src/client/render/gl/passes/move-indicator-pass.ts
+++ b/src/client/render/gl/passes/MoveIndicatorPass.ts
@@ -4,8 +4,8 @@
  * but rendered via SDF in a fragment shader.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
 
 import fragSrc from "../shaders/move-indicator/move-indicator.frag.glsl?raw";
 import vertSrc from "../shaders/move-indicator/move-indicator.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/night-composite-pass.ts b/src/client/render/gl/passes/NightCompositePass.ts
similarity index 95%
rename from src/client/render/gl/passes/night-composite-pass.ts
rename to src/client/render/gl/passes/NightCompositePass.ts
index a8616fafb..13e956e68 100644
--- a/src/client/render/gl/passes/night-composite-pass.ts
+++ b/src/client/render/gl/passes/NightCompositePass.ts
@@ -9,8 +9,8 @@
  * multiplication by ~1.0 — so the pass runs continuously with no threshold.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { createFullscreenQuad, createProgram } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createFullscreenQuad, createProgram } from "../utils/GlUtils";
 
 import compositeFragSrc from "../shaders/day-night/composite.frag.glsl?raw";
 import fullscreenVertSrc from "../shaders/shared/fullscreen.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/nuke-telegraph-pass.ts b/src/client/render/gl/passes/NukeTelegraphPass.ts
similarity index 96%
rename from src/client/render/gl/passes/nuke-telegraph-pass.ts
rename to src/client/render/gl/passes/NukeTelegraphPass.ts
index 17ee6a419..819ebf8b5 100644
--- a/src/client/render/gl/passes/nuke-telegraph-pass.ts
+++ b/src/client/render/gl/passes/NukeTelegraphPass.ts
@@ -7,9 +7,9 @@
  */
 
 import type { NukeTelegraphData } from "../../types";
-import { DynamicInstanceBuffer } from "../dynamic-buffer";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
+import { DynamicInstanceBuffer } from "../DynamicBuffer";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
 
 import fragSrc from "../shaders/nuke-telegraph/nuke-telegraph.frag.glsl?raw";
 import vertSrc from "../shaders/nuke-telegraph/nuke-telegraph.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/nuke-trajectory-pass.ts b/src/client/render/gl/passes/NukeTrajectoryPass.ts
similarity index 99%
rename from src/client/render/gl/passes/nuke-trajectory-pass.ts
rename to src/client/render/gl/passes/NukeTrajectoryPass.ts
index cb661bf7e..328876677 100644
--- a/src/client/render/gl/passes/nuke-trajectory-pass.ts
+++ b/src/client/render/gl/passes/NukeTrajectoryPass.ts
@@ -11,8 +11,8 @@
  */
 
 import type { NukeTrajectoryData } from "../../types";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
 
 import markerFragSrc from "../shaders/nuke-trajectory/nuke-trajectory-marker.frag.glsl?raw";
 import markerVertSrc from "../shaders/nuke-trajectory/nuke-trajectory-marker.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/point-light-pass.ts b/src/client/render/gl/passes/PointLightPass.ts
similarity index 98%
rename from src/client/render/gl/passes/point-light-pass.ts
rename to src/client/render/gl/passes/PointLightPass.ts
index bbe535fac..bbc0abea5 100644
--- a/src/client/render/gl/passes/point-light-pass.ts
+++ b/src/client/render/gl/passes/PointLightPass.ts
@@ -22,8 +22,8 @@ import {
   UT_TRANSPORT,
   UT_WARSHIP,
 } from "../../types";
-import type { RenderSettings } from "../render-settings";
-import { createProgram, shaderSrc } from "../utils/gl-utils";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram, shaderSrc } from "../utils/GlUtils";
 
 import lightFragSrc from "../shaders/day-night/light.frag.glsl?raw";
 import lightVertSrc from "../shaders/day-night/light.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/radial-menu-pass.ts b/src/client/render/gl/passes/RadialMenuPass.ts
similarity index 99%
rename from src/client/render/gl/passes/radial-menu-pass.ts
rename to src/client/render/gl/passes/RadialMenuPass.ts
index b394550ed..2518298ec 100644
--- a/src/client/render/gl/passes/radial-menu-pass.ts
+++ b/src/client/render/gl/passes/RadialMenuPass.ts
@@ -12,8 +12,8 @@
  *   3. Icons: instanced quads sampling the emoji atlas
  */
 
-import type { RadialMenuItem } from "../events";
-import { createProgram } from "../utils/gl-utils";
+import type { RadialMenuItem } from "../Events";
+import { createProgram } from "../utils/GlUtils";
 
 import arcFragSrc from "../shaders/radial-menu/arcs.frag.glsl?raw";
 import arcVertSrc from "../shaders/radial-menu/arcs.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/railroad-pass.ts b/src/client/render/gl/passes/RailroadPass.ts
similarity index 98%
rename from src/client/render/gl/passes/railroad-pass.ts
rename to src/client/render/gl/passes/RailroadPass.ts
index 1892f8d66..4c3b89a43 100644
--- a/src/client/render/gl/passes/railroad-pass.ts
+++ b/src/client/render/gl/passes/RailroadPass.ts
@@ -17,17 +17,17 @@
  */
 
 import type { GhostPreviewData } from "../../types";
-import type { RenderSettings } from "../render-settings";
+import type { RenderSettings } from "../RenderSettings";
 import overlayVertSrc from "../shaders/map-overlay/overlay.vert.glsl?raw";
 import railroadFragSrc from "../shaders/railroad/railroad.frag.glsl?raw";
-import { getPaletteSize } from "../utils/color-utils";
+import { getPaletteSize } from "../utils/ColorUtils";
 import {
   createMapQuad,
   createProgram,
   createTexture2D,
   shaderSrc,
-} from "../utils/gl-utils";
-import { TILE_DEFINES } from "../utils/tile-codec";
+} from "../utils/GlUtils";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 // ---------------------------------------------------------------------------
 // Rail orientation (0-5) → texture value (1-6, 0=none)
diff --git a/src/client/render/gl/passes/range-circle-pass.ts b/src/client/render/gl/passes/RangeCirclePass.ts
similarity index 97%
rename from src/client/render/gl/passes/range-circle-pass.ts
rename to src/client/render/gl/passes/RangeCirclePass.ts
index 33241e6cc..5fb38e805 100644
--- a/src/client/render/gl/passes/range-circle-pass.ts
+++ b/src/client/render/gl/passes/RangeCirclePass.ts
@@ -7,7 +7,7 @@
  */
 
 import type { GhostPreviewData } from "../../types";
-import { createProgram } from "../utils/gl-utils";
+import { createProgram } from "../utils/GlUtils";
 
 import fragSrc from "../shaders/range-circle/range-circle.frag.glsl?raw";
 import vertSrc from "../shaders/range-circle/range-circle.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/sam-radius-pass.ts b/src/client/render/gl/passes/SamRadiusPass.ts
similarity index 98%
rename from src/client/render/gl/passes/sam-radius-pass.ts
rename to src/client/render/gl/passes/SamRadiusPass.ts
index b5cf0cc98..e4fd45a32 100644
--- a/src/client/render/gl/passes/sam-radius-pass.ts
+++ b/src/client/render/gl/passes/SamRadiusPass.ts
@@ -15,10 +15,10 @@
 
 import type { UnitState } from "../../types";
 import { UT_SAM_LAUNCHER } from "../../types";
-import { DynamicInstanceBuffer } from "../dynamic-buffer";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
-import { samRange } from "../utils/nuke-trajectory";
+import { DynamicInstanceBuffer } from "../DynamicBuffer";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
+import { samRange } from "../utils/NukeTrajectory";
 
 import fragSrc from "../shaders/sam-radius/sam-radius.frag.glsl?raw";
 import vertSrc from "../shaders/sam-radius/sam-radius.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/selection-box-pass.ts b/src/client/render/gl/passes/SelectionBoxPass.ts
similarity index 98%
rename from src/client/render/gl/passes/selection-box-pass.ts
rename to src/client/render/gl/passes/SelectionBoxPass.ts
index 2e74c475b..28bb93036 100644
--- a/src/client/render/gl/passes/selection-box-pass.ts
+++ b/src/client/render/gl/passes/SelectionBoxPass.ts
@@ -6,7 +6,7 @@
  * this ever becomes hot we could swap to instanced rendering.
  */
 
-import { createProgram } from "../utils/gl-utils";
+import { createProgram } from "../utils/GlUtils";
 
 import fragSrc from "../shaders/selection-box/selection-box.frag.glsl?raw";
 import vertSrc from "../shaders/selection-box/selection-box.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/spawn-overlay-pass.ts b/src/client/render/gl/passes/SpawnOverlayPass.ts
similarity index 97%
rename from src/client/render/gl/passes/spawn-overlay-pass.ts
rename to src/client/render/gl/passes/SpawnOverlayPass.ts
index 7d9936e12..99f446d55 100644
--- a/src/client/render/gl/passes/spawn-overlay-pass.ts
+++ b/src/client/render/gl/passes/SpawnOverlayPass.ts
@@ -11,9 +11,9 @@
  * effects in tile-space coordinates.
  */
 
-import type { RenderSettings } from "../render-settings";
-import { createMapQuad, createProgram, shaderSrc } from "../utils/gl-utils";
-import { TILE_DEFINES } from "../utils/tile-codec";
+import type { RenderSettings } from "../RenderSettings";
+import { createMapQuad, createProgram, shaderSrc } from "../utils/GlUtils";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 import overlayVertSrc from "../shaders/map-overlay/overlay.vert.glsl?raw";
 import spawnFragSrc from "../shaders/spawn-overlay/spawn-overlay.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/structure-level-pass.ts b/src/client/render/gl/passes/StructureLevelPass.ts
similarity index 95%
rename from src/client/render/gl/passes/structure-level-pass.ts
rename to src/client/render/gl/passes/StructureLevelPass.ts
index 04f07605c..a727e31e9 100644
--- a/src/client/render/gl/passes/structure-level-pass.ts
+++ b/src/client/render/gl/passes/StructureLevelPass.ts
@@ -17,14 +17,14 @@ import {
   UT_PORT,
   UT_SAM_LAUNCHER,
 } from "../../types";
-import { DynamicInstanceBuffer } from "../dynamic-buffer";
-import type { RenderSettings } from "../render-settings";
-import { createProgram } from "../utils/gl-utils";
-import type { GlyphTables } from "./name-pass/atlas-data";
-import { buildGlyphTables, parseAtlasData } from "./name-pass/atlas-data";
-import { buildGlyphMetricsTex } from "./name-pass/data-textures";
-import { layoutString } from "./name-pass/text-layout";
-import { CHAR_RANGE, MAX_CHARS } from "./name-pass/types";
+import { DynamicInstanceBuffer } from "../DynamicBuffer";
+import type { RenderSettings } from "../RenderSettings";
+import { createProgram } from "../utils/GlUtils";
+import type { GlyphTables } from "./name-pass/AtlasData";
+import { buildGlyphTables, parseAtlasData } from "./name-pass/AtlasData";
+import { buildGlyphMetricsTex } from "./name-pass/DataTextures";
+import { layoutString } from "./name-pass/TextLayout";
+import { CHAR_RANGE, MAX_CHARS } from "./name-pass/Types";
 
 import { assetUrl } from "src/core/AssetUrls";
 import fragSrc from "../shaders/structure-level/structure-level.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/structure-pass.ts b/src/client/render/gl/passes/StructurePass.ts
similarity index 98%
rename from src/client/render/gl/passes/structure-pass.ts
rename to src/client/render/gl/passes/StructurePass.ts
index 3e14d9d47..42f153143 100644
--- a/src/client/render/gl/passes/structure-pass.ts
+++ b/src/client/render/gl/passes/StructurePass.ts
@@ -23,10 +23,10 @@ import {
   UT_PORT,
   UT_SAM_LAUNCHER,
 } from "../../types";
-import { DynamicInstanceBuffer } from "../dynamic-buffer";
-import type { RenderSettings } from "../render-settings";
-import { getPaletteSize } from "../utils/color-utils";
-import { createProgram, shaderSrc } from "../utils/gl-utils";
+import { DynamicInstanceBuffer } from "../DynamicBuffer";
+import type { RenderSettings } from "../RenderSettings";
+import { getPaletteSize } from "../utils/ColorUtils";
+import { createProgram, shaderSrc } from "../utils/GlUtils";
 
 import { assetUrl } from "src/core/AssetUrls";
 import structureFragSrc from "../shaders/structure/structure.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/terrain-pass.ts b/src/client/render/gl/passes/TerrainPass.ts
similarity index 98%
rename from src/client/render/gl/passes/terrain-pass.ts
rename to src/client/render/gl/passes/TerrainPass.ts
index 812f43c13..b5d16777a 100644
--- a/src/client/render/gl/passes/terrain-pass.ts
+++ b/src/client/render/gl/passes/TerrainPass.ts
@@ -16,7 +16,7 @@ import {
   createProgram,
   createTexture2D,
   shaderSrc,
-} from "../utils/gl-utils";
+} from "../utils/GlUtils";
 
 // ---------------------------------------------------------------------------
 // TerrainPass
diff --git a/src/client/render/gl/passes/territory-pass.ts b/src/client/render/gl/passes/TerritoryPass.ts
similarity index 98%
rename from src/client/render/gl/passes/territory-pass.ts
rename to src/client/render/gl/passes/TerritoryPass.ts
index 63c0a664a..246950746 100644
--- a/src/client/render/gl/passes/territory-pass.ts
+++ b/src/client/render/gl/passes/TerritoryPass.ts
@@ -13,10 +13,10 @@
  */
 
 import type { TilePair } from "../../types";
-import type { RenderSettings } from "../render-settings";
-import { getPaletteSize } from "../utils/color-utils";
-import { createMapQuad, createProgram, shaderSrc } from "../utils/gl-utils";
-import { OWNER_MASK, TILE_DEFINES } from "../utils/tile-codec";
+import type { RenderSettings } from "../RenderSettings";
+import { getPaletteSize } from "../utils/ColorUtils";
+import { createMapQuad, createProgram, shaderSrc } from "../utils/GlUtils";
+import { OWNER_MASK, TILE_DEFINES } from "../utils/TileCodec";
 
 import overlayVertSrc from "../shaders/map-overlay/overlay.vert.glsl?raw";
 import territoryFragSrc from "../shaders/map-overlay/territory.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/trail-pass.ts b/src/client/render/gl/passes/TrailPass.ts
similarity index 94%
rename from src/client/render/gl/passes/trail-pass.ts
rename to src/client/render/gl/passes/TrailPass.ts
index 5cad9b737..db1cd40ff 100644
--- a/src/client/render/gl/passes/trail-pass.ts
+++ b/src/client/render/gl/passes/TrailPass.ts
@@ -6,10 +6,10 @@
  * Always draws at full brightness (after night composite).
  */
 
-import type { RenderSettings } from "../render-settings";
-import { getPaletteSize } from "../utils/color-utils";
-import { createMapQuad, createProgram, shaderSrc } from "../utils/gl-utils";
-import { TILE_DEFINES } from "../utils/tile-codec";
+import type { RenderSettings } from "../RenderSettings";
+import { getPaletteSize } from "../utils/ColorUtils";
+import { createMapQuad, createProgram, shaderSrc } from "../utils/GlUtils";
+import { TILE_DEFINES } from "../utils/TileCodec";
 
 import overlayVertSrc from "../shaders/map-overlay/overlay.vert.glsl?raw";
 import trailFragSrc from "../shaders/map-overlay/trail.frag.glsl?raw";
diff --git a/src/client/render/gl/passes/unit-pass.ts b/src/client/render/gl/passes/UnitPass.ts
similarity index 98%
rename from src/client/render/gl/passes/unit-pass.ts
rename to src/client/render/gl/passes/UnitPass.ts
index 3d62851ec..95322c6f9 100644
--- a/src/client/render/gl/passes/unit-pass.ts
+++ b/src/client/render/gl/passes/UnitPass.ts
@@ -47,12 +47,12 @@ import {
   UT_TRANSPORT,
   UT_WARSHIP,
 } from "../../types";
-import { DynamicInstanceBuffer } from "../dynamic-buffer";
-import type { RenderSettings } from "../render-settings";
+import { DynamicInstanceBuffer } from "../DynamicBuffer";
+import type { RenderSettings } from "../RenderSettings";
 import unitFragSrc from "../shaders/unit/unit.frag.glsl?raw";
 import unitVertSrc from "../shaders/unit/unit.vert.glsl?raw";
-import { getPaletteSize } from "../utils/color-utils";
-import { createProgram, shaderSrc } from "../utils/gl-utils";
+import { getPaletteSize } from "../utils/ColorUtils";
+import { createProgram, shaderSrc } from "../utils/GlUtils";
 
 const unitAtlasUrl = assetUrl("atlases/unit-atlas.png");
 
diff --git a/src/client/render/gl/passes/fx-pass/fx-attack-ring-pass.ts b/src/client/render/gl/passes/fx-pass/FxAttackRingPass.ts
similarity index 97%
rename from src/client/render/gl/passes/fx-pass/fx-attack-ring-pass.ts
rename to src/client/render/gl/passes/fx-pass/FxAttackRingPass.ts
index bc66eda30..c522e2880 100644
--- a/src/client/render/gl/passes/fx-pass/fx-attack-ring-pass.ts
+++ b/src/client/render/gl/passes/fx-pass/FxAttackRingPass.ts
@@ -6,9 +6,9 @@
  */
 
 import type { AttackRingInput } from "../../../types";
-import { DynamicInstanceBuffer } from "../../dynamic-buffer";
-import type { RenderSettings } from "../../render-settings";
-import { createProgram } from "../../utils/gl-utils";
+import { DynamicInstanceBuffer } from "../../DynamicBuffer";
+import type { RenderSettings } from "../../RenderSettings";
+import { createProgram } from "../../utils/GlUtils";
 
 import attackRingFragSrc from "../../shaders/fx/attack-ring.frag.glsl?raw";
 import attackRingVertSrc from "../../shaders/fx/attack-ring.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fx-pass/fx-shockwave-pass.ts b/src/client/render/gl/passes/fx-pass/FxShockwavePass.ts
similarity index 96%
rename from src/client/render/gl/passes/fx-pass/fx-shockwave-pass.ts
rename to src/client/render/gl/passes/fx-pass/FxShockwavePass.ts
index 62d011986..41f3e4598 100644
--- a/src/client/render/gl/passes/fx-pass/fx-shockwave-pass.ts
+++ b/src/client/render/gl/passes/fx-pass/FxShockwavePass.ts
@@ -5,9 +5,9 @@
  * Uses an SDF circle rendered in a unit quad, no texture required.
  */
 
-import { DynamicInstanceBuffer } from "../../dynamic-buffer";
-import type { RenderSettings } from "../../render-settings";
-import { createProgram } from "../../utils/gl-utils";
+import { DynamicInstanceBuffer } from "../../DynamicBuffer";
+import type { RenderSettings } from "../../RenderSettings";
+import { createProgram } from "../../utils/GlUtils";
 
 import shockwaveFragSrc from "../../shaders/fx/shockwave.frag.glsl?raw";
 import shockwaveVertSrc from "../../shaders/fx/shockwave.vert.glsl?raw";
diff --git a/src/client/render/gl/passes/fx-pass/fx-sprite-pass.ts b/src/client/render/gl/passes/fx-pass/FxSpritePass.ts
similarity index 98%
rename from src/client/render/gl/passes/fx-pass/fx-sprite-pass.ts
rename to src/client/render/gl/passes/fx-pass/FxSpritePass.ts
index 42788a626..5937583d6 100644
--- a/src/client/render/gl/passes/fx-pass/fx-sprite-pass.ts
+++ b/src/client/render/gl/passes/fx-pass/FxSpritePass.ts
@@ -6,7 +6,7 @@
  * Pre-built by generate-sprite-atlases.mjs.
  */
 
-import { MS_PER_TICK, NUKE_EXPLOSION_RADII } from "../../../game-constants";
+import { MS_PER_TICK, NUKE_EXPLOSION_RADII } from "../../../GameConstants";
 import type { ConquestFx, DeadUnitFx, RendererConfig } from "../../../types";
 import {
   STRUCTURE_TYPES,
@@ -14,9 +14,9 @@ import {
   UT_TRAIN,
   UT_WARSHIP,
 } from "../../../types";
-import { DynamicInstanceBuffer } from "../../dynamic-buffer";
-import type { RenderSettings } from "../../render-settings";
-import { createProgram, shaderSrc } from "../../utils/gl-utils";
+import { DynamicInstanceBuffer } from "../../DynamicBuffer";
+import type { RenderSettings } from "../../RenderSettings";
+import { createProgram, shaderSrc } from "../../utils/GlUtils";
 
 import fxAtlasMeta from "resources/atlases/fx-atlas-meta.json";
 import { assetUrl } from "src/core/AssetUrls";
diff --git a/src/client/render/gl/passes/fx-pass/index.ts b/src/client/render/gl/passes/fx-pass/index.ts
index b46a8b7bf..12ec3c0b7 100644
--- a/src/client/render/gl/passes/fx-pass/index.ts
+++ b/src/client/render/gl/passes/fx-pass/index.ts
@@ -8,17 +8,17 @@
  * interceptions) are coordinated here so each sub-pass stays self-contained.
  */
 
-import { MS_PER_TICK, NUKE_EXPLOSION_RADII } from "../../../game-constants";
+import { MS_PER_TICK, NUKE_EXPLOSION_RADII } from "../../../GameConstants";
 import type {
   AttackRingInput,
   ConquestFx,
   DeadUnitFx,
   RendererConfig,
 } from "../../../types";
-import type { RenderSettings } from "../../render-settings";
-import { FxAttackRingPass } from "./fx-attack-ring-pass";
-import { FxShockwavePass } from "./fx-shockwave-pass";
-import { FxSpritePass } from "./fx-sprite-pass";
+import type { RenderSettings } from "../../RenderSettings";
+import { FxAttackRingPass } from "./FxAttackRingPass";
+import { FxShockwavePass } from "./FxShockwavePass";
+import { FxSpritePass } from "./FxSpritePass";
 
 export type { AttackRingInput } from "../../../types";
 
diff --git a/src/client/render/gl/passes/name-pass/atlas-data.ts b/src/client/render/gl/passes/name-pass/AtlasData.ts
similarity index 96%
rename from src/client/render/gl/passes/name-pass/atlas-data.ts
rename to src/client/render/gl/passes/name-pass/AtlasData.ts
index 65f49a285..e385a452f 100644
--- a/src/client/render/gl/passes/name-pass/atlas-data.ts
+++ b/src/client/render/gl/passes/name-pass/AtlasData.ts
@@ -6,8 +6,8 @@
 import emojiAtlasMeta from "resources/atlases/emoji-atlas-meta.json";
 import flagAtlasMeta from "resources/atlases/flag-atlas-meta.json";
 import atlasData from "resources/atlases/msdf-atlas.json";
-import type { BMChar, BMKerning, ParsedAtlas } from "./types";
-import { CHAR_RANGE } from "./types";
+import type { BMChar, BMKerning, ParsedAtlas } from "./Types";
+import { CHAR_RANGE } from "./Types";
 
 // ---------------------------------------------------------------------------
 // Atlas parsing
diff --git a/src/client/render/gl/passes/name-pass/data-textures.ts b/src/client/render/gl/passes/name-pass/DataTextures.ts
similarity index 93%
rename from src/client/render/gl/passes/name-pass/data-textures.ts
rename to src/client/render/gl/passes/name-pass/DataTextures.ts
index b97ceb507..7738bd18a 100644
--- a/src/client/render/gl/passes/name-pass/data-textures.ts
+++ b/src/client/render/gl/passes/name-pass/DataTextures.ts
@@ -3,9 +3,9 @@
  * Uses createTexture2D from gl-utils to eliminate boilerplate.
  */
 
-import { createTexture2D } from "../../utils/gl-utils";
-import type { ParsedAtlas } from "./types";
-import { CHAR_RANGE, LINES_PER_PLAYER, MAX_CHARS } from "./types";
+import { createTexture2D } from "../../utils/GlUtils";
+import type { ParsedAtlas } from "./Types";
+import { CHAR_RANGE, LINES_PER_PLAYER, MAX_CHARS } from "./Types";
 
 /** Glyph metrics: CHAR_RANGE x 2, RGBA32F. Static — uploaded once. */
 export function buildGlyphMetricsTex(
diff --git a/src/client/render/gl/passes/name-pass/debug-program.ts b/src/client/render/gl/passes/name-pass/DebugProgram.ts
similarity index 94%
rename from src/client/render/gl/passes/name-pass/debug-program.ts
rename to src/client/render/gl/passes/name-pass/DebugProgram.ts
index fb9ae01d5..c9c7e18ef 100644
--- a/src/client/render/gl/passes/name-pass/debug-program.ts
+++ b/src/client/render/gl/passes/name-pass/DebugProgram.ts
@@ -6,11 +6,11 @@
  */
 
 import flagAtlasMeta from "resources/atlases/flag-atlas-meta.json";
-import type { RenderSettings } from "../../render-settings";
+import type { RenderSettings } from "../../RenderSettings";
 import debugBoxFragSrc from "../../shaders/name/debug-box.frag.glsl?raw";
 import debugBoxVertSrc from "../../shaders/name/debug-box.vert.glsl?raw";
-import { createProgram } from "../../utils/gl-utils";
-import type { ParsedAtlas } from "./types";
+import { createProgram } from "../../utils/GlUtils";
+import type { ParsedAtlas } from "./Types";
 
 export class DebugProgram {
   private gl: WebGL2RenderingContext;
diff --git a/src/client/render/gl/passes/name-pass/icon-program.ts b/src/client/render/gl/passes/name-pass/IconProgram.ts
similarity index 97%
rename from src/client/render/gl/passes/name-pass/icon-program.ts
rename to src/client/render/gl/passes/name-pass/IconProgram.ts
index 869460d34..447522049 100644
--- a/src/client/render/gl/passes/name-pass/icon-program.ts
+++ b/src/client/render/gl/passes/name-pass/IconProgram.ts
@@ -8,11 +8,11 @@
 import emojiAtlasMeta from "resources/atlases/emoji-atlas-meta.json";
 import flagAtlasMeta from "resources/atlases/flag-atlas-meta.json";
 import { assetUrl } from "src/core/AssetUrls";
-import type { RenderSettings } from "../../render-settings";
+import type { RenderSettings } from "../../RenderSettings";
 import iconFragSrc from "../../shaders/name/icon.frag.glsl?raw";
 import iconVertSrc from "../../shaders/name/icon.vert.glsl?raw";
-import { createProgram } from "../../utils/gl-utils";
-import type { ParsedAtlas } from "./types";
+import { createProgram } from "../../utils/GlUtils";
+import type { ParsedAtlas } from "./Types";
 
 const emojiAtlasUrl = assetUrl("atlases/emoji-atlas.png");
 const flagAtlasUrl = assetUrl("atlases/flag-atlas.png");
diff --git a/src/client/render/gl/passes/name-pass/status-icon-program.ts b/src/client/render/gl/passes/name-pass/StatusIconProgram.ts
similarity index 97%
rename from src/client/render/gl/passes/name-pass/status-icon-program.ts
rename to src/client/render/gl/passes/name-pass/StatusIconProgram.ts
index 40f81392f..ba071543f 100644
--- a/src/client/render/gl/passes/name-pass/status-icon-program.ts
+++ b/src/client/render/gl/passes/name-pass/StatusIconProgram.ts
@@ -11,11 +11,11 @@
 
 import statusAtlasMeta from "resources/atlases/status-atlas-meta.json";
 import { assetUrl } from "src/core/AssetUrls";
-import type { RenderSettings } from "../../render-settings";
+import type { RenderSettings } from "../../RenderSettings";
 import statusFragSrc from "../../shaders/name/status-icon.frag.glsl?raw";
 import statusVertSrc from "../../shaders/name/status-icon.vert.glsl?raw";
-import { createProgram } from "../../utils/gl-utils";
-import type { ParsedAtlas } from "./types";
+import { createProgram } from "../../utils/GlUtils";
+import type { ParsedAtlas } from "./Types";
 
 const statusAtlasUrl = assetUrl("atlases/status-atlas.png");
 
diff --git a/src/client/render/gl/passes/name-pass/text-layout.ts b/src/client/render/gl/passes/name-pass/TextLayout.ts
similarity index 95%
rename from src/client/render/gl/passes/name-pass/text-layout.ts
rename to src/client/render/gl/passes/name-pass/TextLayout.ts
index 5806084bc..6b41dca4e 100644
--- a/src/client/render/gl/passes/name-pass/text-layout.ts
+++ b/src/client/render/gl/passes/name-pass/TextLayout.ts
@@ -3,8 +3,8 @@
  * No WebGL dependency.
  */
 
-import type { GlyphTables } from "./atlas-data";
-import { CHAR_RANGE, MAX_CHARS } from "./types";
+import type { GlyphTables } from "./AtlasData";
+import { CHAR_RANGE, MAX_CHARS } from "./Types";
 
 export interface LayoutResult {
   charCodes: Uint8Array; // char code per slot (MAX_CHARS, zero-padded)
diff --git a/src/client/render/gl/passes/name-pass/text-program.ts b/src/client/render/gl/passes/name-pass/TextProgram.ts
similarity index 96%
rename from src/client/render/gl/passes/name-pass/text-program.ts
rename to src/client/render/gl/passes/name-pass/TextProgram.ts
index 963292f5a..d76c57e40 100644
--- a/src/client/render/gl/passes/name-pass/text-program.ts
+++ b/src/client/render/gl/passes/name-pass/TextProgram.ts
@@ -7,12 +7,12 @@
  */
 
 import { assetUrl } from "src/core/AssetUrls";
-import type { RenderSettings } from "../../render-settings";
+import type { RenderSettings } from "../../RenderSettings";
 import nameFragSrc from "../../shaders/name/name.frag.glsl?raw";
 import nameVertSrc from "../../shaders/name/name.vert.glsl?raw";
-import { createProgram, shaderSrc } from "../../utils/gl-utils";
-import type { ParsedAtlas } from "./types";
-import { LINES_PER_PLAYER, MAX_CHARS } from "./types";
+import { createProgram, shaderSrc } from "../../utils/GlUtils";
+import type { ParsedAtlas } from "./Types";
+import { LINES_PER_PLAYER, MAX_CHARS } from "./Types";
 
 const atlasUrl = assetUrl("atlases/msdf-atlas.png");
 
diff --git a/src/client/render/gl/passes/name-pass/types.ts b/src/client/render/gl/passes/name-pass/Types.ts
similarity index 100%
rename from src/client/render/gl/passes/name-pass/types.ts
rename to src/client/render/gl/passes/name-pass/Types.ts
diff --git a/src/client/render/gl/passes/name-pass/index.ts b/src/client/render/gl/passes/name-pass/index.ts
index 3f011452d..10598307c 100644
--- a/src/client/render/gl/passes/name-pass/index.ts
+++ b/src/client/render/gl/passes/name-pass/index.ts
@@ -24,30 +24,30 @@ import type {
   RendererConfig,
 } from "../../../types";
 import { PlayerTypeEnum } from "../../../types";
-import type { RenderSettings } from "../../render-settings";
-import { createFullscreenQuad } from "../../utils/gl-utils";
+import type { RenderSettings } from "../../RenderSettings";
+import { createFullscreenQuad } from "../../utils/GlUtils";
 
-import type { GlyphTables } from "./atlas-data";
+import type { GlyphTables } from "./AtlasData";
 import {
   buildEmojiLookup,
   buildFlagLookup,
   buildGlyphTables,
   buildKernTable,
   parseAtlasData,
-} from "./atlas-data";
+} from "./AtlasData";
 import {
   buildCursorTex,
   buildGlyphMetricsTex,
   buildPlayerDataTex,
   buildStringTex,
-} from "./data-textures";
-import { DebugProgram } from "./debug-program";
-import { IconProgram } from "./icon-program";
-import { StatusIconProgram } from "./status-icon-program";
-import { formatTroops, layoutString } from "./text-layout";
-import { TextProgram } from "./text-program";
-import type { PlayerSlot } from "./types";
-import { LINES_PER_PLAYER, MAX_CHARS } from "./types";
+} from "./DataTextures";
+import { DebugProgram } from "./DebugProgram";
+import { IconProgram } from "./IconProgram";
+import { StatusIconProgram } from "./StatusIconProgram";
+import { formatTroops, layoutString } from "./TextLayout";
+import { TextProgram } from "./TextProgram";
+import type { PlayerSlot } from "./Types";
+import { LINES_PER_PLAYER, MAX_CHARS } from "./Types";
 
 export class NamePass {
   private gl: WebGL2RenderingContext;
diff --git a/src/client/render/gl/utils/affiliation.ts b/src/client/render/gl/utils/Affiliation.ts
similarity index 97%
rename from src/client/render/gl/utils/affiliation.ts
rename to src/client/render/gl/utils/Affiliation.ts
index 1dbda6b05..750456774 100644
--- a/src/client/render/gl/utils/affiliation.ts
+++ b/src/client/render/gl/utils/Affiliation.ts
@@ -8,8 +8,8 @@
  * Rebuilt when localPlayerID or relationship data changes.
  */
 
-import { getPaletteSize } from "./color-utils";
-import { createTexture2D } from "./gl-utils";
+import { getPaletteSize } from "./ColorUtils";
+import { createTexture2D } from "./GlUtils";
 
 // Relationship constants (must match adapter.ts)
 const RELATION_NEUTRAL = 0;
diff --git a/src/client/render/gl/utils/color-utils.ts b/src/client/render/gl/utils/ColorUtils.ts
similarity index 100%
rename from src/client/render/gl/utils/color-utils.ts
rename to src/client/render/gl/utils/ColorUtils.ts
diff --git a/src/client/render/gl/utils/gl-utils.ts b/src/client/render/gl/utils/GlUtils.ts
similarity index 100%
rename from src/client/render/gl/utils/gl-utils.ts
rename to src/client/render/gl/utils/GlUtils.ts
diff --git a/src/client/render/gl/utils/gpu-resources.ts b/src/client/render/gl/utils/GpuResources.ts
similarity index 97%
rename from src/client/render/gl/utils/gpu-resources.ts
rename to src/client/render/gl/utils/GpuResources.ts
index 7f86060ba..9e0c84986 100644
--- a/src/client/render/gl/utils/gpu-resources.ts
+++ b/src/client/render/gl/utils/GpuResources.ts
@@ -5,7 +5,7 @@
  * construction-order dependencies between passes.
  */
 
-import { createTexture2D } from "./gl-utils";
+import { createTexture2D } from "./GlUtils";
 
 export interface GPUResources {
   tileTex: WebGLTexture; // R16UI  — tile ownership + flags
diff --git a/src/client/render/gl/utils/heat-manager.ts b/src/client/render/gl/utils/HeatManager.ts
similarity index 98%
rename from src/client/render/gl/utils/heat-manager.ts
rename to src/client/render/gl/utils/HeatManager.ts
index 0a86230a5..119175769 100644
--- a/src/client/render/gl/utils/heat-manager.ts
+++ b/src/client/render/gl/utils/HeatManager.ts
@@ -8,14 +8,14 @@
  * (fallout light reads heat). Shared heat textures come from GPUResources.
  */
 
-import type { RenderSettings } from "../render-settings";
+import type { RenderSettings } from "../RenderSettings";
 import {
   createFullscreenQuad,
   createProgram,
   createTexture2D,
   shaderSrc,
-} from "./gl-utils";
-import { FALLOUT_BIT, TILE_DEFINES } from "./tile-codec";
+} from "./GlUtils";
+import { FALLOUT_BIT, TILE_DEFINES } from "./TileCodec";
 
 import heatDecayFragSrc from "../shaders/fallout-bloom/heat-decay.frag.glsl?raw";
 import fullscreenNoUvVertSrc from "../shaders/shared/fullscreen-no-uv.vert.glsl?raw";
diff --git a/src/client/render/gl/utils/nuke-trajectory.ts b/src/client/render/gl/utils/NukeTrajectory.ts
similarity index 100%
rename from src/client/render/gl/utils/nuke-trajectory.ts
rename to src/client/render/gl/utils/NukeTrajectory.ts
diff --git a/src/client/render/gl/utils/tile-codec.ts b/src/client/render/gl/utils/TileCodec.ts
similarity index 100%
rename from src/client/render/gl/utils/tile-codec.ts
rename to src/client/render/gl/utils/TileCodec.ts
diff --git a/src/client/render/types/frame-data.ts b/src/client/render/types/FrameData.ts
similarity index 97%
rename from src/client/render/types/frame-data.ts
rename to src/client/render/types/FrameData.ts
index 5e2574e60..04890f591 100644
--- a/src/client/render/types/frame-data.ts
+++ b/src/client/render/types/FrameData.ts
@@ -1,4 +1,4 @@
-import type { FrameEvents } from "./frame-events";
+import type { FrameEvents } from "./FrameEvents";
 import type {
   AttackRingInput,
   NameEntry,
@@ -7,7 +7,7 @@ import type {
   PlayerStatusData,
   TilePair,
   UnitState,
-} from "./renderer";
+} from "./Renderer";
 
 /**
  * FrameData — the boundary contract between game integration and features.
diff --git a/src/client/render/types/frame-events.ts b/src/client/render/types/FrameEvents.ts
similarity index 99%
rename from src/client/render/types/frame-events.ts
rename to src/client/render/types/FrameEvents.ts
index ae5c9c214..9ae6abb66 100644
--- a/src/client/render/types/frame-events.ts
+++ b/src/client/render/types/FrameEvents.ts
@@ -3,7 +3,7 @@ import type {
   DeadUnitFx,
   PlayerState,
   UnitState,
-} from "./renderer";
+} from "./Renderer";
 
 // ── Supporting event types ──────────────────────────────────────────────
 
diff --git a/src/client/render/types/frame-source.ts b/src/client/render/types/FrameSource.ts
similarity index 92%
rename from src/client/render/types/frame-source.ts
rename to src/client/render/types/FrameSource.ts
index 74f6f0217..b2a2a4e50 100644
--- a/src/client/render/types/frame-source.ts
+++ b/src/client/render/types/FrameSource.ts
@@ -1,5 +1,5 @@
-import type { FrameData } from "./frame-data";
-import type { PlayerStatic } from "./renderer";
+import type { FrameData } from "./FrameData";
+import type { PlayerStatic } from "./Renderer";
 
 /**
  * Static per-session metadata. Set once at game-start, never changes.
diff --git a/src/client/render/types/game.ts b/src/client/render/types/Game.ts
similarity index 100%
rename from src/client/render/types/game.ts
rename to src/client/render/types/Game.ts
diff --git a/src/client/render/types/game-updates.ts b/src/client/render/types/GameUpdates.ts
similarity index 100%
rename from src/client/render/types/game-updates.ts
rename to src/client/render/types/GameUpdates.ts
diff --git a/src/client/render/types/renderer.ts b/src/client/render/types/Renderer.ts
similarity index 100%
rename from src/client/render/types/renderer.ts
rename to src/client/render/types/Renderer.ts
diff --git a/src/client/render/types/replay.ts b/src/client/render/types/Replay.ts
similarity index 99%
rename from src/client/render/types/replay.ts
rename to src/client/render/types/Replay.ts
index c02ccc283..a6018a78c 100644
--- a/src/client/render/types/replay.ts
+++ b/src/client/render/types/Replay.ts
@@ -7,7 +7,7 @@ import type {
   RendererConfig,
   TilePair,
   UnitState,
-} from "./renderer";
+} from "./Renderer";
 
 /** Chunk index entry — one per chunk in the file */
 export interface ChunkIndexEntry {
diff --git a/src/client/render/types/unit-type.ts b/src/client/render/types/UnitType.ts
similarity index 100%
rename from src/client/render/types/unit-type.ts
rename to src/client/render/types/UnitType.ts
diff --git a/src/client/render/types/index.ts b/src/client/render/types/index.ts
index 8785374f3..ff724aa0a 100644
--- a/src/client/render/types/index.ts
+++ b/src/client/render/types/index.ts
@@ -1,5 +1,5 @@
 // Renderer types (units, players, tiles, names, config)
-export { PlayerTypeEnum, TrainType } from "./renderer";
+export { PlayerTypeEnum, TrainType } from "./Renderer";
 export type {
   AllianceData,
   AttackData,
@@ -17,13 +17,13 @@ export type {
   RendererConfig,
   TilePair,
   UnitState,
-} from "./renderer";
+} from "./Renderer";
 
 // Frame data — boundary contract between game integration and features
-export type { FrameData } from "./frame-data";
+export type { FrameData } from "./FrameData";
 
 // Frame events — per-frame ephemeral events (rendering FX + stats events)
-export { EMPTY_FRAME_EVENTS } from "./frame-events";
+export { EMPTY_FRAME_EVENTS } from "./FrameEvents";
 export type {
   AllianceBrokenEvent,
   AllianceExpiredEvent,
@@ -36,13 +36,13 @@ export type {
   NukeIncomingEvent,
   TargetEvent,
   WinEvent,
-} from "./frame-events";
+} from "./FrameEvents";
 
 // Frame source — mode-agnostic subscription interface
-export type { FrameSource, GameStartConfig } from "./frame-source";
+export type { FrameSource, GameStartConfig } from "./FrameSource";
 
 // Game update types
-export type { GameStartInfo, GameUpdateViewData } from "./game";
+export type { GameStartInfo, GameUpdateViewData } from "./Game";
 
 // Replay types (header, frames, codec helpers)
 export type {
@@ -58,10 +58,10 @@ export type {
   ReplayHeader,
   StreamableReplayInfo,
   TrainPlanRecord,
-} from "./replay";
+} from "./Replay";
 
 // Game update type constants and event payloads (shared between shim + codec)
-export { GameUpdateType, MessageType } from "./game-updates";
+export { GameUpdateType, MessageType } from "./GameUpdates";
 export type {
   AllianceExpiredUpdate,
   AllianceReplyUpdate,
@@ -81,7 +81,7 @@ export type {
   UnitEventUpdate,
   UnitIncomingUpdate,
   WinUpdate,
-} from "./game-updates";
+} from "./GameUpdates";
 
 // Unit type string constants and derived sets
 export {
@@ -105,4 +105,4 @@ export {
   UT_TRAIN,
   UT_TRANSPORT,
   UT_WARSHIP,
-} from "./unit-type";
+} from "./UnitType";
diff --git a/src/client/view/GameView.ts b/src/client/view/GameView.ts
index 4daf46d8b..2832673f0 100644
--- a/src/client/view/GameView.ts
+++ b/src/client/view/GameView.ts
@@ -26,13 +26,13 @@ import { UnitGrid, UnitPredicate } from "../../core/game/UnitGrid";
 import { ClientID, GameID, Player, PlayerCosmetics } from "../../core/Schemas";
 import { formatPlayerDisplayName } from "../../core/Util";
 import { WorkerClient } from "../../core/worker/WorkerClient";
-import { computeAllianceClusters } from "../render/frame/derive/alliance-clusters";
-import { extractAttackRings } from "../render/frame/derive/attack-rings";
-import { extractNukeTelegraphs } from "../render/frame/derive/nuke-telegraphs";
-import { computePlayerStatus } from "../render/frame/derive/player-status";
-import { buildRelationMatrix } from "../render/frame/derive/relation-matrix";
-import { RailroadCache } from "../render/frame/railroad-cache";
-import { TrailManager } from "../render/frame/trail-manager";
+import { computeAllianceClusters } from "../render/frame/derive/AllianceClusters";
+import { extractAttackRings } from "../render/frame/derive/AttackRings";
+import { extractNukeTelegraphs } from "../render/frame/derive/NukeTelegraphs";
+import { computePlayerStatus } from "../render/frame/derive/PlayerStatus";
+import { buildRelationMatrix } from "../render/frame/derive/RelationMatrix";
+import { RailroadCache } from "../render/frame/RailroadCache";
+import { TrailManager } from "../render/frame/TrailManager";
 import type { FrameData, NameEntry, TilePair } from "../render/types";
 import { STRUCTURE_TYPES } from "../render/types";
 import { PlayerView } from "./PlayerView";
diff --git a/tests/client/render/frame/derive/player-status.test.ts b/tests/client/render/frame/derive/player-status.test.ts
index e511555b9..16a4b7ed8 100644
--- a/tests/client/render/frame/derive/player-status.test.ts
+++ b/tests/client/render/frame/derive/player-status.test.ts
@@ -12,7 +12,7 @@
  */
 
 import { describe, expect, it } from "vitest";
-import { computePlayerStatus } from "../../../../../src/client/render/frame/derive/player-status";
+import { computePlayerStatus } from "../../../../../src/client/render/frame/derive/PlayerStatus";
 import type {
   PlayerState,
   UnitState,