diff --git a/docs/sources/datasources/aws-cloudwatch/_index.md b/docs/sources/datasources/aws-cloudwatch/_index.md
index 2df89e86dc5..3bb9a4160ef 100644
--- a/docs/sources/datasources/aws-cloudwatch/_index.md
+++ b/docs/sources/datasources/aws-cloudwatch/_index.md
@@ -6,19 +6,19 @@ aliases:
   - cloudwatch/
   - preconfig-cloudwatch-dashboards/
   - provision-cloudwatch/
-description: Guide for using AWS CloudWatch in Grafana
+description: Guide for using Amazon CloudWatch in Grafana
 keywords:
   - grafana
   - cloudwatch
   - guide
-menuTitle: AWS CloudWatch
-title: AWS CloudWatch data source
+menuTitle: Amazon CloudWatch
+title: Amazon CloudWatch data source
 weight: 200
 ---
 
-# AWS CloudWatch data source
+# Amazon CloudWatch data source
 
-Grafana ships with built-in support for AWS CloudWatch.
+Grafana ships with built-in support for Amazon CloudWatch.
 This topic describes queries, templates, variables, and other configuration specific to the CloudWatch data source.
 
 For instructions on how to add a data source to Grafana, refer to the [administration documentation]({{< relref "../../administration/data-source-management/" >}}).
diff --git a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
index 37d85968eca..08fb9717366 100644
--- a/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
+++ b/docs/sources/datasources/aws-cloudwatch/query-editor/index.md
@@ -3,7 +3,7 @@ aliases:
   - ../../data-sources/aws-cloudwatch/query-editor/
   - ../cloudwatch/
   - ./
-description: Guide for using the AWS CloudWatch data source's query editor
+description: Guide for using the Amazon CloudWatch data source's query editor
 keywords:
   - grafana
   - aws
@@ -11,11 +11,11 @@ keywords:
   - guide
   - queries
 menuTitle: Query editor
-title: AWS CloudWatch query editor
+title: Amazon CloudWatch query editor
 weight: 300
 ---
 
-# AWS CloudWatch query editor
+# Amazon CloudWatch query editor
 
 This topic explains querying specific to the CloudWatch data source.
 For general documentation on querying data sources in Grafana, see [Query and transform data]({{< relref "../../../panels-visualizations/query-transform-data" >}}).