diff --git a/README.md b/README.md
index a06316bd..18d1c925 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Engineered with purpose-built LLMs, Arch handles the critical but undifferentiat
 To get in touch with us, please join our [discord server](https://discord.gg/pGZf2gcwEc). We will be monitoring that actively and offering support there.
 
 ## Demos
-* [Function Calling](demos/function_calling/README.md) - Walk through of the core function calling capabilities Arch offers
+* [Weather Forecast](demos/weather_forecast/README.md) - Walk through of the core function calling capabilities of of arch gateway using weather forecasting service
 * [Insurance Agent](demos/insurance_agent/README.md) - Build a full insurance agent with Arch
 * [Network Agent](demos/network_agent/README.md) - Build a networking co-pilot/agent agent with Arch
 
diff --git a/arch/docker-compose.dev.yaml b/arch/docker-compose.dev.yaml
index 92fbdd75..bbac66f8 100644
--- a/arch/docker-compose.dev.yaml
+++ b/arch/docker-compose.dev.yaml
@@ -8,7 +8,7 @@ services:
       - "12000:12000"
       - "19901:9901"
     volumes:
-      - ${ARCH_CONFIG_FILE:-../demos/function_calling/arch_config.yaml}:/config/arch_config.yaml
+      - ${ARCH_CONFIG_FILE:-../demos/weather_forecast/arch_config.yaml}:/config/arch_config.yaml
       - /etc/ssl/cert.pem:/etc/ssl/cert.pem
       - ./envoy.template.yaml:/config/envoy.template.yaml
       - ./arch_config_schema.yaml:/config/arch_config_schema.yaml
diff --git a/arch/docker-compose.e2e.yaml b/arch/docker-compose.e2e.yaml
index e4557fa6..42195962 100644
--- a/arch/docker-compose.e2e.yaml
+++ b/arch/docker-compose.e2e.yaml
@@ -8,7 +8,7 @@ services:
       - "12000:12000"
       - "19901:9901"
     volumes:
-      - ${ARCH_CONFIG_FILE:-../demos/function_calling/arch_config.yaml}:/config/arch_config.yaml
+      - ${ARCH_CONFIG_FILE:-../demos/weather_forecast/arch_config.yaml}:/config/arch_config.yaml
       - /etc/ssl/cert.pem:/etc/ssl/cert.pem
       - ~/archgw_logs:/var/log/
     extra_hosts:
diff --git a/arch/docker-compose.yaml b/arch/docker-compose.yaml
index fff472c7..05d2c05f 100644
--- a/arch/docker-compose.yaml
+++ b/arch/docker-compose.yaml
@@ -8,7 +8,7 @@ services:
       - "12000:12000"
       - "19901:9901"
     volumes:
-      - ${ARCH_CONFIG_FILE:-../demos/function_calling/arch_config.yaml}:/config/arch_config.yaml
+      - ${ARCH_CONFIG_FILE:-../demos/weather_forecast/arch_config.yaml}:/config/arch_config.yaml
       - /etc/ssl/cert.pem:/etc/ssl/cert.pem
       - ~/archgw_logs:/var/log/
     env_file:
diff --git a/demos/shared/chatbot_ui/.vscode/launch.json b/demos/shared/chatbot_ui/.vscode/launch.json
index 05c7ea22..cc443eee 100644
--- a/demos/shared/chatbot_ui/.vscode/launch.json
+++ b/demos/shared/chatbot_ui/.vscode/launch.json
@@ -15,7 +15,7 @@
         "LLM": "1",
         "CHAT_COMPLETION_ENDPOINT": "http://localhost:10000/v1",
         "STREAMING": "True",
-        "ARCH_CONFIG": "../demos/function_calling/arch_config.yaml"
+        "ARCH_CONFIG": "../demos/weather_forecast/arch_config.yaml"
       }
     },
     {
diff --git a/e2e_tests/README.md b/e2e_tests/README.md
index 368fdd13..7b8dcc2f 100644
--- a/e2e_tests/README.md
+++ b/e2e_tests/README.md
@@ -4,7 +4,7 @@ e2e tests for arch llm gateway and prompt gateway
 
 To be able to run e2e tests successfully run_e2e_script prepares environment in following way,
 
-1. build and start function_calling demo (using docker compose)
+1. build and start weather_forecast demo (using docker compose)
 1. build, install and start model server async (using poetry)
 1. build and start arch gateway (using docker compose)
 1. wait for model server to be ready
@@ -15,7 +15,7 @@ To be able to run e2e tests successfully run_e2e_script prepares environment in
 2. cleanup
    1. stops arch gateway
    2. stops model server
-   3. stops function_calling demo
+   3. stops weather_forecast demo
 
 ## How to run