diff --git a/docs/database/README.md b/docs/database/README.md
index 604d756ad..a51254407 100644
--- a/docs/database/README.md
+++ b/docs/database/README.md
@@ -49,7 +49,7 @@ Technology specific semantic conventions are defined for the following databases
 * [Elasticsearch](elasticsearch.md): Semantic Conventions for *Elasticsearch*.
 * [HBase](hbase.md): Semantic Conventions for *HBase*.
 * [MongoDB](mongodb.md): Semantic Conventions for *MongoDB*.
-* [Microsoft SQL Server](mssql.md): Semantic Conventions for *Microsoft SQL Server*.
+* [Microsoft SQL Server](sql-server.md): Semantic Conventions for *Microsoft SQL Server*.
 * [Oracle Database](oracledb.md): Semantic Conventions for *Oracle Database*.
 * [Redis](redis.md): Semantic Conventions for *Redis*.
 * [SQL](sql.md): Semantic Conventions for *SQL* databases.
diff --git a/docs/database/database-spans.md b/docs/database/database-spans.md
index 1805a08bd..6b82a0b68 100644
--- a/docs/database/database-spans.md
+++ b/docs/database/database-spans.md
@@ -411,7 +411,7 @@ More specific Semantic Conventions are defined for the following database techno
 * [Elasticsearch](elasticsearch.md): Semantic Conventions for *Elasticsearch*.
 * [HBase](hbase.md): Semantic Conventions for *HBase*.
 * [MongoDB](mongodb.md): Semantic Conventions for *MongoDB*.
-* [Microsoft SQL Server](mssql.md): Semantic Conventions for *Microsoft SQL Server*.
+* [Microsoft SQL Server](sql-server.md): Semantic Conventions for *Microsoft SQL Server*.
 * [Redis](redis.md): Semantic Conventions for *Redis*.
 * [SQL](sql.md): Semantic Conventions for *SQL* databases.
 
diff --git a/docs/database/mssql.md b/docs/database/sql-server.md
similarity index 99%
rename from docs/database/mssql.md
rename to docs/database/sql-server.md
index 3f5c1203b..6eef6a517 100644
--- a/docs/database/mssql.md
+++ b/docs/database/sql-server.md
@@ -17,7 +17,7 @@ The Semantic Conventions for *Microsoft SQL Server* extend and override the [Dat
 
 ## Spans
 
-<!-- semconv span.db.mssql.client -->
+<!-- semconv span.db.sql_server.client -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
diff --git a/model/database/spans.yaml b/model/database/spans.yaml
index 0f33f26d5..cb83e932c 100644
--- a/model/database/spans.yaml
+++ b/model/database/spans.yaml
@@ -127,7 +127,7 @@ groups:
     span_kind: client
     extends: trace.db.common.full
 
-  - id: span.db.mssql.client
+  - id: span.db.sql_server.client
     type: span
     stability: release_candidate
     extends: span.db.sql.client