diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index ce7e04f..d4f3e09 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -330,7 +330,7 @@ public function tablePrefix($table = 'default') {
    *   The query string as SQL, with curly-braces surrounding the
    *   table names.
    *
-   * @return Drupal\Core\Database\StatementInterface
+   * @return \Drupal\Core\Database\StatementInterface
    *   A PDO prepared statement ready for its execute() method.
    */
   public function prepareQuery($query) {
@@ -402,7 +402,7 @@ public function setLogger(Log $logger) {
   /**
    * Gets the current logging object for this connection.
    *
-   * @return DatabaseLog
+   * @return \Drupal\Core\Database\Log
    *   The current logging object for this connection. If there isn't one,
    *   NULL is returned.
    */
@@ -679,7 +679,7 @@ public function select($table, $alias = NULL, array $options = array()) {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\Query\Insert
+   * @return \Drupal\Core\Database\Query\Insert
    *   A new Insert query object.
    *
    * @see Drupal\Core\Database\Query\Insert
@@ -695,7 +695,7 @@ public function insert($table, array $options = array()) {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   A new Merge query object.
    *
    * @see Drupal\Core\Database\Query\Merge
@@ -712,7 +712,7 @@ public function merge($table, array $options = array()) {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\Query\Update
+   * @return \Drupal\Core\Database\Query\Update
    *   A new Update query object.
    *
    * @see Drupal\Core\Database\Query\Update
@@ -728,7 +728,7 @@ public function update($table, array $options = array()) {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\Query\Delete
+   * @return \Drupal\Core\Database\Query\Delete
    *   A new Delete query object.
    *
    * @see Drupal\Core\Database\Query\Delete
@@ -744,7 +744,7 @@ public function delete($table, array $options = array()) {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\Query\Truncate
+   * @return \Drupal\Core\Database\Query\Truncate
    *   A new Truncate query object.
    *
    * @see Drupal\Core\Database\Query\Truncate
@@ -759,7 +759,7 @@ public function truncate($table, array $options = array()) {
    *
    * This method will lazy-load the appropriate schema library file.
    *
-   * @return Drupal\Core\Database\Schema
+   * @return \Drupal\Core\Database\Schema
    *   The database Schema object for this connection.
    */
   public function schema() {
@@ -879,8 +879,8 @@ public function transactionDepth() {
    * @param $name
    *   Optional name of the savepoint.
    *
-   * @return Drupal\Core\Database\Transaction
-   *   A DatabaseTransaction object.
+   * @return \Drupal\Core\Database\Transaction
+   *   A Transaction object.
    *
    * @see Drupal\Core\Database\Transaction
    */
@@ -1046,7 +1046,7 @@ protected function popCommittableTransactions() {
    * @param $options
    *   An array of options on the query.
    *
-   * @return Drupal\Core\Database\StatementInterface
+   * @return \Drupal\Core\Database\StatementInterface
    *   A database query result resource, or NULL if the query was not executed
    *   correctly.
    */
diff --git a/core/lib/Drupal/Core/Database/Database.php b/core/lib/Drupal/Core/Database/Database.php
index d6c28ca..a3b14a5 100644
--- a/core/lib/Drupal/Core/Database/Database.php
+++ b/core/lib/Drupal/Core/Database/Database.php
@@ -90,7 +90,7 @@
    * @param $key
    *   The database connection key for which we want to log.
    *
-   * @return Drupal\Core\Database\Log
+   * @return \Drupal\Core\Database\Log
    *   The query log object. Note that the log object does support richer
    *   methods than the few exposed through the Database class, so in some
    *   cases it may be desirable to access it directly.
@@ -149,7 +149,7 @@
    * @param $key
    *   The database connection key. Defaults to NULL which means the active key.
    *
-   * @return Drupal\Core\Database\Connection
+   * @return \Drupal\Core\Database\Connection
    *   The corresponding connection object.
    */
   final public static function getConnection($target = 'default', $key = NULL) {
diff --git a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
index 66a41e2..80b6ac8 100644
--- a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
@@ -24,7 +24,7 @@
    * @param $tag
    *   The tag to add.
    *
-   * @return Drupal\Core\Database\Query\AlterableInterface
+   * @return \Drupal\Core\Database\Query\AlterableInterface
    *   The called object.
    */
   public function addTag($tag);
@@ -77,7 +77,7 @@ public function hasAnyTag();
    * @param $object
    *   The additional data to add to the query. May be any valid PHP variable.
    *
-   * @return Drupal\Core\Database\Query\AlterableInterface
+   * @return \Drupal\Core\Database\Query\AlterableInterface
    *   The called object.
    */
   public function addMetaData($key, $object);
diff --git a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
index 7af7079..bc1ac11 100644
--- a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -36,7 +36,7 @@
    *   complex options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is
    *   an array, and = otherwise.
    *
-   * @return QueryConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    *
    * @see Drupal\Core\Database\Query\ConditionInterface::isNull()
@@ -53,7 +53,7 @@ public function condition($field, $value = NULL, $operator = NULL);
    * @param $args
    *   An associative array of arguments.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function where($snippet, $args = array());
@@ -64,7 +64,7 @@ public function where($snippet, $args = array());
    * @param $field
    *   The name of the field to check.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function isNull($field);
@@ -75,7 +75,7 @@ public function isNull($field);
    * @param $field
    *   The name of the field to check.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function isNotNull($field);
@@ -83,10 +83,10 @@ public function isNotNull($field);
   /**
    * Sets a condition that the specified subquery returns values.
    *
-   * @param Drupal\Core\Database\Query\SelectInterface $select
+   * @param \Drupal\Core\Database\Query\SelectInterface $select
    *   The subquery that must contain results.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function exists(SelectInterface $select);
@@ -94,10 +94,10 @@ public function exists(SelectInterface $select);
   /**
    * Sets a condition that the specified subquery returns no values.
    *
-   * @param Drupal\Core\Database\Query\SelectInterface $select
+   * @param \Drupal\Core\Database\Query\SelectInterface $select
    *   The subquery that must not contain results.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function notExists(SelectInterface $select);
diff --git a/core/lib/Drupal/Core/Database/Query/Delete.php b/core/lib/Drupal/Core/Database/Query/Delete.php
index 3ecd040..b5c85e2 100644
--- a/core/lib/Drupal/Core/Database/Query/Delete.php
+++ b/core/lib/Drupal/Core/Database/Query/Delete.php
@@ -34,8 +34,8 @@ class Delete extends Query implements ConditionInterface {
   /**
    * Constructs a Delete object.
    *
-   * @param Drupal\Core\Database\Connection $connection
-   *   A DatabaseConnection object.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   A Connection object.
    * @param string $table
    *   Name of the table to associate with this query.
    * @param array $options
diff --git a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
index 01dcc90..e776a52 100644
--- a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
@@ -26,7 +26,7 @@
    *   The base name of the extending class.  The base name will be checked
    *   against the current database connection to allow driver-specific subclasses
    *   as well, using the same logic as the query objects themselves.
-   * @return Drupal\Core\Database\Query\ExtendableInterface
+   * @return \Drupal\Core\Database\Query\ExtendableInterface
    *   The extender object, which now contains a reference to this object.
    */
   public function extend($extender_name);
diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php
index 72cadb8..c94de53 100644
--- a/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -62,8 +62,8 @@ class Insert extends Query {
   /**
    * Constructs an Insert object.
    *
-   * @param Drupal\Core\Database\Connection $connection
-   *   A DatabaseConnection object.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   A Connection object.
    * @param string $table
    *   Name of the table to associate with this query.
    * @param array $options
@@ -94,7 +94,7 @@ public function __construct($connection, $table, array $options = array()) {
    *   An array of fields to insert into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return Drupal\Core\Database\Query\Insert
+   * @return \Drupal\Core\Database\Query\Insert
    *   The called object.
    */
   public function fields(array $fields, array $values = array()) {
@@ -125,7 +125,7 @@ public function fields(array $fields, array $values = array()) {
    * @param $values
    *   An array of values to add to the query.
    *
-   * @return Drupal\Core\Database\Query\Insert
+   * @return \Drupal\Core\Database\Query\Insert
    *   The called object.
    */
   public function values(array $values) {
@@ -159,7 +159,7 @@ public function values(array $values) {
    *   An array of values for which to use the default values
    *   specified in the table definition.
    *
-   * @return Drupal\Core\Database\Query\Insert
+   * @return \Drupal\Core\Database\Query\Insert
    *   The called object.
    */
   public function useDefaults(array $fields) {
@@ -170,10 +170,10 @@ public function useDefaults(array $fields) {
   /**
    * Sets the fromQuery on this InsertQuery object.
    *
-   * @param SelectQueryInterface $query
+   * @param \Drupal\Core\Database\Query\SelectInterface $query
    *   The query to fetch the rows that should be inserted.
    *
-   * @return InsertQuery
+   * @return \Drupal\Core\Database\Query\Insert
    *   The called object.
    */
   public function from(SelectInterface $query) {
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index 0bff74c..2c98537 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -126,8 +126,8 @@ class Merge extends Query implements ConditionInterface {
   /**
   * Constructs a Merge object.
   *
-  * @param Drupal\Core\Database\Connection $connection
-  *   A Drupal\Core\Database\Connection object.
+  * @param \Drupal\Core\Database\Connection $connection
+  *   A Connection object.
   * @param string $table
   *   Name of the table to associate with this query.
   * @param array $options
@@ -148,7 +148,7 @@ public function __construct(Connection $connection, $table, array $options = arr
    *   The table name or the subquery to be used. Use a Select query object to
    *   pass in a subquery.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   protected function conditionTable($table) {
@@ -163,7 +163,7 @@ protected function conditionTable($table) {
    *   An associative array of fields to write into the database. The array keys
    *   are the field names and the values are the values to which to set them.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function updateFields(array $fields) {
@@ -188,7 +188,7 @@ public function updateFields(array $fields) {
    *   If specified, this is an array of key/value pairs for named placeholders
    *   corresponding to the expression.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
@@ -213,7 +213,7 @@ public function expression($field, $expression, array $arguments = NULL) {
    *   An array of fields to insert into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function insertFields(array $fields, array $values = array()) {
@@ -240,7 +240,7 @@ public function insertFields(array $fields, array $values = array()) {
    *   An array of values for which to use the default values
    *   specified in the table definition.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function useDefaults(array $fields) {
@@ -266,7 +266,7 @@ public function useDefaults(array $fields) {
    *   An array of values to set into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function fields(array $fields, array $values = array()) {
@@ -300,7 +300,7 @@ public function fields(array $fields, array $values = array()) {
    *   An array of values to set into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return Drupal\Core\Database\Query\Merge
+   * @return \Drupal\Core\Database\Query\Merge
    *   The called object.
    */
   public function key(array $fields, array $values = array()) {
diff --git a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
index 0668fa5..53d9a6f 100644
--- a/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/PagerSelectExtender.php
@@ -104,7 +104,7 @@ protected function ensureElement() {
    * You will rarely need to specify a count query directly.  If not specified,
    * one is generated off of the pager query itself.
    *
-   * @param SelectQueryInterface $query
+   * @param \Drupal\Core\Database\Query\SelectInterface $query
    *   The count query object.  It must return a single row with a single column,
    *   which is the total number of records.
    */
@@ -118,7 +118,7 @@ public function setCountQuery(SelectInterface $query) {
    * The count query may be specified manually or, by default, taken from the
    * query we are extending.
    *
-   * @return SelectQueryInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   A count query object.
    */
   public function getCountQuery() {
diff --git a/core/lib/Drupal/Core/Database/Query/Query.php b/core/lib/Drupal/Core/Database/Query/Query.php
index 38d926c..896192d 100644
--- a/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/core/lib/Drupal/Core/Database/Query/Query.php
@@ -66,7 +66,7 @@
   /**
    * Constructs a Query object.
    *
-   * @param Drupal\Core\Database\Connection $connection
+   * @param \Drupal\Core\Database\Connection $connection
    *   Database connection object.
    * @param array $options
    *   Array of query options.
@@ -151,7 +151,7 @@ public function nextPlaceholder() {
    * @param $comment
    *   The comment string to be inserted into the query.
    *
-   * @return Drupal\Core\Database\Query\Query
+   * @return \Drupal\Core\Database\Query\Query
    *   The called object.
    */
   public function comment($comment) {
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index e5eeaf2..98080c2 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -598,7 +598,7 @@ public function countQuery() {
   /**
    * Prepares a count query from the current query object.
    *
-   * @return Drupal\Core\Database\Query\Select
+   * @return \Drupal\Core\Database\Query\Select
    *   A new query object ready to have COUNT(*) performed on it.
    */
   protected function prepareCountQuery() {
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index 779e69d..8e1c757 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -142,7 +142,7 @@ public function getArguments(PlaceholderInterface $queryPlaceholder = NULL);
    *
    * @param $distinct
    *   TRUE to flag this query DISTINCT, FALSE to disable it.
-   * @return SelectQueryInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function distinct($distinct = TRUE);
@@ -184,7 +184,7 @@ public function addField($table_alias, $field, $alias = NULL);
    *   An indexed array of fields present in the specified table that should be
    *   included in this query. If not specified, $table_alias.* will be generated
    *   without any aliases.
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function fields($table_alias, array $fields = array());
@@ -352,7 +352,7 @@ public function addJoin($type, $table, $alias = NULL, $condition = NULL, $argume
    *   The field on which to order.
    * @param $direction
    *   The direction to sort. Legal values are "ASC" and "DESC".
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function orderBy($field, $direction = 'ASC');
@@ -374,7 +374,7 @@ public function orderBy($field, $direction = 'ASC');
    *
    * for an example of such an alternate sorting mechanism.
    *
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object
    */
   public function orderRandom();
@@ -390,7 +390,7 @@ public function orderRandom();
    *   range directives that are set.
    * @param $length
    *   The number of records to return from the result set.
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function range($start = NULL, $length = NULL);
@@ -415,7 +415,7 @@ public function range($start = NULL, $length = NULL);
    * @param $type
    *   The type of UNION to add to the query. Defaults to plain
    *   UNION.
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function union(SelectInterface $query, $type = '');
@@ -425,7 +425,7 @@ public function union(SelectInterface $query, $type = '');
    *
    * @param $field
    *   The field on which to group. This should be the field as aliased.
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    */
   public function groupBy($field);
@@ -433,7 +433,7 @@ public function groupBy($field);
   /**
    * Get the equivalent COUNT query of this query as a new query object.
    *
-   * @return Drupal\Core\Database\Query\SelectInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   A new SelectQuery object with no fields or expressions besides COUNT(*).
    */
   public function countQuery();
@@ -472,7 +472,7 @@ public function preExecute(SelectInterface $query = NULL);
    *   The comparison operator, such as =, <, or >=. It also accepts more complex
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function havingCondition($field, $value = NULL, $operator = NULL);
@@ -497,7 +497,7 @@ public function __clone();
    * @param $set
    *   IF TRUE, FOR UPDATE will be added to the query, if FALSE then it won't.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
+   * @return \Drupal\Core\Database\Query\ConditionInterface
    *   The called object.
    */
   public function forUpdate($set = TRUE);
diff --git a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
index cf1a042..a9bcd40 100644
--- a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
@@ -34,7 +34,7 @@ public function __construct(SelectInterface $query, Connection $connection) {
    * @param array $header
    *   Table header array.
    *
-   * @return SelectQueryInterface
+   * @return \Drupal\Core\Database\Query\SelectInterface
    *   The called object.
    *
    * @see theme_table()
diff --git a/core/lib/Drupal/Core/Database/Query/Truncate.php b/core/lib/Drupal/Core/Database/Query/Truncate.php
index ea67dad..857e199 100644
--- a/core/lib/Drupal/Core/Database/Query/Truncate.php
+++ b/core/lib/Drupal/Core/Database/Query/Truncate.php
@@ -26,8 +26,8 @@ class Truncate extends Query {
   /**
    * Constructs a Truncate query object.
    *
-   * @param DatabaseConnection $connection
-   *   A DatabaseConnection object.
+   * @param \Drupal\Core\Database\Connection $connection
+   *   A Connection object.
    * @param string $table
    *   Name of the table to associate with this query.
    * @param array $options
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index abbbc2b..80160f4 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -63,7 +63,7 @@ class Update extends Query implements ConditionInterface {
   /**
    * Constructs an Update query object.
    *
-   * @param Drupal\Core\Database\Connection $connection
+   * @param \Drupal\Core\Database\Connection $connection
    *   A Connection object.
    * @param string $table
    *   Name of the table to associate with this query.
@@ -161,7 +161,7 @@ public function compiled() {
    *   An associative array of fields to write into the database. The array keys
    *   are the field names and the values are the values to which to set them.
    *
-   * @return Drupal\Core\Database\Query\Update
+   * @return \Drupal\Core\Database\Query\Update
    *   The called object.
    */
   public function fields(array $fields) {
@@ -184,7 +184,7 @@ public function fields(array $fields) {
    *   If specified, this is an array of key/value pairs for named placeholders
    *   corresponding to the expression.
    *
-   * @return Drupal\Core\Database\Query\Update
+   * @return \Drupal\Core\Database\Query\Update
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index 7b884f7..4473fd9 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -287,8 +287,8 @@ function prefixNonTable($table) {
    * @param $add_prefix
    *   Boolean to indicate whether the table name needs to be prefixed.
    *
-   * @return Drupal\Core\Database\Query\ConditionInterface
-   *   A Drupal\Core\Database\Query\Condition object.
+   * @return \Drupal\Core\Database\Query\Condition
+   *   A Condition object.
    */
   protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) {
     $info = $this->connection->getConnectionOptions();
diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php
index f601f74..a4e2cc1 100644
--- a/core/lib/Drupal/Core/Database/StatementPrefetch.php
+++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php
@@ -226,7 +226,7 @@ protected function throwPDOException() {
    *   The query.
    * @param array $args
    *   An array of arguments.
-   * @return PDOStatement
+   * @return \PDOStatement
    *   A PDOStatement object.
    */
   protected function getStatement($query, &$args = array()) {