diff --git a/docs/sql-server/editions-and-components-of-sql-server-2016.md b/docs/sql-server/editions-and-components-of-sql-server-2016.md
index 7b0f12d12e5..46c68dd48fc 100644
--- a/docs/sql-server/editions-and-components-of-sql-server-2016.md
+++ b/docs/sql-server/editions-and-components-of-sql-server-2016.md
@@ -248,7 +248,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | --- | ---: | ---: | ---: | ---: | ---: |
 | SQL Management Objects (SMO) | Yes | Yes | Yes | Yes | Yes |
 | SQL Configuration Manager | Yes | Yes | Yes | Yes | Yes |
-| SQL CMD (Command Prompt tool) | Yes | Yes | Yes | Yes | Yes |
+| sqlcmd utility (command line tool) | Yes | Yes | Yes | Yes | Yes |
 | Distributed Replay - Admin Tool | Yes | Yes | Yes | Yes | No |
 | Distribute Replay - Client | Yes | Yes | Yes | No | No |
 | Distributed Replay - Controller | Up to 16 clients | 1 client | 1 client | No | No |
@@ -282,7 +282,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Direct query of indexed views (using `NOEXPAND` hint) | Yes | Yes | Yes | Yes | Yes |
 | Automatic indexed views maintenance | Yes | Yes | Yes | No | No |
 | Distributed partitioned views | Yes | No | No | No | No |
-| Parallel index operations | Yes | No | No | No | No |
+| Parallel index maintenance operations | Yes | No | No | No | No |
 | Automatic use of indexed view by query optimizer | Yes | No | No | No | No |
 | Parallel consistency check | Yes | No | No | No | No |
 | SQL Server Utility Control Point | Yes | No | No | No | No |
@@ -329,7 +329,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Internationalization support | Yes | Yes | Yes | Yes | Yes |
 | Full-text and semantic search | Yes | Yes | Yes | Yes | No |
 | Specification of language in query | Yes | Yes | Yes | Yes | No |
-| Service Broker (messaging) | Yes | Yes | No <sup>3</sup> | No <sup>3</sup> | No <sup>3</sup> |
+| Service Broker (messaging and queuing) | Yes | Yes | No <sup>3</sup> | No <sup>3</sup> | No <sup>3</sup> |
 | Transact-SQL endpoints | Yes | Yes | Yes | No | No |
 
 <sup>1</sup> Scale out with multiple compute nodes requires a head node.
diff --git a/docs/sql-server/editions-and-components-of-sql-server-2017.md b/docs/sql-server/editions-and-components-of-sql-server-2017.md
index bec8dbe515f..4b13fd3f32c 100644
--- a/docs/sql-server/editions-and-components-of-sql-server-2017.md
+++ b/docs/sql-server/editions-and-components-of-sql-server-2017.md
@@ -246,7 +246,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | --- | ---: | ---: | ---: | ---: | ---: |
 | SQL Management Objects (SMO) | Yes | Yes | Yes | Yes | Yes |
 | SQL Configuration Manager | Yes | Yes | Yes | Yes | Yes |
-| SQL CMD (Command Prompt tool) | Yes | Yes | Yes | Yes | Yes |
+| sqlcmd utility (command line tool) | Yes | Yes | Yes | Yes | Yes |
 | Distributed Replay - Admin Tool | Yes | Yes | Yes | Yes | No |
 | Distribute Replay - Client | Yes | Yes | Yes | No | No |
 | Distributed Replay - Controller | Up to 16 clients | 1&nbsp;client | 1&nbsp;client | No | No |
@@ -280,7 +280,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Direct query of indexed views (using `NOEXPAND` hint) | Yes | Yes | Yes | Yes | Yes |
 | Automatic indexed views maintenance | Yes | Yes | Yes | No | No |
 | Distributed partitioned views | Yes | No | No | No | No |
-| Parallel index operations | Yes | No | No | No | No |
+| Parallel index maintenance operations | Yes | No | No | No | No |
 | Automatic use of indexed view by query optimizer | Yes | No | No | No | No |
 | Parallel consistency check | Yes | No | No | No | No |
 | SQL Server Utility Control Point | Yes | No | No | No | No |
@@ -329,7 +329,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Internationalization support | Yes | Yes | Yes | Yes | Yes |
 | Full-text and semantic search | Yes | Yes | Yes | Yes | No |
 | Specification of language in query | Yes | Yes | Yes | Yes | No |
-| Service Broker (messaging) | Yes | Yes | No <sup>4</sup> | No <sup>4</sup> | No <sup>4</sup> |
+| Service Broker (messaging and queuing) | Yes | Yes | No <sup>4</sup> | No <sup>4</sup> | No <sup>4</sup> |
 | Transact-SQL endpoints | Yes | Yes | Yes | No | No |
 | Graph | Yes | Yes | Yes | Yes | Yes |
 
diff --git a/docs/sql-server/editions-and-components-of-sql-server-2019.md b/docs/sql-server/editions-and-components-of-sql-server-2019.md
index 28d103a7b49..ba9d53fffbc 100644
--- a/docs/sql-server/editions-and-components-of-sql-server-2019.md
+++ b/docs/sql-server/editions-and-components-of-sql-server-2019.md
@@ -203,12 +203,12 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Read-ahead | Yes | No | No | No | No |
 | Advanced scanning | Yes | No | No | No | No |
 | Delayed durability | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: automatic tuning | Yes | No | No | No | No |
-| Intelligent Database: batch mode for row store <sup>1</sup> | Yes | No | No | No | No |
-| Intelligent Database: row mode memory grant feedback | Yes | No | No | No | No |
-| Intelligent Database: approximate count distinct | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: table variable deferred compilation | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: scalar UDF inlining | Yes | Yes | Yes | Yes | Yes |
+| Automatic tuning | Yes | No | No | No | No |
+| Batch mode for row store <sup>1</sup> | Yes | No | No | No | No |
+| Row mode memory grant feedback | Yes | No | No | No | No |
+| Approximate count distinct | Yes | Yes | Yes | Yes | Yes |
+| Table variable deferred compilation | Yes | Yes | Yes | Yes | Yes |
+| Scalar UDF inlining | Yes | Yes | Yes | Yes | Yes |
 | Batch mode adaptive joins | Yes | No | No | No | No |
 | Batch mode memory grant feedback | Yes | No | No | No | No |
 | Interleaved execution for multi-statement table valued functions | Yes | Yes | Yes | Yes | Yes |
@@ -267,7 +267,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | SQL Assessment API | Yes | Yes | Yes | Yes | Yes |
 | SQL Vulnerability Assessment | Yes | Yes | Yes | Yes | Yes |
 | SQL Configuration Manager | Yes | Yes | Yes | Yes | Yes |
-| SQL CMD (Command Prompt tool) | Yes | Yes | Yes | Yes | Yes |
+| sqlcmd utility (command line tool) | Yes | Yes | Yes | Yes | Yes |
 | Distributed Replay - Admin Tool | Yes | Yes | Yes | Yes | No |
 | Distribute Replay - Client | Yes | Yes | Yes | No | No |
 | Distributed Replay - Controller | Yes <sup>1</sup> | Yes <sup>2</sup> | Yes <sup>2</sup> | No | No |
@@ -306,7 +306,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Direct query SQL Server Analysis Services | Yes | Yes | No | No | Yes |
 | Automatic indexed views maintenance | Yes | Yes | Yes | No | No |
 | Distributed partitioned views | Yes | No | No | No | No |
-| Parallel index operations | Yes | No | No | No | No |
+| Parallel index maintenance operations | Yes | No | No | No | No |
 | Automatic use of indexed view by query optimizer | Yes | No | No | No | No |
 | Parallel consistency check | Yes | No | No | No | No |
 | [!INCLUDE [ssNoVersion](../includes/ssnoversion-md.md)] Utility Control Point | Yes | No | No | No | No |
@@ -358,7 +358,7 @@ The Developer edition continues to support only 1 client for [SQL Server Distrib
 | Internationalization support | Yes | Yes | Yes | Yes | Yes |
 | Full-text and semantic search | Yes | Yes | Yes | Yes | No |
 | Specification of language in query | Yes | Yes | Yes | Yes | No |
-| Service Broker (messaging) | Yes | Yes | No <sup>5</sup> | No <sup>5</sup> | No <sup>5</sup> |
+| Service Broker (messaging and queuing) | Yes | Yes | No <sup>5</sup> | No <sup>5</sup> | No <sup>5</sup> |
 | Transact-SQL endpoints | Yes | Yes | Yes | No | No |
 | Graph | Yes | Yes | Yes | Yes | Yes |
 | UTF-8 support | Yes | Yes | Yes | Yes | Yes |
diff --git a/docs/sql-server/editions-and-components-of-sql-server-2022.md b/docs/sql-server/editions-and-components-of-sql-server-2022.md
index 4a742c38768..1c8a4c24b90 100644
--- a/docs/sql-server/editions-and-components-of-sql-server-2022.md
+++ b/docs/sql-server/editions-and-components-of-sql-server-2022.md
@@ -202,21 +202,21 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | Read-ahead | Yes | No | No | No | No |
 | Advanced scanning | Yes | No | No | No | No |
 | Delayed durability | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: approximate count distinct | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: approximate percentile | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: automatic tuning | Yes | No | No | No | No |
-| Intelligent Database: batch mode for row store <sup>1</sup> | Yes | No | No | No | No |
-| Intelligent Database: cardinality estimate feedback | Yes | No | No | No | No |
-| Intelligent Database: degree of parallelism feedback | Yes | No | No | No | No |
-| Intelligent Database: memory grant feedback persistence and percentile | Yes | No | No | No | No |
-| Intelligent Database: optimized plan forcing | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: parameter sensitive plan optimization | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: row mode memory grant feedback | Yes | No | No | No | No |
-| Intelligent Database: table variable deferred compilation | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: scalar UDF inlining | Yes | Yes | Yes | Yes | Yes |
-| Intelligent Database: Batch mode adaptive joins | Yes | No | No | No | No |
-| Intelligent Database: Batch mode memory grant feedback | Yes | No | No | No | No |
-| Intelligent Database: Interleaved execution for multi-statement table valued functions | Yes | Yes | Yes | Yes | Yes |
+| Approximate count distinct | Yes | Yes | Yes | Yes | Yes |
+| Approximate percentile | Yes | Yes | Yes | Yes | Yes |
+| Automatic tuning | Yes | No | No | No | No |
+| Batch mode for row store <sup>1</sup> | Yes | No | No | No | No |
+| Cardinality estimate feedback | Yes | No | No | No | No |
+| Degree of parallelism feedback | Yes | No | No | No | No |
+| Memory grant feedback persistence and percentile | Yes | No | No | No | No |
+| Optimized plan forcing | Yes | Yes | Yes | Yes | Yes |
+| Parameter sensitive plan optimization | Yes | Yes | Yes | Yes | Yes |
+| Row mode memory grant feedback | Yes | No | No | No | No |
+| Table variable deferred compilation | Yes | Yes | Yes | Yes | Yes |
+| Scalar UDF inlining | Yes | Yes | Yes | Yes | Yes |
+| Batch mode adaptive joins | Yes | No | No | No | No |
+| Batch mode memory grant feedback | Yes | No | No | No | No |
+| Interleaved execution for multi-statement table valued functions | Yes | Yes | Yes | Yes | Yes |
 | Bulk insert improvements | Yes | Yes | Yes | Yes | Yes |
 | Support for Advanced Vector Extension (AVX) 512 <sup>5</sup> | Yes | No | No | No | No |
 | Integrated acceleration and offloading (hardware) | Yes | No | No | No | No |
@@ -286,7 +286,7 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | SQL Assessment API | Yes | Yes | Yes | Yes | Yes |
 | SQL Vulnerability Assessment | Yes | Yes | Yes | Yes | Yes |
 | SQL Configuration Manager | Yes | Yes | Yes | Yes | Yes |
-| SQLCMD (Command Prompt tool) | Yes | Yes | Yes | Yes | Yes |
+| sqlcmd utility (command line tool) | Yes | Yes | Yes | Yes | Yes |
 | SQL Profiler | Yes | Yes | No <sup>1</sup> | No <sup>1</sup> | No <sup>1</sup> |
 | [!INCLUDE [ssNoVersion](../includes/ssnoversion-md.md)] Agent | Yes | Yes | Yes | No | No |
 | Microsoft System Center Operations Manager Management Pack | Yes | Yes | Yes | No | No |
@@ -319,7 +319,7 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | Direct query SQL Server Analysis Services | Yes | Yes | No | No | Yes |
 | Automatic indexed views maintenance | Yes | Yes | Yes | No | No |
 | Distributed partitioned views | Yes | No | No | No | No |
-| Parallel index operations | Yes | No | No | No | No |
+| Parallel index maintenance operations | Yes | No | No | No | No |
 | Automatic use of indexed view by query optimizer | Yes | No | No | No | No |
 | Parallel consistency check | Yes | No | No | No | No |
 | [!INCLUDE [ssNoVersion](../includes/ssnoversion-md.md)] Utility Control Point | Yes | No | No | No | No |
@@ -353,9 +353,9 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | Data Virtualization with PolyBase | Yes | Yes | Yes | Yes | Yes |
 | JSON | Yes | Yes | Yes | Yes | Yes |
 | Query Store | Yes | Yes | Yes | Yes | Yes |
-| Query Store: on by default for new databases | Yes | Yes | Yes | Yes | Yes |
-| Query Store: hint support | Yes | Yes | Yes | Yes | Yes |
-| Query Store: read-replica support | Yes | No | No | No | No |
+| Query Store on by default for new databases | Yes | Yes | Yes | Yes | Yes |
+| Query Store hints | Yes | Yes | Yes | Yes | Yes |
+| Query Store on secondary replicas | Yes | No | No | No | No |
 | Temporal | Yes | Yes | Yes | Yes | Yes |
 | Common Language Runtime (CLR) Integration | Yes | Yes | Yes | Yes | Yes |
 | Java Language Runtime Integration | Yes | Yes | Yes | Yes | Yes |
@@ -370,7 +370,7 @@ SQL Server 2022 includes features for connecting to [Azure Synapse Analytics](/a
 | Internationalization support | Yes | Yes | Yes | Yes | Yes |
 | Full-text and semantic search | Yes | Yes | Yes | Yes | No |
 | Specification of language in query | Yes | Yes | Yes | Yes | No |
-| Service Broker (messaging) | Yes | Yes | No <sup>3</sup> | No <sup>3</sup> | No <sup>3</sup> |
+| Service Broker (messaging and queuing) | Yes | Yes | No <sup>3</sup> | No <sup>3</sup> | No <sup>3</sup> |
 | Transact-SQL endpoints | Yes | Yes | Yes | No | No |
 | Graph | Yes | Yes | Yes | Yes | Yes |
 | UTF-8 support | Yes | Yes | Yes | Yes | Yes |