diff --git a/demos/samples_java/weather_forcecast_service/docker-compose.yaml b/demos/samples_java/weather_forcecast_service/docker-compose.yaml
index 6dd1d419..6ee9233c 100644
--- a/demos/samples_java/weather_forcecast_service/docker-compose.yaml
+++ b/demos/samples_java/weather_forcecast_service/docker-compose.yaml
@@ -18,7 +18,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/samples_java/weather_forcecast_service/run_demo.sh b/demos/samples_java/weather_forcecast_service/run_demo.sh
index e04b737d..b18ac295 100644
--- a/demos/samples_java/weather_forcecast_service/run_demo.sh
+++ b/demos/samples_java/weather_forcecast_service/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/samples_python/currency_exchange/docker-compose.yaml b/demos/samples_python/currency_exchange/docker-compose.yaml
index c02110dd..527e0c1b 100644
--- a/demos/samples_python/currency_exchange/docker-compose.yaml
+++ b/demos/samples_python/currency_exchange/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/samples_python/currency_exchange/run_demo.sh b/demos/samples_python/currency_exchange/run_demo.sh
index e04b737d..b18ac295 100644
--- a/demos/samples_python/currency_exchange/run_demo.sh
+++ b/demos/samples_python/currency_exchange/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/samples_python/multi_turn_rag_agent/docker-compose.yaml b/demos/samples_python/multi_turn_rag_agent/docker-compose.yaml
index 739bdde0..af1ab008 100644
--- a/demos/samples_python/multi_turn_rag_agent/docker-compose.yaml
+++ b/demos/samples_python/multi_turn_rag_agent/docker-compose.yaml
@@ -21,4 +21,4 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
diff --git a/demos/samples_python/multi_turn_rag_agent/run_demo.sh b/demos/samples_python/multi_turn_rag_agent/run_demo.sh
index 58200de5..caf706a9 100644
--- a/demos/samples_python/multi_turn_rag_agent/run_demo.sh
+++ b/demos/samples_python/multi_turn_rag_agent/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start Network Agent
   echo "Starting HR Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/samples_python/stock_quote/docker-compose.yaml b/demos/samples_python/stock_quote/docker-compose.yaml
index b39b59bf..d08a7a06 100644
--- a/demos/samples_python/stock_quote/docker-compose.yaml
+++ b/demos/samples_python/stock_quote/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/samples_python/stock_quote/run_demo.sh b/demos/samples_python/stock_quote/run_demo.sh
index e04b737d..b18ac295 100644
--- a/demos/samples_python/stock_quote/run_demo.sh
+++ b/demos/samples_python/stock_quote/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml b/demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml
index f17c45b7..535f90cb 100644
--- a/demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml
+++ b/demos/samples_python/weather_forecast/docker-compose-honeycomb.yaml
@@ -20,7 +20,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   otel-collector:
     build:
diff --git a/demos/samples_python/weather_forecast/docker-compose-jaeger.yaml b/demos/samples_python/weather_forecast/docker-compose-jaeger.yaml
index 4baf5a59..933d5d47 100644
--- a/demos/samples_python/weather_forecast/docker-compose-jaeger.yaml
+++ b/demos/samples_python/weather_forecast/docker-compose-jaeger.yaml
@@ -20,7 +20,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/samples_python/weather_forecast/docker-compose-logfire.yaml b/demos/samples_python/weather_forecast/docker-compose-logfire.yaml
index f3ac97d0..890efcda 100644
--- a/demos/samples_python/weather_forecast/docker-compose-logfire.yaml
+++ b/demos/samples_python/weather_forecast/docker-compose-logfire.yaml
@@ -20,7 +20,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   otel-collector:
     build:
diff --git a/demos/samples_python/weather_forecast/docker-compose-signoz.yaml b/demos/samples_python/weather_forecast/docker-compose-signoz.yaml
index e6ce8857..5625ff4e 100644
--- a/demos/samples_python/weather_forecast/docker-compose-signoz.yaml
+++ b/demos/samples_python/weather_forecast/docker-compose-signoz.yaml
@@ -23,7 +23,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   prometheus:
     build:
diff --git a/demos/samples_python/weather_forecast/docker-compose.yaml b/demos/samples_python/weather_forecast/docker-compose.yaml
index 51cf0d6d..c8e2e425 100644
--- a/demos/samples_python/weather_forecast/docker-compose.yaml
+++ b/demos/samples_python/weather_forecast/docker-compose.yaml
@@ -20,4 +20,4 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
diff --git a/demos/samples_python/weather_forecast/run_demo.sh b/demos/samples_python/weather_forecast/run_demo.sh
index 498a5ab5..7424ec03 100644
--- a/demos/samples_python/weather_forecast/run_demo.sh
+++ b/demos/samples_python/weather_forecast/run_demo.sh
@@ -74,7 +74,7 @@ start_demo() {
 
   # Step 4: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 5: Start Network Agent with the chosen Docker Compose file
   echo "Starting Network Agent with $COMPOSE_FILE..."
@@ -93,7 +93,7 @@ stop_demo() {
 
   # Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/use_cases/README.md b/demos/use_cases/README.md
index 69cf4ac7..451d34d1 100644
--- a/demos/use_cases/README.md
+++ b/demos/use_cases/README.md
@@ -28,8 +28,8 @@ Once the config file is created ensure that you have env vars setup for `MISTRAL
 Start arch gateway,
 
 ```
-$ archgw up config.yaml
-2024-12-05 11:24:51,288 - cli.main - INFO - Starting archgw cli version: 0.1.5
+$ plano up config.yaml
+2024-12-05 11:24:51,288 - cli.main - INFO - Starting plano cli version: 0.4.0
 2024-12-05 11:24:51,825 - cli.utils - INFO - Schema validation successful!
 2024-12-05 11:24:51,825 - cli.main - INFO - Starting arch model server and arch gateway
 ...
diff --git a/demos/use_cases/llm_routing/run_demo.sh b/demos/use_cases/llm_routing/run_demo.sh
index 9bf9e515..4cdfd92e 100644
--- a/demos/use_cases/llm_routing/run_demo.sh
+++ b/demos/use_cases/llm_routing/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start LLM Routing
   echo "Starting LLM Routing using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/use_cases/mcp_filter/README.md b/demos/use_cases/mcp_filter/README.md
index 386592ee..9b6de416 100644
--- a/demos/use_cases/mcp_filter/README.md
+++ b/demos/use_cases/mcp_filter/README.md
@@ -1,6 +1,6 @@
 # RAG Agent Demo
 
-A multi-agent RAG system demonstrating archgw's agent filter chain with MCP protocol.
+A multi-agent RAG system demonstrating plano's agent filter chain with MCP protocol.
 
 ## Architecture
 
@@ -46,9 +46,9 @@ This starts:
 - Context Builder MCP server on port 10502
 - RAG Agent REST server on port 10505
 
-### 2. Start archgw
+### 2. Start plano
 ```bash
-archgw up --foreground
+plano up --foreground
 ```
 
 ### 3. Test the system
@@ -82,7 +82,7 @@ filters:
 
 ## How It Works
 
-1. User sends request to archgw listener on port 8001
+1. User sends request to plano listener on port 8001
 2. Request passes through MCP filter chain:
    - **Input Guards** validates the query is within TechCorp's domain
    - **Query Rewriter** rewrites the query for better retrieval
@@ -113,7 +113,7 @@ curl -X POST http://localhost:8001/v1/chat/completions \
     ]
   }'
 ```
-- `LLM_GATEWAY_ENDPOINT` - archgw endpoint (default: `http://localhost:12000/v1`)
+- `LLM_GATEWAY_ENDPOINT` - lpano endpoint (default: `http://localhost:12000/v1`)
 - `OPENAI_API_KEY` - OpenAI API key for model providers
 
 ## Additional Resources
diff --git a/demos/use_cases/mcp_filter/docker-compose.yaml b/demos/use_cases/mcp_filter/docker-compose.yaml
index e97028de..3c6f0138 100644
--- a/demos/use_cases/mcp_filter/docker-compose.yaml
+++ b/demos/use_cases/mcp_filter/docker-compose.yaml
@@ -22,7 +22,7 @@ services:
       - ARCH_CONFIG_PATH=/config/config.yaml
       - OPENAI_API_KEY=${OPENAI_API_KEY:?OPENAI_API_KEY environment variable is required but not set}
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
       - /etc/ssl/cert.pem:/etc/ssl/cert.pem
   jaeger:
     build:
diff --git a/demos/use_cases/model_choice_with_test_harness/README.md b/demos/use_cases/model_choice_with_test_harness/README.md
index 8548c21c..d1b0a730 100644
--- a/demos/use_cases/model_choice_with_test_harness/README.md
+++ b/demos/use_cases/model_choice_with_test_harness/README.md
@@ -1,6 +1,6 @@
 # Model Choice Newsletter Demo
 
-This folder demonstrates a practical workflow for rapid model adoption and safe model switching using Arch Gateway (`archgw`). It includes both a minimal test harness and a sample proxy configuration.
+This folder demonstrates a practical workflow for rapid model adoption and safe model switching using Arch Gateway (`plano`). It includes both a minimal test harness and a sample proxy configuration.
 
 ---
 
@@ -34,13 +34,13 @@ fixtures:
 
 #### 2. Candidate Models
 
-List the model aliases (e.g., `arch.summarize.v1`, `arch.reason.v1`) you want to test. The harness will route requests through `archgw`, so you don’t need provider API keys in your code.
+List the model aliases (e.g., `arch.summarize.v1`, `arch.reason.v1`) you want to test. The harness will route requests through `plano`, so you don’t need provider API keys in your code.
 
 #### 3. Minimal Python Harness
 
 See `bench.py` for a complete example. It:
 - Loads fixtures.
-- Sends requests to each candidate model via `archgw`.
+- Sends requests to each candidate model via `plano`.
 - Validates output against schema and anchor words.
 - Reports success rate and latency.
 
@@ -60,7 +60,7 @@ python bench.py
 
 ### Part 2 — Network Infrastructure
 
-**Goal:** Use a proxy server (`archgw`) to decouple your app from vendor-specific model names and centralize control.
+**Goal:** Use a proxy server (`plano`) to decouple your app from vendor-specific model names and centralize control.
 
 #### Why Use a Proxy?
 
@@ -108,12 +108,12 @@ See `config.yaml` for a sample configuration mapping aliases to provider models.
 - `bench.py` — Minimal Python test harness
 - `evals_summarize.yaml` — Example test fixtures
 - `pyproject.toml` — Poetry environment file
-- `config.yaml` — Sample archgw config (if present)
+- `config.yaml` — Sample plano config (if present)
 
 ---
 
 ## Troubleshooting
 
 - If you see `Success: 0/2 (0%)`, check your anchor words and prompt clarity.
-- Make sure archgw is running and accessible at `http://localhost:12000/`.
+- Make sure plano is running and accessible at `http://localhost:12000/`.
 - For schema validation errors, ensure your prompt instructs the model to output the correct JSON structure.
diff --git a/demos/use_cases/ollama/docker-compose.yaml b/demos/use_cases/ollama/docker-compose.yaml
index 093c7491..81c4a57f 100644
--- a/demos/use_cases/ollama/docker-compose.yaml
+++ b/demos/use_cases/ollama/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/use_cases/ollama/docker-compose_honeycomb.yaml b/demos/use_cases/ollama/docker-compose_honeycomb.yaml
index 01853750..49b1589f 100644
--- a/demos/use_cases/ollama/docker-compose_honeycomb.yaml
+++ b/demos/use_cases/ollama/docker-compose_honeycomb.yaml
@@ -10,7 +10,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   otel-collector:
     build:
diff --git a/demos/use_cases/ollama/run_demo.sh b/demos/use_cases/ollama/run_demo.sh
index e04b737d..b18ac295 100644
--- a/demos/use_cases/ollama/run_demo.sh
+++ b/demos/use_cases/ollama/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/demos/use_cases/preference_based_routing/README.md b/demos/use_cases/preference_based_routing/README.md
index 2c8938ed..54acb895 100644
--- a/demos/use_cases/preference_based_routing/README.md
+++ b/demos/use_cases/preference_based_routing/README.md
@@ -3,7 +3,7 @@ This demo shows how you can use user preferences to route user prompts to approp
 
 ## How to start the demo
 
-Make sure your machine is up to date with [latest version of archgw]([url](https://github.com/katanemo/archgw/tree/main?tab=readme-ov-file#prerequisites)). And you have activated the virtual environment.
+Make sure your machine is up to date with [latest version of plano]([url](https://github.com/katanemo/plano/tree/main?tab=readme-ov-file#prerequisites)). And you have activated the virtual environment.
 
 
 1. start the openwebui
@@ -11,15 +11,15 @@ Make sure your machine is up to date with [latest version of archgw]([url](https
 (venv) $ cd demos/use_cases/preference_based_routing
 (venv) $ docker compose up -d
 ```
-2. start archgw in the foreground
+2. start plano in the foreground
 ```bash
-(venv) $ archgw up --service archgw --foreground
-2025-05-30 18:00:09,953 - cli.main - INFO - Starting archgw cli version: 0.4.0
+(venv) $ plano up --service plano --foreground
+2025-05-30 18:00:09,953 - cli.main - INFO - Starting plano cli version: 0.4.0
 2025-05-30 18:00:09,953 - cli.main - INFO - Validating /Users/adilhafeez/src/intelligent-prompt-gateway/demos/use_cases/preference_based_routing/config.yaml
-2025-05-30 18:00:10,422 - cli.core - INFO - Starting arch gateway, image name: archgw, tag: katanemo/plano:0.4.0
-2025-05-30 18:00:10,662 - cli.core - INFO - archgw status: running, health status: starting
-2025-05-30 18:00:11,712 - cli.core - INFO - archgw status: running, health status: starting
-2025-05-30 18:00:12,761 - cli.core - INFO - archgw is running and is healthy!
+2025-05-30 18:00:10,422 - cli.core - INFO - Starting arch gateway, image name: plano, tag: katanemo/plano:0.4.0
+2025-05-30 18:00:10,662 - cli.core - INFO - plano status: running, health status: starting
+2025-05-30 18:00:11,712 - cli.core - INFO - plano status: running, health status: starting
+2025-05-30 18:00:12,761 - cli.core - INFO - plano is running and is healthy!
 ...
 ```
 
diff --git a/demos/use_cases/spotify_bearer_auth/docker-compose.yaml b/demos/use_cases/spotify_bearer_auth/docker-compose.yaml
index c02110dd..527e0c1b 100644
--- a/demos/use_cases/spotify_bearer_auth/docker-compose.yaml
+++ b/demos/use_cases/spotify_bearer_auth/docker-compose.yaml
@@ -10,7 +10,7 @@ services:
     extra_hosts:
       - "host.docker.internal:host-gateway"
     volumes:
-      - ./config.yaml:/app/config.yaml
+      - ./config.yaml:/app/arch_config.yaml
 
   jaeger:
     build:
diff --git a/demos/use_cases/spotify_bearer_auth/run_demo.sh b/demos/use_cases/spotify_bearer_auth/run_demo.sh
index e04b737d..b18ac295 100644
--- a/demos/use_cases/spotify_bearer_auth/run_demo.sh
+++ b/demos/use_cases/spotify_bearer_auth/run_demo.sh
@@ -20,7 +20,7 @@ start_demo() {
 
   # Step 3: Start Arch
   echo "Starting Arch with config.yaml..."
-  archgw up config.yaml
+  plano up config.yaml
 
   # Step 4: Start developer services
   echo "Starting Network Agent using Docker Compose..."
@@ -35,7 +35,7 @@ stop_demo() {
 
   # Step 2: Stop Arch
   echo "Stopping Arch..."
-  archgw down
+  plano down
 }
 
 # Main script logic
diff --git a/tests/e2e/run_e2e_tests.sh b/tests/e2e/run_e2e_tests.sh
index 0606f5f7..e38698a1 100644
--- a/tests/e2e/run_e2e_tests.sh
+++ b/tests/e2e/run_e2e_tests.sh
@@ -39,7 +39,7 @@ cd ../../
 plano build
 cd -
 
-# Once we build archgw we have to install the dependencies again to a new virtual environment.
+# Once we build plano we have to install the dependencies again to a new virtual environment.
 poetry install
 
 log startup arch gateway with function calling demo