diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index 2bfc330acd9be546b603649a78c745e4611de55d..dd8c299e48d9d3ed04e6c155cd86eaabd0a80909 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -21,6 +21,9 @@
  * @{
  */
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Connection.
+ */
 class Connection extends DatabaseConnection {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php b/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
index 4e594da3e5fb8dd08d311d8217f4f9ec97db2d20..296a1298d56d1f29bed705914805ae2020e4d87d 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Delete.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Delete as QueryDelete;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Delete.
+ */
 class Delete extends QueryDelete { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
index b458d36471238ec1a53fedb172ef164c008d5193..731cab1be7acd2a6e595b11907a895481c95e987 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Insert.php
@@ -9,6 +9,9 @@
 
 use Drupal\Core\Database\Query\Insert as QueryInsert;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Insert.
+ */
 class Insert extends QueryInsert {
 
   public function execute() {
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php b/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
index b98d8688801ef17739396a300a0dc1b43243db14..b517c52b9f24313e384a466bae8b9b4ddc6e65a7 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Merge.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Merge as QueryMerge;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Merge.
+ */
 class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index a20e58d672f19d7db8c98c9c474ea9c544096baa..c1fe4074b869e2a7556df07b74bbb920915086d2 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -19,6 +19,9 @@
  * @{
  */
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Schema.
+ */
 class Schema extends DatabaseSchema {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php b/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
index caa2dbf06eaf46a75324d002ea9561c7530a91c1..125f9443ffc913ddd75912ddc24e9aaf8761501e 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Select.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Select as QuerySelect;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Select.
+ */
 class Select extends QuerySelect { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
index a04d7a03a08e467ee9ee52d94be29cf799c2b503..f52b59251a9c57b4c616772cef1e1c775c338719 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Transaction.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Transaction as DatabaseTransaction;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Transaction.
+ */
 class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
index 00cf10c5f85984aa2183093a6196a4a8508a0912..3f87481a58dc05dd76b0d7e4066387b87e8dd3ad 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Truncate.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Truncate as QueryTruncate;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Truncate.
+ */
 class Truncate extends QueryTruncate { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php b/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
index 7d96e5577e51432f2cff9f02e880c6a5b78a7bec..333eeb697634321ebdc20d3d50aca9de5cdcb1bc 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Update.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Update as QueryUpdate;
 
+/**
+ * MySQL implementation of \Drupal\Core\Database\Query\Update.
+ */
 class Update extends QueryUpdate { }
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php b/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
index 6d5025157af2c1857145aa328c2d69c949af85d7..ad8f28f00838065d4824f2cb06f0dcdfd7a0bc76 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Upsert.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Upsert as QueryUpsert;
 
 /**
- * Implements the Upsert query for the MySQL database driver.
+ * MySQL implementation of \Drupal\Core\Database\Query\Upsert.
  */
 class Upsert extends QueryUpsert {
 
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index b5ef45d18e709be565cd45cd6529ced9d6e86387..81aeabc0efbfe4fa50bc58f10918b5f7d4752c5d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -16,6 +16,9 @@
  * @{
  */
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Connection.
+ */
 class Connection extends DatabaseConnection {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
index f8940adc0f534a3c2d935e19c8a5e93b7f32a557..72687cec7301f0a597538ac7d157b22b7e59c66d 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Delete.php
@@ -9,6 +9,9 @@
 
 use Drupal\Core\Database\Query\Delete as QueryDelete;
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Delete.
+ */
 class Delete extends QueryDelete {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
index f36f509de66eb826c284089ef79fecd8a93a05da..084856ae446a3e2afa8bc6cce0cf0034f218c5fa 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Insert.php
@@ -15,6 +15,9 @@
  * @{
  */
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Insert.
+ */
 class Insert extends QueryInsert {
 
   public function execute() {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
index ad74c13a69cdf96b08fe9c62e88ea9563c33f434..445c5c873676ae8556168839a22d0914a6823a99 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Merge.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Merge as QueryMerge;
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Merge.
+ */
 class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
index d1c6d11200ea5e667e2bc25f8e84d4a22c3229fb..1f1c94bd50604051f0cdd6c6902208ec3d6a07a6 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/NativeUpsert.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Upsert as QueryUpsert;
 
 /**
- * Implements the native Upsert query for the PostgreSQL database driver.
+ * PostgreSQL implementation of native \Drupal\Core\Database\Query\Upsert.
  *
  * @see http://www.postgresql.org/docs/9.5/static/sql-insert.html#SQL-ON-CONFLICT
  */
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index cd22b94e344aad2f74a51b20f0445d6b9e996d52..c59e2e43ea59f473f92b40fd973d29aeee7afb04 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -17,6 +17,9 @@
  * @{
  */
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Schema.
+ */
 class Schema extends DatabaseSchema {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
index 0b58c677980c077c3dadc29b060d92fc2bec132e..ff73a96a0397089928063ea73332183b5668d140 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
@@ -14,6 +14,9 @@
  * @{
  */
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Select.
+ */
 class Select extends QuerySelect {
 
   public function orderRandom() {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
index 682c53c0880753c4a721ab9539bb50ea634b42c5..8a4d9852bcb7f8965dc053c8c2b155429bf39fbe 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Transaction.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Transaction as DatabaseTransaction;
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Transaction.
+ */
 class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
index c0ad989462e7570cff60666acae99e5c115ad46d..6ffd8953d39427fe6512da865c5566ab558e6db5 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Truncate.php
@@ -9,6 +9,9 @@
 
 use Drupal\Core\Database\Query\Truncate as QueryTruncate;
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Truncate.
+ */
 class Truncate extends QueryTruncate {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
index 5d4171dd5d02343d4332e08e377679c89a3f5f5a..ac9bf0c2f5828da64b0dbfb9056b9d696f45bcff 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Update.php
@@ -11,6 +11,9 @@
 use Drupal\Core\Database\Query\Update as QueryUpdate;
 use Drupal\Core\Database\Query\SelectInterface;
 
+/**
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Update.
+ */
 class Update extends QueryUpdate {
 
   public function execute() {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
index e23092d875b878d6a54f296fc0bf73ecab1b1f16..b8b5a88b5708159976151f943ff7d628ebb93713 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Upsert.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Upsert as QueryUpsert;
 
 /**
- * Implements the Upsert query for the PostgreSQL database driver.
+ * PostgreSQL implementation of \Drupal\Core\Database\Query\Upsert.
  */
 class Upsert extends QueryUpsert {
 
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
index e1eb459573810b524c1a217da7f6cdc8bc6ebe1e..b94ae9f614181e38d8c28fdc54dec805147945ee 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php
@@ -12,7 +12,7 @@
 use Drupal\Core\Database\Connection as DatabaseConnection;
 
 /**
- * Specific SQLite implementation of DatabaseConnection.
+ * SQLite implementation of \Drupal\Core\Database\Connection.
  */
 class Connection extends DatabaseConnection {
 
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
index a6a07ce5b5b64785c9c530c888dcbf53d5232894..b9563e5d4dadbad75c070ff065f137594697ecd8 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Delete.php
@@ -10,6 +10,6 @@
 use Drupal\Core\Database\Query\Delete as QueryDelete;
 
 /**
- * SQLite specific implementation of \Drupal\Core\Database\Query\Delete.
+ * SQLite implementation of \Drupal\Core\Database\Query\Delete.
  */
 class Delete extends QueryDelete { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
index 0e940e7e89b7ea18995d75d964a01981a21728a2..5482c4b6e63618a082937f0d1967cf9dc4287355 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Insert.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Insert as QueryInsert;
 
 /**
- * SQLite specific implementation of InsertQuery.
+ * SQLite implementation of \Drupal\Core\Database\Query\Insert.
  *
  * We ignore all the default fields and use the clever SQLite syntax:
  *   INSERT INTO table DEFAULT VALUES
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
index 2acea077f0f2dddc05261080e6373d8c07f02335..2e745604dd144a13ee25b454df05f97ce0b05fca 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Merge.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Merge as QueryMerge;
 
+/**
+ * SQLite implementation of \Drupal\Core\Database\Query\Merge.
+ */
 class Merge extends QueryMerge { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
index 6799dcb14de3204867a67b7395d0797a4549ee39..1fb1f16f6f1015aae793bacc629a7ba63d22e6f2 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -17,6 +17,9 @@
  * @{
  */
 
+/**
+ * SQLite implementation of \Drupal\Core\Database\Schema.
+ */
 class Schema extends DatabaseSchema {
 
   /**
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
index 8f2fdb749e657819e0fa397d24eef8610449a020..366fb21df82f9d03d6697655d4225433d6a0d3f4 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Select.php
@@ -9,6 +9,9 @@
 
 use Drupal\Core\Database\Query\Select as QuerySelect;
 
+/**
+ * SQLite implementation of \Drupal\Core\Database\Query\Select.
+ */
 class Select extends QuerySelect {
   public function forUpdate($set = TRUE) {
     // SQLite does not support FOR UPDATE so nothing to do.
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
index bfa494f73f6edae07d0344beae41652ab06be740..e2b98218ad202f6f8bbbad8f42a5ff1bacd40962 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Statement.php
@@ -11,7 +11,7 @@
 use Drupal\Core\Database\StatementInterface;
 
 /**
- * Specific SQLite implementation of DatabaseConnection.
+ * SQLite implementation of \Drupal\Core\Database\Statement.
  *
  * The PDO SQLite driver only closes SELECT statements when the PDOStatement
  * destructor is called and SQLite does not allow data change (INSERT,
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
index 736dbccf39da07eb93142ed795c963981086eb37..b0933004577136cace3d973767aa9f870502dca7 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Transaction.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Transaction as DatabaseTransaction;
 
+/**
+ * SQLite implementation of \Drupal\Core\Database\Transaction.
+ */
 class Transaction extends DatabaseTransaction { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
index a0171c4cc18829f5be7bb4845b81ac635d25b5ae..ae16bc2dbf180921544f6f374ab8220da86bac79 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Truncate.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Truncate as QueryTruncate;
 
 /**
- * SQLite specific implementation of TruncateQuery.
+ * SQLite implementation of \Drupal\Core\Database\Query\Truncate.
  *
  * SQLite doesn't support TRUNCATE, but a DELETE query with no condition has
  * exactly the effect (it is implemented by DROPing the table).
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
index aca3c95198c221fd374baa46ed408a2d32e9ae6f..da56c4e2227aac2f8eee2ad7fcc4ed2f20d52003 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Update.php
@@ -9,4 +9,7 @@
 
 use Drupal\Core\Database\Query\Update as QueryUpdate;
 
+/**
+ * SQLite implementation of \Drupal\Core\Database\Query\Update.
+ */
 class Update extends QueryUpdate { }
diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Upsert.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Upsert.php
index d382b18237a36e7d8ff2cb66f44f22c93b0214fe..360f35226d5e09e52c82cb4ff4f941fae2d428b9 100644
--- a/core/lib/Drupal/Core/Database/Driver/sqlite/Upsert.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Upsert.php
@@ -10,7 +10,7 @@
 use Drupal\Core\Database\Query\Upsert as QueryUpsert;
 
 /**
- * Implements the Upsert query for the SQLite database driver.
+ * SQLite implementation of \Drupal\Core\Database\Query\Upsert.
  */
 class Upsert extends QueryUpsert {