diff --git a/llmx-rs/chatgpt/src/apply_command.rs b/llmx-rs/chatgpt/src/apply_command.rs
index 2cffc40f..c81bea5b 100644
--- a/llmx-rs/chatgpt/src/apply_command.rs
+++ b/llmx-rs/chatgpt/src/apply_command.rs
@@ -11,7 +11,7 @@ use crate::get_task::OutputItem;
 use crate::get_task::PrOutputItem;
 use crate::get_task::get_task;
 
-/// Applies the latest diff from a Codex agent task.
+/// Applies the latest diff from a LLMX agent task.
 #[derive(Debug, Parser)]
 pub struct ApplyCommand {
     pub task_id: String,
diff --git a/llmx-rs/cli/src/main.rs b/llmx-rs/cli/src/main.rs
index eef194fa..424dfb0d 100644
--- a/llmx-rs/cli/src/main.rs
+++ b/llmx-rs/cli/src/main.rs
@@ -67,7 +67,7 @@ struct MultitoolCli {
 
 #[derive(Debug, clap::Subcommand)]
 enum Subcommand {
-    /// Run Codex non-interactively.
+    /// Run LLMX non-interactively.
     #[clap(visible_alias = "e")]
     Exec(ExecCli),
 
@@ -77,7 +77,7 @@ enum Subcommand {
     /// Remove stored authentication credentials.
     Logout(LogoutCommand),
 
-    /// [experimental] Run Codex as an MCP server and manage MCP servers.
+    /// [experimental] Run LLMX as an MCP server and manage MCP servers.
     Mcp(McpCli),
 
     /// [experimental] Run the Codex MCP server (stdio transport).
@@ -89,18 +89,18 @@ enum Subcommand {
     /// Generate shell completion scripts.
     Completion(CompletionCommand),
 
-    /// Run commands within a Codex-provided sandbox.
+    /// Run commands within a LLMX-provided sandbox.
     #[clap(visible_alias = "debug")]
     Sandbox(SandboxArgs),
 
-    /// Apply the latest diff produced by Codex agent as a `git apply` to your local working tree.
+    /// Apply the latest diff produced by LLMX agent as a `git apply` to your local working tree.
     #[clap(visible_alias = "a")]
     Apply(ApplyCommand),
 
     /// Resume a previous interactive session (picker by default; use --last to continue the most recent).
     Resume(ResumeCommand),
 
-    /// [EXPERIMENTAL] Browse tasks from Codex Cloud and apply changes locally.
+    /// [EXPERIMENTAL] Browse tasks from LLMX Cloud and apply changes locally.
     #[clap(name = "cloud", alias = "cloud-tasks")]
     Cloud(CloudTasksCli),
 
diff --git a/llmx-rs/exec/src/main.rs b/llmx-rs/exec/src/main.rs
index 22ebe2c9..8b68fb24 100644
--- a/llmx-rs/exec/src/main.rs
+++ b/llmx-rs/exec/src/main.rs
@@ -1,7 +1,7 @@
 //! Entry-point for the `codex-exec` binary.
 //!
 //! When this CLI is invoked normally, it parses the standard `codex-exec` CLI
-//! options and launches the non-interactive Codex agent. However, if it is
+//! options and launches the non-interactive LLMX agent. However, if it is
 //! invoked with arg0 as `codex-linux-sandbox`, we instead treat the invocation
 //! as a request to run the logic for the standalone `codex-linux-sandbox`
 //! executable (i.e., parse any -s args and then run a *sandboxed* command under