diff --git a/arch/docker-compose.dev.yaml b/arch/docker-compose.dev.yaml
index 5c0a5d8a..b41fd664 100644
--- a/arch/docker-compose.dev.yaml
+++ b/arch/docker-compose.dev.yaml
@@ -1,5 +1,5 @@
 services:
-  archgw:
+  plano:
     image: katanemo/plano:latest
     ports:
       - "10000:10000"
diff --git a/demos/shared/test_runner/run_demo_tests.sh b/demos/shared/test_runner/run_demo_tests.sh
index 1379b629..940df20d 100644
--- a/demos/shared/test_runner/run_demo_tests.sh
+++ b/demos/shared/test_runner/run_demo_tests.sh
@@ -20,8 +20,8 @@ do
   echo "Running tests for $demo ..."
   echo "****************************************"
   cd ../../$demo
-  echo "starting archgw"
-  archgw up config.yaml
+  echo "starting plano"
+  plano up config.yaml
   echo "starting docker containers"
   # only execute docker compose if demo is use_cases/preference_based_routing
   if [ "$demo" == "use_cases/preference_based_routing" ]; then
@@ -33,12 +33,12 @@ do
   echo "starting hurl tests"
   if ! hurl hurl_tests/*.hurl; then
     echo "Hurl tests failed for $demo"
-    echo "docker logs for archgw:"
-    docker logs archgw | tail -n 100
+    echo "docker logs for plano:"
+    docker logs plano | tail -n 100
     exit 1
   fi
-  echo "stopping docker containers and archgw"
-  archgw down
+  echo "stopping docker containers and plano"
+  plano down
   docker compose down -v
   cd ../../shared/test_runner
 done
diff --git a/demos/use_cases/mcp_filter/docker-compose.yaml b/demos/use_cases/mcp_filter/docker-compose.yaml
index f83d8796..e97028de 100644
--- a/demos/use_cases/mcp_filter/docker-compose.yaml
+++ b/demos/use_cases/mcp_filter/docker-compose.yaml
@@ -11,7 +11,7 @@ services:
     environment:
       - LLM_GATEWAY_ENDPOINT=${LLM_GATEWAY_ENDPOINT:-http://host.docker.internal:12000/v1}
       - OPENAI_API_KEY=${OPENAI_API_KEY:?OPENAI_API_KEY environment variable is required but not set}
-  archgw:
+  plano:
     build:
       context: ../../../
       dockerfile: arch/Dockerfile
diff --git a/tests/archgw/docker-compose.yaml b/tests/archgw/docker-compose.yaml
index 0696cd34..61614378 100644
--- a/tests/archgw/docker-compose.yaml
+++ b/tests/archgw/docker-compose.yaml
@@ -1,5 +1,5 @@
 services:
-  archgw:
+  plano:
     image: katanemo/plano:latest
     ports:
       - "10000:10000"
diff --git a/tests/e2e/docker-compose.yaml b/tests/e2e/docker-compose.yaml
index 4c5505fc..31dd28de 100644
--- a/tests/e2e/docker-compose.yaml
+++ b/tests/e2e/docker-compose.yaml
@@ -1,5 +1,5 @@
 services:
-  archgw:
+  plano:
     image: katanemo/plano:latest
     ports:
       - "10000:10000"