diff --git a/config/products.yml b/config/products.yml
index 31a7fe4bc4..c3695423f6 100644
--- a/config/products.yml
+++ b/config/products.yml
@@ -60,7 +60,7 @@ products:
     display: 'Elastic Cloud Terraform Provider'
     versioning: 'cloud-terraform'
   terraform-google-edot-cf:
-    display: 'Terraform Google EDOT CF'
+    display: 'Terraform Google Elastic Cloud Forwarder'
     versioning: 'terraform-google-edot-cf'
   curator:
     display: 'Elasticsearch Curator'
@@ -94,13 +94,13 @@ products:
   ecs-logging-ruby:
     display: 'ECS Logging Ruby'
   edot-cf:
-    display: 'EDOT Cloud Forwarder'
+    display: 'Elastic Cloud Forwarder'
     versioning: 'stack'
   edot-sdk:
     display: 'Elastic Distribution of OpenTelemetry SDK'
     versioning: 'all'
   edot-collector:
-    display: 'Elastic Distribution of OpenTelemetry Collector'
+    display: 'Elastic Agent'
     versioning: 'stack'
   edot-ios:
     display: 'Elastic Distribution of OpenTelemetry iOS'
@@ -127,11 +127,11 @@ products:
     display: 'Elastic Distribution of OpenTelemetry Python'
     repository: 'elastic-otel-python'
   edot-cf-aws:
-    display: 'EDOT Cloud Forwarder for AWS'
+    display: 'Elastic Cloud Forwarder for AWS'
   edot-cf-azure:
-    display: 'EDOT Cloud Forwarder for Azure'
+    display: 'Elastic Cloud Forwarder for Azure'
   edot-cf-gcp:
-    display: 'EDOT Cloud Forwarder for GCP'
+    display: 'Elastic Cloud Forwarder for GCP'
   eland:
     display: 'Eland'
     versioning: 'stack'
diff --git a/config/search.yml b/config/search.yml
index b85f8c3c04..3d40ff6732 100644
--- a/config/search.yml
+++ b/config/search.yml
@@ -55,7 +55,8 @@ synonyms:
   - [ "ech", "elastic cloud hosted", "ess" ]
   - [ "eck", "elastic cloud on kubernetes" ]
   - [ "ecs", "elastic common schema" ]
-  - [ "edot", "elastic distribution of opentelemetry" ]
+  - [ "edot", "elastic distribution of opentelemetry", "elastic opentelemetry", "elastic otel" ]
+  - [ "edot collector", "edot-collector", "elastic distribution of opentelemetry collector" ]
   - [ "edr", "endpoint detection response" ]
   - [ "eis", "elastic inference service" ]
   - [ "eks", "elastic kubernetes service" ]
diff --git a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs
index d20e291c41..fabe11043f 100644
--- a/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs
+++ b/src/Elastic.Markdown/Myst/Components/ApplicabilityMappings.cs
@@ -29,19 +29,19 @@ public record ApplicabilityDefinition(string Key, string DisplayName, Versioning
 	public static readonly ApplicabilityDefinition Ecctl = new("ECCTL", "Elastic Cloud Control", VersioningSystemId.Ecctl);
 	public static readonly ApplicabilityDefinition Curator = new("Curator", "Curator", VersioningSystemId.Curator);
 
-	// EDOT Products
-	public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid);
-	public static readonly ApplicabilityDefinition EdotCfAws = new("EDOT CF AWS", "Elastic Distribution of OpenTelemetry Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws);
-	public static readonly ApplicabilityDefinition EdotCfAzure = new("EDOT CF Azure", "Elastic Distribution of OpenTelemetry Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure);
-	public static readonly ApplicabilityDefinition EdotCfGcp = new("EDOT CF GCP", "Elastic Distribution of OpenTelemetry Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp);
-	public static readonly ApplicabilityDefinition EdotCollector = new("EDOT Collector", "Elastic Distribution of OpenTelemetry Collector", VersioningSystemId.EdotCollector);
-	public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet);
-	public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos);
-	public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava);
-	public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode);
-	public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser);
-	public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp);
-	public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython);
+	// Elastic OTel Products
+	public static readonly ApplicabilityDefinition EdotAndroid = new("EDOT Android", "Elastic Distribution of OpenTelemetry Android", VersioningSystemId.EdotAndroid);
+	public static readonly ApplicabilityDefinition EdotCfAws = new("Elastic CF AWS", "Elastic Cloud Forwarder for AWS", VersioningSystemId.EdotCfAws);
+	public static readonly ApplicabilityDefinition EdotCfAzure = new("Elastic CF Azure", "Elastic Cloud Forwarder for Azure", VersioningSystemId.EdotCfAzure);
+	public static readonly ApplicabilityDefinition EdotCfGcp = new("Elastic CF GCP", "Elastic Cloud Forwarder for GCP", VersioningSystemId.EdotCfGcp);
+	public static readonly ApplicabilityDefinition EdotCollector = new("Elastic Agent", "Elastic Agent", VersioningSystemId.EdotCollector);
+	public static readonly ApplicabilityDefinition EdotDotnet = new("EDOT .NET", "Elastic Distribution of OpenTelemetry .NET", VersioningSystemId.EdotDotnet);
+	public static readonly ApplicabilityDefinition EdotIos = new("EDOT iOS", "Elastic Distribution of OpenTelemetry iOS", VersioningSystemId.EdotIos);
+	public static readonly ApplicabilityDefinition EdotJava = new("EDOT Java", "Elastic Distribution of OpenTelemetry Java", VersioningSystemId.EdotJava);
+	public static readonly ApplicabilityDefinition EdotNode = new("EDOT Node.js", "Elastic Distribution of OpenTelemetry Node.js", VersioningSystemId.EdotNode);
+	public static readonly ApplicabilityDefinition EdotBrowser = new("EDOT Browser", "Elastic Distribution of OpenTelemetry Browser (RUM)", VersioningSystemId.EdotBrowser);
+	public static readonly ApplicabilityDefinition EdotPhp = new("EDOT PHP", "Elastic Distribution of OpenTelemetry PHP", VersioningSystemId.EdotPhp);
+	public static readonly ApplicabilityDefinition EdotPython = new("EDOT Python", "Elastic Distribution of OpenTelemetry Python", VersioningSystemId.EdotPython);
 
 	// APM Agents
 	public static readonly ApplicabilityDefinition ApmAgentAndroid = new("APM Agent Android", "Application Performance Monitoring Agent for Android", VersioningSystemId.ApmAgentAndroid);
diff --git a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
index bee9e8a7c8..24e16b35f4 100644
--- a/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
+++ b/src/Elastic.Markdown/Myst/Components/ProductDescriptions.cs
@@ -141,9 +141,9 @@ bool IncludeVersionNote
 			IncludeVersionNote: true
 		),
 
-		// EDOT Products
+		// Elastic OTel Products
 		[VersioningSystemId.EdotCollector] = new ProductInfo(
-			Description: "The <strong>Elastic Distribution of OpenTelemetry (EDOT) Collector</strong> retrieves traces, metrics, and logs from your infrastructure and applications, and forwards them to Elastic Observability.",
+			Description: "<strong>Elastic Agent</strong> can run in OpenTelemetry mode to retrieve traces, metrics, and logs from your infrastructure and applications, and forward them to Elastic Observability.",
 			AdditionalAvailabilityInfo: null,
 			IncludeVersionNote: true
 		),
@@ -188,7 +188,7 @@ bool IncludeVersionNote
 			IncludeVersionNote: true
 		),
 		[VersioningSystemId.EdotCfAws] = new ProductInfo(
-			Description: "The <strong>Elastic Distribution of OpenTelemetry (EDOT) Cloud Forwarder</strong> allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.",
+			Description: "The <strong>Elastic Cloud Forwarder</strong> allows you to collect and send your telemetry data to Elastic Observability from AWS, GCP, and Azure.",
 			AdditionalAvailabilityInfo: null,
 			IncludeVersionNote: true
 		),