diff --git a/README.md b/README.md
index ab9785519..b5ac4ba3e 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ echo '{"responses_create_params":{"input":[{"role":"developer","content":"You ar
 
 # Collect verified rollouts
 ng_collect_rollouts \
-    +agent_name=single_tool_call_simple_agent \
+    +agent_name=example_single_tool_call_simple_agent \
     +input_jsonl_fpath=weather_query.jsonl \
     +output_jsonl_fpath=weather_rollouts.jsonl
 
diff --git a/docs/get-started/index.md b/docs/get-started/index.md
index 3f9209c5b..9026ef9c1 100644
--- a/docs/get-started/index.md
+++ b/docs/get-started/index.md
@@ -63,7 +63,7 @@ policy_model_name: gpt-4.1-2025-04-14" > env.yaml
 
 ```bash
 # Start servers (this will keep running)
-config_paths="resources_servers/example_simple_weather/configs/simple_weather.yaml,\
+config_paths="resources_servers/example_single_tool_call/configs/example_single_tool_call.yaml,\
 responses_api_models/openai_model/configs/openai_model.yaml"
 ng_run "+config_paths=[${config_paths}]"
 ```
@@ -90,7 +90,7 @@ echo '{"responses_create_params":{"input":[{"role":"developer","content":"You ar
 
 # Collect verified rollouts
 ng_collect_rollouts \
-    +agent_name=simple_weather_simple_agent \
+    +agent_name=example_single_tool_call_simple_agent \
     +input_jsonl_fpath=weather_query.jsonl \
     +output_jsonl_fpath=weather_rollouts.jsonl
 
diff --git a/docs/get-started/rollout-collection.md b/docs/get-started/rollout-collection.md
index 64250d1af..3627d1f68 100644
--- a/docs/get-started/rollout-collection.md
+++ b/docs/get-started/rollout-collection.md
@@ -66,14 +66,14 @@ responses_api_models/openai_model/configs/openai_model.yaml"
 ng_run "+config_paths=[${config_paths}]"
 ```
 
-**✅ Success Check**: You should see 3 Gym servers running including the `single_tool_call_simple_agent`, along with the head server.
+**✅ Success Check**: You should see 3 Gym servers running including the `example_single_tool_call_simple_agent`, along with the head server.
 
 ## 3. Generate Rollouts
 
 In a separate terminal, run:
 
 ```bash
-ng_collect_rollouts +agent_name=single_tool_call_simple_agent \
+ng_collect_rollouts +agent_name=example_single_tool_call_simple_agent \
     +input_jsonl_fpath=resources_servers/example_single_tool_call/data/example.jsonl \
     +output_jsonl_fpath=results/example_single_tool_call_rollouts.jsonl \
     +limit=5 \
@@ -131,10 +131,10 @@ By default, the viewer accepts requests only from localhost (`server_host=127.0.
 
 ```bash
 # Accept requests from anywhere (e.g., for remote access)
-ng_viewer +jsonl_fpath=results/simple_weather_rollouts.jsonl +server_host=0.0.0.0
+ng_viewer +jsonl_fpath=results/example_single_tool_call_rollouts.jsonl +server_host=0.0.0.0
 
 # Use a custom port
-ng_viewer +jsonl_fpath=results/simple_weather_rollouts.jsonl +server_port=8080
+ng_viewer +jsonl_fpath=results/example_single_tool_call_rollouts.jsonl +server_port=8080
 ```
 :::
 
diff --git a/docs/reference/cli-commands.md b/docs/reference/cli-commands.md
index 39c591648..0e6d6dce9 100644
--- a/docs/reference/cli-commands.md
+++ b/docs/reference/cli-commands.md
@@ -177,7 +177,7 @@ Perform a batch of rollout collection.
 
 ```bash
 ng_collect_rollouts \
-    +agent_name=single_tool_call_simple_agent \
+    +agent_name=example_single_tool_call_simple_agent \
     +input_jsonl_fpath=weather_query.jsonl \
     +output_jsonl_fpath=weather_rollouts.jsonl \
     +limit=100 \
diff --git a/nemo_gym/rollout_collection.py b/nemo_gym/rollout_collection.py
index aacad6a88..be415052a 100644
--- a/nemo_gym/rollout_collection.py
+++ b/nemo_gym/rollout_collection.py
@@ -42,7 +42,7 @@ class RolloutCollectionConfig(BaseNeMoGymCLIConfig):
 
     ```bash
     ng_collect_rollouts \
-        +agent_name=single_tool_call_simple_agent \
+        +agent_name=example_single_tool_call_simple_agent \
         +input_jsonl_fpath=weather_query.jsonl \
         +output_jsonl_fpath=weather_rollouts.jsonl \
         +limit=100 \
diff --git a/resources_servers/example_single_tool_call/client.py b/resources_servers/example_single_tool_call/client.py
index ffc957b30..e2bda7cb8 100644
--- a/resources_servers/example_single_tool_call/client.py
+++ b/resources_servers/example_single_tool_call/client.py
@@ -20,7 +20,7 @@
 
 server_client = ServerClient.load_from_global_config()
 task = server_client.post(
-    server_name="my_single_tool_call_server",
+    server_name="example_single_tool_call",
     url_path="/get_weather",
     json={
         "city": "San Francisco, CA",
diff --git a/resources_servers/example_single_tool_call/configs/example_single_tool_call.yaml b/resources_servers/example_single_tool_call/configs/example_single_tool_call.yaml
index 79af961e1..7fab6b6fb 100644
--- a/resources_servers/example_single_tool_call/configs/example_single_tool_call.yaml
+++ b/resources_servers/example_single_tool_call/configs/example_single_tool_call.yaml
@@ -5,7 +5,7 @@ example_single_tool_call:
       domain: agent
       verified: false
       description: Basic single-step tool calling
-single_tool_call_simple_agent:
+example_single_tool_call_simple_agent:
   responses_api_agents:
     simple_agent:
       entrypoint: app.py
diff --git a/responses_api_agents/simple_agent/client.py b/responses_api_agents/simple_agent/client.py
index 9f290b24d..5575532d8 100644
--- a/responses_api_agents/simple_agent/client.py
+++ b/responses_api_agents/simple_agent/client.py
@@ -21,7 +21,7 @@
 
 server_client = ServerClient.load_from_global_config()
 task = server_client.post(
-    server_name="single_tool_call_simple_agent",
+    server_name="example_single_tool_call_simple_agent",
     url_path="/v1/responses",
     json=NeMoGymResponseCreateParamsNonStreaming(
         input=[