diff --git a/arch/tools/cli/main.py b/arch/tools/cli/main.py
index a457f363..6d9e501a 100644
--- a/arch/tools/cli/main.py
+++ b/arch/tools/cli/main.py
@@ -265,7 +265,7 @@ def cli_agent(type, file, path, settings):
     archgw_status = docker_container_status(PLANO_DOCKER_NAME)
     if archgw_status != "running":
         log.error(f"archgw docker container is not running (status: {archgw_status})")
-        log.error("Please start plano using the 'archgw up' command.")
+        log.error("Please start plano using the 'planoai up' command.")
         sys.exit(1)
 
     # Determine arch_config.yaml path
diff --git a/demos/use_cases/claude_code_router/README.md b/demos/use_cases/claude_code_router/README.md
index c5b7b856..2a5c5006 100644
--- a/demos/use_cases/claude_code_router/README.md
+++ b/demos/use_cases/claude_code_router/README.md
@@ -65,13 +65,13 @@ export ANTHROPIC_API_KEY="your-anthropic-key-here"
 ```bash
 # Install and start the gateway
 pip install archgw
-archgw up
+planoai up
 ```
 
 ### Step 4: Launch Enhanced Claude Code
 ```bash
 # This will launch Claude Code with multi-model routing
-archgw cli-agent claude
+planoai cli-agent claude
 ```
 ![claude code](claude_code.png)
 
@@ -111,7 +111,7 @@ llm_providers:
 ### Override Model Selection
 ```bash
 # Force a specific model for this session
-archgw cli-agent claude --settings='{"ANTHROPIC_SMALL_FAST_MODEL": "deepseek-coder-v2"}'
+planoai cli-agent claude --settings='{"ANTHROPIC_SMALL_FAST_MODEL": "deepseek-coder-v2"}'
 
 ### Environment Variables
 The system automatically configures these variables for Claude Code:
diff --git a/demos/use_cases/model_alias_routing/run_demo.sh b/demos/use_cases/model_alias_routing/run_demo.sh
index 2774e2a4..5a064629 100644
--- a/demos/use_cases/model_alias_routing/run_demo.sh
+++ b/demos/use_cases/model_alias_routing/run_demo.sh
@@ -26,7 +26,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with arch_config_with_aliases.yaml..."
-  archgw up arch_config_with_aliases.yaml
+  planoai up arch_config_with_aliases.yaml
 
   echo "\n\nArch started successfully."
   echo "Please run the following CURL command to test model alias routing. Additional instructions are in the README.md file. \n"
@@ -48,7 +48,7 @@ start_demo() {
 stop_demo() {
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/use_cases/model_choice_with_test_harness/run_demo.sh b/demos/use_cases/model_choice_with_test_harness/run_demo.sh
index 5ba327e1..623129a2 100644
--- a/demos/use_cases/model_choice_with_test_harness/run_demo.sh
+++ b/demos/use_cases/model_choice_with_test_harness/run_demo.sh
@@ -19,7 +19,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with arch_config_with_aliases.yaml..."
-  archgw up arch_config_with_aliases.yaml
+  planoai up arch_config_with_aliases.yaml
 
   echo "\n\nArch started successfully."
   echo "Please run the following command to test the setup: python bench.py\n"
@@ -29,7 +29,7 @@ start_demo() {
 stop_demo() {
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  planoai down
 }
 
 # Main script logic