diff --git a/README.md b/README.md
index 9a2e1845..402e193d 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ Plano's CLI allows you to manage and interact with the Plano gateway efficiently
 ```console
 $ python3.12 -m venv venv
 $ source venv/bin/activate   # On Windows, use: venv\Scripts\activate
-$ pip install plano==0.4.0
+$ pip install planoai==0.4.0
 ```
 
 ### Use Plano as a LLM Router
@@ -160,7 +160,7 @@ tracing:
 Run your `flight_agent` and `hotel_agent` services (see the [Orchestration guide](https://docs.planoai.dev/guides/orchestration.html) for a full Travel Booking example), then start Plano with the config above:
 
 ```console
-$ plano up plano_config.yaml
+$ planoai up plano_config.yaml
 ```
 
 Plano will start the orchestrator and expose an agent listener on port `8001`.
@@ -232,7 +232,7 @@ endpoints:
 ##### Step 2. Start Plano with currency conversion config
 
 ```sh
-$ plano up plano_config.yaml
+$ planoai up plano_config.yaml
 2024-12-05 16:56:27,979 - cli.main - INFO - Starting plano cli version: 0.4.0
 2024-12-05 16:56:28,485 - cli.utils - INFO - Schema validation successful!
 2024-12-05 16:56:28,485 - cli.main - INFO - Starting plano model server and plano gateway
diff --git a/arch/tools/README.md b/arch/tools/README.md
index 98f28968..2cd7ddb2 100644
--- a/arch/tools/README.md
+++ b/arch/tools/README.md
@@ -19,12 +19,12 @@ source venv/bin/activate
 
 ### Step 3: Run the build script
 ```bash
-pip install plano==0.4.0
+pip install planoai==0.4.0
 ```
 
 ## Uninstall Instructions: plano CLI
 ```bash
-pip uninstall plano
+pip uninstall planoai
 ```
 
 ## Setup Instructions (Dev): plano CLI
@@ -53,16 +53,16 @@ poetry install
 
 ### Step 4: build Arch
 ```bash
-plano build
+planoai build
 ```
 
 ### Logs
 `plano` command can also view logs from the gateway. Use following command to view logs,
 
 ```bash
-plano logs --follow
+planoai logs --follow
 ```
 
 ## Uninstall Instructions: plano CLI
 ```bash
-pip uninstall plano
+pip uninstall planoai
diff --git a/arch/tools/pyproject.toml b/arch/tools/pyproject.toml
index 5dd8b4a4..a14c1c12 100644
--- a/arch/tools/pyproject.toml
+++ b/arch/tools/pyproject.toml
@@ -1,5 +1,5 @@
 [tool.poetry]
-name = "plano"
+name = "planoai"
 version = "0.4.0"
 description = "Python-based CLI tool to manage Plano."
 authors = ["Katanemo Labs, Inc."]
@@ -18,7 +18,7 @@ requests = ">=2.31.0,<3.0.0"
 pytest = ">=8.4.1,<9.0.0"
 
 [tool.poetry.scripts]
-plano = "cli.main:main"
+planoai = "cli.main:main"
 
 [build-system]
 requires = ["poetry-core>=2.0.0"]
diff --git a/demos/samples_java/weather_forcecast_service/run_demo.sh b/demos/samples_java/weather_forcecast_service/run_demo.sh
index b18ac295..992bb260 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/samples_python/currency_exchange/run_demo.sh b/demos/samples_python/currency_exchange/run_demo.sh
index b18ac295..992bb260 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
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 caf706a9..7f8f0214 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/samples_python/stock_quote/run_demo.sh b/demos/samples_python/stock_quote/run_demo.sh
index b18ac295..992bb260 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/samples_python/weather_forecast/run_demo.sh b/demos/samples_python/weather_forecast/run_demo.sh
index 7424ec03..5e955e31 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/shared/test_runner/run_demo_tests.sh b/demos/shared/test_runner/run_demo_tests.sh
index 940df20d..3a035a47 100644
--- a/demos/shared/test_runner/run_demo_tests.sh
+++ b/demos/shared/test_runner/run_demo_tests.sh
@@ -21,7 +21,7 @@ do
   echo "****************************************"
   cd ../../$demo
   echo "starting plano"
-  plano up config.yaml
+  planoai 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
@@ -38,7 +38,7 @@ do
     exit 1
   fi
   echo "stopping docker containers and plano"
-  plano down
+  planoai down
   docker compose down -v
   cd ../../shared/test_runner
 done
diff --git a/demos/use_cases/README.md b/demos/use_cases/README.md
index 451d34d1..99c7b453 100644
--- a/demos/use_cases/README.md
+++ b/demos/use_cases/README.md
@@ -28,7 +28,7 @@ Once the config file is created ensure that you have env vars setup for `MISTRAL
 Start arch gateway,
 
 ```
-$ plano up config.yaml
+$ planoai 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 4cdfd92e..452a9b72 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/use_cases/mcp_filter/README.md b/demos/use_cases/mcp_filter/README.md
index 9b6de416..16a08d01 100644
--- a/demos/use_cases/mcp_filter/README.md
+++ b/demos/use_cases/mcp_filter/README.md
@@ -48,7 +48,7 @@ This starts:
 
 ### 2. Start plano
 ```bash
-plano up --foreground
+planoai up --foreground
 ```
 
 ### 3. Test the system
diff --git a/demos/use_cases/ollama/run_demo.sh b/demos/use_cases/ollama/run_demo.sh
index b18ac295..992bb260 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai 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 54acb895..4ccaeefa 100644
--- a/demos/use_cases/preference_based_routing/README.md
+++ b/demos/use_cases/preference_based_routing/README.md
@@ -13,7 +13,7 @@ Make sure your machine is up to date with [latest version of plano]([url](https:
 ```
 2. start plano in the foreground
 ```bash
-(venv) $ plano up --service plano --foreground
+(venv) $ planoai 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: plano, tag: katanemo/plano:0.4.0
diff --git a/demos/use_cases/spotify_bearer_auth/run_demo.sh b/demos/use_cases/spotify_bearer_auth/run_demo.sh
index b18ac295..992bb260 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..."
-  plano up config.yaml
+  planoai 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..."
-  plano down
+  planoai down
 }
 
 # Main script logic
diff --git a/demos/use_cases/travel_agents/README.md b/demos/use_cases/travel_agents/README.md
index ec762872..d1cc3466 100644
--- a/demos/use_cases/travel_agents/README.md
+++ b/demos/use_cases/travel_agents/README.md
@@ -60,7 +60,7 @@ In a new terminal:
 
 ```bash
 cd /path/to/travel_agents
-plano up config.yaml
+planoai up config.yaml
 ```
 
 The gateway will start on port 8001 and route requests to the appropriate agents.
diff --git a/docs/source/get_started/quickstart.rst b/docs/source/get_started/quickstart.rst
index 82556039..8cefaaba 100644
--- a/docs/source/get_started/quickstart.rst
+++ b/docs/source/get_started/quickstart.rst
@@ -32,7 +32,7 @@ Plano's CLI allows you to manage and interact with the Plano efficiently. To ins
 
    $ python -m venv venv
    $ source venv/bin/activate   # On Windows, use: venv\Scripts\activate
-   $ pip install plano==0.4.0
+   $ pip install planoai==0.4.0
 
 
 Build Agentic Apps with Plano
@@ -98,7 +98,7 @@ Run your ``flight_agent`` and ``hotel_agent`` services (see :ref:`Orchestration
 
 .. code-block:: console
 
-  $ plano up plano_config.yaml
+  $ planoai up plano_config.yaml
 
 Plano will start the orchestrator and expose an agent listener on port ``8001``.
 
@@ -176,7 +176,7 @@ Step 2. Start plano with currency conversion config
 
 .. code-block:: sh
 
-   $ plano up plano_config.yaml
+   $ planoai up plano_config.yaml
    2024-12-05 16:56:27,979 - cli.main - INFO - Starting plano cli version: 0.1.5
    ...
    2024-12-05 16:56:28,485 - cli.utils - INFO - Schema validation successful!
@@ -252,7 +252,7 @@ Start Plano:
 
 .. code-block:: console
 
-   $ plano up plano_config.yaml
+   $ planoai up plano_config.yaml
    2024-12-05 11:24:51,288 - cli.main - INFO - Starting plano cli version: 0.1.5
    2024-12-05 11:24:51,825 - cli.utils - INFO - Schema validation successful!
    2024-12-05 11:24:51,825 - cli.main - INFO - Starting plano
diff --git a/tests/e2e/run_e2e_tests.sh b/tests/e2e/run_e2e_tests.sh
index e38698a1..e6269065 100644
--- a/tests/e2e/run_e2e_tests.sh
+++ b/tests/e2e/run_e2e_tests.sh
@@ -14,7 +14,7 @@ print_debug() {
   log "Printing debug logs for docker"
   log "===================================="
   tail -n 100 ../build.log
-  plano logs --debug | tail -n 100
+  planoai logs --debug | tail -n 100
 }
 
 trap 'print_debug' INT TERM ERR
@@ -36,7 +36,7 @@ cd -
 log building docker image for arch gateway
 log ======================================
 cd ../../
-plano build
+planoai build
 cd -
 
 # Once we build plano we have to install the dependencies again to a new virtual environment.
@@ -44,8 +44,8 @@ poetry install
 
 log startup arch gateway with function calling demo
 cd ../../
-plano down
-plano up demos/samples_python/weather_forecast/config.yaml
+planoai down
+planoai up demos/samples_python/weather_forecast/config.yaml
 cd -
 
 log running e2e tests for prompt gateway
@@ -54,11 +54,11 @@ poetry run pytest test_prompt_gateway.py
 
 log shutting down the arch gateway service for prompt_gateway demo
 log ===============================================================
-plano down
+planoai down
 
 log startup arch gateway with model alias routing demo
 cd ../../
-plano up demos/use_cases/model_alias_routing/config_with_aliases.yaml
+planoai up demos/use_cases/model_alias_routing/config_with_aliases.yaml
 cd -
 
 log running e2e tests for model alias routing
@@ -70,8 +70,8 @@ log ========================================
 poetry run pytest test_openai_responses_api_client.py
 
 log startup arch gateway with state storage for openai responses api client demo
-plano down
-plano up config_memory_state_v1_responses.yaml
+planoai down
+planoai up config_memory_state_v1_responses.yaml
 
 log running e2e tests for openai responses api client
 log ========================================