diff --git a/supacode/Features/Terminal/BusinessLogic/WorktreeTerminalManager.swift b/supacode/Features/Terminal/BusinessLogic/WorktreeTerminalManager.swift
index 3f479827..f65cabca 100644
--- a/supacode/Features/Terminal/BusinessLogic/WorktreeTerminalManager.swift
+++ b/supacode/Features/Terminal/BusinessLogic/WorktreeTerminalManager.swift
@@ -433,14 +433,14 @@ final class WorktreeTerminalManager {
       "[LayoutRestore] restore: loaded snapshot with \(payload.worktrees.count) worktree(s),"
         + " available worktrees=\(worktrees.count)"
     )
-    for (i, sw) in payload.worktrees.enumerated() {
+    for (index, snapshot) in payload.worktrees.enumerated() {
       terminalLogger.info(
-        "[LayoutRestore] restore: snapshot[\(i)] worktreeID=\(sw.worktreeID)"
-          + " tabs=\(sw.tabs.count) selectedTab=\(sw.selectedTabID ?? "nil")"
+        "[LayoutRestore] restore: snapshot[\(index)] worktreeID=\(snapshot.worktreeID)"
+          + " tabs=\(snapshot.tabs.count) selectedTab=\(snapshot.selectedTabID ?? "nil")"
       )
     }
-    for (i, w) in worktrees.enumerated() {
-      terminalLogger.info("[LayoutRestore] restore: available[\(i)] id=\(w.id) name=\(w.name)")
+    for (index, worktree) in worktrees.enumerated() {
+      terminalLogger.info("[LayoutRestore] restore: available[\(index)] id=\(worktree.id) name=\(worktree.name)")
     }
     let didRestore = applyLayoutSnapshotPayload(payload, availableWorktrees: worktrees)
     terminalLogger.info("[LayoutRestore] restore: applyResult=\(didRestore)")
diff --git a/supacodeTests/WorktreeTerminalStateSnapshotRestoreTests.swift b/supacodeTests/WorktreeTerminalStateSnapshotRestoreTests.swift
index f343545c..45e8bc14 100644
--- a/supacodeTests/WorktreeTerminalStateSnapshotRestoreTests.swift
+++ b/supacodeTests/WorktreeTerminalStateSnapshotRestoreTests.swift
@@ -3,7 +3,7 @@ import Testing
 
 @testable import supacode
 
-struct WorktreeTerminalStateSnapshotRestoreTests {
+struct SnapshotRestoreTests {
   @Test func resolveSnapshotWorkingDirectoryAcceptsAbsolutePathWithinWorktree() throws {
     let fileManager = FileManager.default
     let worktreeRoot = try makeTemporaryDirectory(fileManager: fileManager)