diff --git a/crates/pod/examples/pod_cli.rs b/crates/pod/examples/pod_cli.rs
index cc94e66f..b3d6b07b 100644
--- a/crates/pod/examples/pod_cli.rs
+++ b/crates/pod/examples/pod_cli.rs
@@ -54,7 +54,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut pod = Pod::from_manifest_toml(&toml, store).await?;
     let manifest: &PodManifest = pod.manifest();
     println!("Pod: {}", manifest.pod.name);
-    println!("Session: {}", pod.segment_id());
+    println!("Segment: {}", pod.segment_id());
 
     // 4. Run a prompt
     let result = pod.run_text("What is the capital of France?").await?;
diff --git a/crates/pod/src/pod.rs b/crates/pod/src/pod.rs
index aa63f3f2..5dc30025 100644
--- a/crates/pod/src/pod.rs
+++ b/crates/pod/src/pod.rs
@@ -193,12 +193,12 @@ pub struct Pod<C: LlmClient, St: Store> {
     /// Worker (e.g. the savings estimator used by the prune projection)
     /// can share the same view via [`Pod::usage_history_handle`].
     usage_history: Arc<Mutex<Vec<UsageRecord>>>,
-    /// Session-lifetime file-operation tracker from the builtin `tools`
+    /// Pod-lifetime file-operation tracker from the builtin `tools`
     /// crate. Populated by the Controller when it registers the builtin
     /// tools so that Pod-owned operations (e.g. compaction) can consult
     /// the recency of touched files.
     tracker: Option<tools::Tracker>,
-    /// Session-lifetime task store from the builtin `tools` crate. Shared by
+    /// Pod-lifetime task store from the builtin `tools` crate. Shared by
     /// TaskCreate / TaskUpdate / TaskList / TaskGet and preserved across
     /// compaction by keeping the same handle while the Worker history is
     /// replaced. Restored Pods reconstruct it by replaying Task* tool calls.
diff --git a/crates/tools/src/task.rs b/crates/tools/src/task.rs
index 2eed7dd0..32ddd461 100644
--- a/crates/tools/src/task.rs
+++ b/crates/tools/src/task.rs
@@ -1,4 +1,4 @@
-//! Session-scoped TaskStore and builtin task tools.
+//! Pod-lifetime TaskStore and builtin task tools.
 //!
 //! The store is Pod/session-lifetime state shared by the four Task* tools. It
 //! is reconstructed on resume by replaying TaskCreate / TaskUpdate tool-call
diff --git a/crates/tools/src/tracker.rs b/crates/tools/src/tracker.rs
index 2d4b6973..a299a84e 100644
--- a/crates/tools/src/tracker.rs
+++ b/crates/tools/src/tracker.rs
@@ -1,4 +1,4 @@
-//! Session-scoped tracker for file operations performed by the builtin
+//! Pod-lifetime tracker for file operations performed by the builtin
 //! file-manipulation tools.
 //!
 //! A `Tracker` serves two orthogonal purposes: