diff --git a/signal-gateway/src/claude/mod.rs b/signal-gateway/src/claude/mod.rs
index dc5ad14..bc315e2 100644
--- a/signal-gateway/src/claude/mod.rs
+++ b/signal-gateway/src/claude/mod.rs
@@ -83,14 +83,14 @@ pub enum ClaudeError {
 ///
 /// Requests are processed serially by a background worker to prevent
 /// concurrent API calls.
-pub struct ClaudeApi {
+pub struct ClaudeAgent {
     input_tx: mpsc::Sender<Input>,
     stop_tx: mpsc::Sender<()>,
     #[allow(dead_code)]
     worker_handle: tokio::task::JoinHandle<()>,
 }
 
-impl ClaudeApi {
+impl ClaudeAgent {
     /// Create a new Claude API client from configuration.
     ///
     /// Reads the API key and system prompt from the configured files.
diff --git a/signal-gateway/src/gateway/mod.rs b/signal-gateway/src/gateway/mod.rs
index 9bb170d..6fd99ac 100644
--- a/signal-gateway/src/gateway/mod.rs
+++ b/signal-gateway/src/gateway/mod.rs
@@ -4,7 +4,7 @@
 use crate::signal_jsonrpc::connect_ipc;
 use crate::{
     alertmanager::AlertPost,
-    claude::{ClaudeApi, ClaudeConfig, SentBy, Tool, ToolExecutor, ToolResult},
+    claude::{ClaudeAgent, ClaudeConfig, SentBy, Tool, ToolExecutor, ToolResult},
     log_message::{LogMessage, Origin},
     message_handler::{AdminMessage, AdminMessageResponse, Context, MessageHandlerResult},
     prometheus::{Prometheus, PrometheusConfig},
@@ -251,7 +251,7 @@ pub struct Gateway {
     command_router: CommandRouter,
     /// Claude API client for AI-powered responses.
     /// Initialized after Arc creation so it can hold a weak reference back to Gateway.
-    claude: OnceLock<Box<ClaudeApi>>,
+    claude: OnceLock<Box<ClaudeAgent>>,
 }
 
 impl Gateway {
@@ -287,7 +287,7 @@ impl Gateway {
 
         // Initialize Claude with a weak reference back to the gateway
         if let Some(cc) = claude_config {
-            let claude = ClaudeApi::new(cc, Arc::downgrade(&gateway) as Weak<dyn ToolExecutor>)
+            let claude = ClaudeAgent::new(cc, Arc::downgrade(&gateway) as Weak<dyn ToolExecutor>)
                 .expect("Invalid claude config");
             gateway
                 .claude