diff --git a/docs/cloudevents/cloudevents-spans.md b/docs/cloudevents/cloudevents-spans.md
index 030e5eb11a..eb9922658a 100644
--- a/docs/cloudevents/cloudevents-spans.md
+++ b/docs/cloudevents/cloudevents-spans.md
@@ -1,5 +1,5 @@
 <!--- Hugo front matter used to generate the website version of this page:
-linkTitle: CloudEvents spans
+linkTitle: Spans
 --->
 
 # Semantic conventions for CloudEvents spans
diff --git a/docs/database/dynamodb.md b/docs/database/dynamodb.md
index 2771f51218..c24f7b566d 100644
--- a/docs/database/dynamodb.md
+++ b/docs/database/dynamodb.md
@@ -1,5 +1,5 @@
 <!--- Hugo front matter used to generate the website version of this page:
-linkTitle: AWS DynamoDB
+linkTitle: DynamoDB
 --->
 
 # Semantic conventions for AWS DynamoDB
diff --git a/docs/database/mssql.md b/docs/database/mssql.md
index 7344126175..cf7054467b 100644
--- a/docs/database/mssql.md
+++ b/docs/database/mssql.md
@@ -1,8 +1,8 @@
 <!--- Hugo front matter used to generate the website version of this page:
-linkTitle: MSSQL
+linkTitle: SQL Server
 --->
 
-# Semantic conventions for MSSQL
+# Semantic conventions for Microsoft SQL Server
 
 **Status**: [Release Candidate][DocumentStatus]
 
diff --git a/docs/hardware/common.md b/docs/hardware/common.md
index 81c6700459..8f549189da 100644
--- a/docs/hardware/common.md
+++ b/docs/hardware/common.md
@@ -1,5 +1,5 @@
 <!--- Hugo front matter used to generate the website version of this page:
-linkTitle: Common hardware
+linkTitle: Common
 --->
 
 # Semantic conventions for common hardware metrics
diff --git a/docs/object-stores/s3.md b/docs/object-stores/s3.md
index 78583485e3..5332be1b75 100644
--- a/docs/object-stores/s3.md
+++ b/docs/object-stores/s3.md
@@ -1,5 +1,5 @@
 <!--- Hugo front matter used to generate the website version of this page:
-linkTitle: AWS S3
+linkTitle: S3
 --->
 
 # Semantic conventions for AWS S3
diff --git a/docs/resource/cloud-provider/aws/ecs.md b/docs/resource/cloud-provider/aws/ecs.md
index c19219f8ec..21189a7738 100644
--- a/docs/resource/cloud-provider/aws/ecs.md
+++ b/docs/resource/cloud-provider/aws/ecs.md
@@ -1,3 +1,7 @@
+<!--- Hugo front matter used to generate the website version of this page:
+linkTitle: ECS
+--->
+
 # AWS ECS
 
 <!-- semconv resource.aws.ecs -->
diff --git a/docs/resource/cloud-provider/aws/eks.md b/docs/resource/cloud-provider/aws/eks.md
index 4511b7e4b3..73ff22b482 100644
--- a/docs/resource/cloud-provider/aws/eks.md
+++ b/docs/resource/cloud-provider/aws/eks.md
@@ -1,3 +1,7 @@
+<!--- Hugo front matter used to generate the website version of this page:
+linkTitle: EKS
+--->
+
 # AWS EKS
 
 <!-- semconv resource.aws.eks -->
diff --git a/docs/resource/cloud-provider/aws/logs.md b/docs/resource/cloud-provider/aws/logs.md
index 33f9b8f3ab..fd50074412 100644
--- a/docs/resource/cloud-provider/aws/logs.md
+++ b/docs/resource/cloud-provider/aws/logs.md
@@ -1,3 +1,7 @@
+<!--- Hugo front matter used to generate the website version of this page:
+linkTitle: Logs
+--->
+
 # AWS logs
 
 <!-- semconv resource.aws.log -->