diff --git a/docs/database/database-spans.md b/docs/database/database-spans.md
index 092244baf..5fcf63c3d 100644
--- a/docs/database/database-spans.md
+++ b/docs/database/database-spans.md
@@ -56,7 +56,7 @@ the exact definition of the [`{target}`](#target-placeholder) placeholder).
 If a (low-cardinality) `db.operation.name` is not available, database span names
 SHOULD default to the [`{target}`](#target-placeholder).
 
-If neither `{db.operation.name}` nor `{target}` are available, span name SHOULD be `{db.system}`.
+If neither `{db.operation.name}` nor `{target}` are available, span name SHOULD be `{db.system.name}`.
 
 Semantic conventions for individual database systems MAY specify different span name format.
 
diff --git a/model/azure/cosmosdb-metrics.yaml b/model/azure/cosmosdb-metrics.yaml
index f2eec6e23..366ebb004 100644
--- a/model/azure/cosmosdb-metrics.yaml
+++ b/model/azure/cosmosdb-metrics.yaml
@@ -25,7 +25,7 @@ groups:
     unit: "{instance}"
     stability: development
     attributes:
-      # TODO: add db.system once https://github.com/open-telemetry/build-tools/issues/192 is possible
+      # TODO: add db.system.name once https://github.com/open-telemetry/build-tools/issues/192 is possible
       # - ref: db.system.name
       #   requirement_level:
       #     conditionally_required: if available
diff --git a/model/database/common.yaml b/model/database/common.yaml
index 905eaba6d..c6ed5c045 100644
--- a/model/database/common.yaml
+++ b/model/database/common.yaml
@@ -31,7 +31,7 @@ groups:
     stability: development
     extends: attributes.db.client.minimal
     attributes:
-      # TODO: add db.system once https://github.com/open-telemetry/build-tools/issues/192 is possible
+      # TODO: add db.system.name once https://github.com/open-telemetry/build-tools/issues/192 is possible
       # - ref: db.system.name
       #   requirement_level:
       #     conditionally_required: if available
diff --git a/model/database/spans.yaml b/model/database/spans.yaml
index a8d3815ff..60034141c 100644
--- a/model/database/spans.yaml
+++ b/model/database/spans.yaml
@@ -4,7 +4,7 @@ groups:
     type: attribute_group
     brief: This group defines the attributes used to perform database client calls.
     attributes:
-      # TODO: add db.system once https://github.com/open-telemetry/build-tools/issues/192 is possible
+      # TODO: add db.system.name once https://github.com/open-telemetry/build-tools/issues/192 is possible
       # - ref: db.system.name
       #   sampling_relevant: true
       - ref: db.operation.name