diff --git a/README.md b/README.md
index 0cb0d93634..1fa01a7aed 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,8 @@ HolmesGPT integrates with popular observability and cloud platforms. The followi
 | [<img src="images/integration_logos/docker_logo.png" alt="Docker" width="20" style="vertical-align: middle;"> **Docker**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/docker/) | ✅ | Get images, logs, events, history and more |
 | [<img src="images/integration_logos/github_logo.png" alt="GitHub" width="20" style="vertical-align: middle;"> **GitHub**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/github/) | 🟡 Beta | Remediate alerts by opening pull requests with fixes |
 | [<img src="images/integration_logos/datadog_logo.png" alt="DataDog" width="20" style="vertical-align: middle;"> **DataDog**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/datadog/) | 🟡 Beta | Fetches log data from datadog  |
-| [<img src="images/integration_logos/grafana_loki-icon.png" alt="Loki" width="20" style="vertical-align: middle;"> **Grafana Loki**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/grafanaloki/) | ✅ | Query logs for Kubernetes resources or any query |
-| [<img src="images/integration_logos/tempo_logo.png" alt="Tempo" width="20" style="vertical-align: middle;"> **Grafana Tempo**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/grafanatempo/) | ✅ | Fetch trace info, debug issues like high latency in application. |
+| [<img src="images/integration_logos/grafana_loki-icon.png" alt="Loki" width="20" style="vertical-align: middle;"> **Loki**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/grafanaloki/) | ✅ | Query logs for Kubernetes resources or any query |
+| [<img src="images/integration_logos/tempo_logo.png" alt="Tempo" width="20" style="vertical-align: middle;"> **Tempo**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/grafanatempo/) | ✅ | Fetch trace info, debug issues like high latency in application. |
 | [<img src="images/integration_logos/helm_logo.png" alt="Helm" width="20" style="vertical-align: middle;"> **Helm**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/helm/) | ✅ | Release status, chart metadata, and values |
 | [<img src="images/integration_logos/http-icon.png" alt="Internet" width="20" style="vertical-align: middle;"> **Internet**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/internet/) | ✅ | Public runbooks, community docs etc |
 | [<img src="images/integration_logos/kafka_logo.png" alt="Kafka" width="20" style="vertical-align: middle;"> **Kafka**](https://robusta-dev.github.io/holmesgpt/data-sources/builtin-toolsets/kafka/) | ✅ | Fetch metadata, list consumers and topics or find lagging consumer groups |
diff --git a/docs/data-sources/builtin-toolsets/datetime.md b/docs/data-sources/builtin-toolsets/datetime.md
index 1e76a5f0c0..2852808f25 100644
--- a/docs/data-sources/builtin-toolsets/datetime.md
+++ b/docs/data-sources/builtin-toolsets/datetime.md
@@ -6,7 +6,7 @@ By enabling this toolset, HolmesGPT will be able to get the current UTC date and
 
 The following built-in toolsets depend on `datetime`:
 
-* Grafana Loki
+* Loki
 * Prometheus
 * Coralogix logs
 
diff --git a/docs/data-sources/builtin-toolsets/grafanaloki.md b/docs/data-sources/builtin-toolsets/grafanaloki.md
index 314c416fd7..51b013fb64 100644
--- a/docs/data-sources/builtin-toolsets/grafanaloki.md
+++ b/docs/data-sources/builtin-toolsets/grafanaloki.md
@@ -1,4 +1,4 @@
-# Grafana Loki
+# Loki
 
 Connect HolmesGPT to Loki for log analysis through Grafana or direct API access. Provides access to historical logs and advanced log queries.
 
diff --git a/docs/data-sources/builtin-toolsets/grafanatempo.md b/docs/data-sources/builtin-toolsets/grafanatempo.md
index 0670643f7f..9f26631ce2 100644
--- a/docs/data-sources/builtin-toolsets/grafanatempo.md
+++ b/docs/data-sources/builtin-toolsets/grafanatempo.md
@@ -1,6 +1,6 @@
-# Grafana Tempo
+# Tempo
 
-By enabling this toolset, HolmesGPT will be able to fetch trace information from Grafana Tempo to debug performance related issues, like high latency in your application.
+By enabling this toolset, HolmesGPT will be able to fetch trace information from Tempo to debug performance related issues, like high latency in your application.
 
 ## Proxying through Grafana
 
diff --git a/docs/data-sources/builtin-toolsets/index.md b/docs/data-sources/builtin-toolsets/index.md
index 4d5b27acec..cec9c3fae0 100644
--- a/docs/data-sources/builtin-toolsets/index.md
+++ b/docs/data-sources/builtin-toolsets/index.md
@@ -17,8 +17,8 @@ HolmesGPT includes pre-built integrations for popular monitoring and observabili
 -   [:material-clock:{ .lg .middle } **Datetime**](datetime.md)
 -   [:simple-docker:{ .lg .middle } **Docker**](docker.md)
 -   [:material-github:{ .lg .middle } **GitHub**](github.md)
--   [:simple-grafana:{ .lg .middle } **Grafana Loki**](grafanaloki.md)
--   [:simple-grafana:{ .lg .middle } **Grafana Tempo**](grafanatempo.md)
+-   [:simple-grafana:{ .lg .middle } **Loki**](grafanaloki.md)
+-   [:simple-grafana:{ .lg .middle } **Tempo**](grafanatempo.md)
 -   [:material-package:{ .lg .middle } **Helm**](helm.md)
 -   [:material-web:{ .lg .middle } **Internet**](internet.md)
 -   [:simple-apachekafka:{ .lg .middle } **Kafka**](kafka.md)
diff --git a/docs/snippets/toolsets_that_provide_logging.md b/docs/snippets/toolsets_that_provide_logging.md
index b138890f7f..51b4cccf46 100644
--- a/docs/snippets/toolsets_that_provide_logging.md
+++ b/docs/snippets/toolsets_that_provide_logging.md
@@ -5,7 +5,7 @@
     **Available Log Sources:**
 
     - **[Kubernetes logs](kubernetes.md)** - Direct pod log access (enabled by default)
-    - **[Grafana Loki](grafanaloki.md)** - Centralized logs via Loki
+    - **[Loki](grafanaloki.md)** - Centralized logs via Loki
     - **[OpenSearch logs](opensearch-logs.md)** - Logs from OpenSearch/Elasticsearch
     - **[Coralogix logs](coralogix-logs.md)** - Logs via Coralogix platform
     - **[DataDog](datadog.md)** - Logs from DataDog
diff --git a/holmes/plugins/toolsets/grafana/toolset_grafana_loki.py b/holmes/plugins/toolsets/grafana/toolset_grafana_loki.py
index 90c6a767e1..e6911cd68a 100644
--- a/holmes/plugins/toolsets/grafana/toolset_grafana_loki.py
+++ b/holmes/plugins/toolsets/grafana/toolset_grafana_loki.py
@@ -49,7 +49,7 @@ def __init__(self):
 
     def prerequisites_callable(self, config: dict[str, Any]) -> tuple[bool, str]:
         if not config:
-            return False, "Missing Grafana Loki configuration. Check your config."
+            return False, "Missing Loki configuration. Check your config."
 
         self.config = GrafanaLokiConfig(**config)
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 0c430425fc..f3b4f62db8 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -165,8 +165,8 @@ nav:
           - Datetime: data-sources/builtin-toolsets/datetime.md
           - Docker: data-sources/builtin-toolsets/docker.md
           - GitHub: data-sources/builtin-toolsets/github.md
-          - Grafana Loki: data-sources/builtin-toolsets/grafanaloki.md
-          - Grafana Tempo: data-sources/builtin-toolsets/grafanatempo.md
+          - Loki: data-sources/builtin-toolsets/grafanaloki.md
+          - Tempo: data-sources/builtin-toolsets/grafanatempo.md
           - Helm: data-sources/builtin-toolsets/helm.md
           - Internet: data-sources/builtin-toolsets/internet.md
           - Kafka: data-sources/builtin-toolsets/kafka.md
diff --git a/tests/llm/fixtures/test_ask_holmes/23_app_error_in_current_logs/test_case.yaml b/tests/llm/fixtures/test_ask_holmes/23_app_error_in_current_logs/test_case.yaml
index 5db9c8f3bb..ff14c14039 100644
--- a/tests/llm/fixtures/test_ask_holmes/23_app_error_in_current_logs/test_case.yaml
+++ b/tests/llm/fixtures/test_ask_holmes/23_app_error_in_current_logs/test_case.yaml
@@ -3,6 +3,7 @@ expected_output:
   - The `meme-deployment` is experiencing issues due to a DNS resolution error.
   - This indicates that the hostname `memcom` cannot be resolved to an IP address.
 before_test: |
+  kubectl create namespace app-23 || true
   kubectl apply -f ./manifests/
   kubectl wait --for=condition=available --timeout=120s deployment/curl-deployment -n app-23
   kubectl wait --for=condition=available --timeout=120s deployment/meme-deployment -n app-23
diff --git a/tests/llm/fixtures/test_investigate/14_tempo/toolsets.yaml b/tests/llm/fixtures/test_investigate/14_tempo/toolsets.yaml
index cbc74a9a1e..93a8f083ba 100644
--- a/tests/llm/fixtures/test_investigate/14_tempo/toolsets.yaml
+++ b/tests/llm/fixtures/test_investigate/14_tempo/toolsets.yaml
@@ -19,4 +19,4 @@ toolsets:
     enabled: False
 # Relies on https://github.com/robusta-dev/kubernetes-demos/tree/main/minishop-telemetry
 # Requires
-# - Grafana tempo receiving telemetry from minishop
+# - tempo receiving telemetry from minishop