diff --git a/core/includes/database.inc b/core/includes/database.inc
index fc76b6f..a7a5188 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -202,7 +202,7 @@
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return DatabaseStatementInterface
+ * @return Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
  * @see DatabaseConnection::defaultOptions()
@@ -234,7 +234,7 @@ function db_query($query, array $args = array(), array $options = array()) {
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return DatabaseStatementInterface
+ * @return Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
  * @see DatabaseConnection::defaultOptions()
@@ -264,7 +264,7 @@ function db_query_range($query, $from, $count, array $args = array(), array $opt
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return
+ * @return string
  *   The name of the temporary table.
  *
  * @see DatabaseConnection::defaultOptions()
@@ -278,15 +278,15 @@ function db_query_temporary($query, array $args = array(), array $options = arra
 }
 
 /**
- * Returns a new InsertQuery object for the active database.
+ * Returns a new Insert object for the active database.
  *
  * @param $table
  *   The table into which to insert.
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return InsertQuery
- *   A new InsertQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Insert
+ *   A new Insert object for this connection.
  */
 function db_insert($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
@@ -296,15 +296,15 @@ function db_insert($table, array $options = array()) {
 }
 
 /**
- * Returns a new MergeQuery object for the active database.
+ * Returns a new Merge object for the active database.
  *
  * @param $table
  *   The table into which to merge.
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return MergeQuery
- *   A new MergeQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Merge
+ *   A new Merge object for this connection.
  */
 function db_merge($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
@@ -314,15 +314,15 @@ function db_merge($table, array $options = array()) {
 }
 
 /**
- * Returns a new UpdateQuery object for the active database.
+ * Returns a new Update object for the active database.
  *
  * @param $table
  *   The table to update.
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return UpdateQuery
- *   A new UpdateQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Update
+ *   A new Update object for this connection.
  */
 function db_update($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
@@ -332,15 +332,15 @@ function db_update($table, array $options = array()) {
 }
 
 /**
- * Returns a new DeleteQuery object for the active database.
+ * Returns a new Delete object for the active database.
  *
  * @param $table
  *   The table from which to delete.
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return DeleteQuery
- *   A new DeleteQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Delete
+ *   A new Delete object for this connection.
  */
 function db_delete($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
@@ -350,15 +350,15 @@ function db_delete($table, array $options = array()) {
 }
 
 /**
- * Returns a new TruncateQuery object for the active database.
+ * Returns a new Truncate object for the active database.
  *
  * @param $table
  *   The table from which to delete.
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return TruncateQuery
- *   A new TruncateQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Truncate
+ *   A new Truncate object for this connection.
  */
 function db_truncate($table, array $options = array()) {
   if (empty($options['target']) || $options['target'] == 'slave') {
@@ -378,8 +378,8 @@ function db_truncate($table, array $options = array()) {
  * @param $options
  *   An array of options to control how the query operates.
  *
- * @return SelectQuery
- *   A new SelectQuery object for this connection.
+ * @return Drupal\Core\Database\Query\Select
+ *   An new SelectQuery object for this connection.
  */
 function db_select($table, $alias = NULL, array $options = array()) {
   if (empty($options['target'])) {
@@ -389,7 +389,7 @@ function db_select($table, $alias = NULL, array $options = array()) {
 }
 
 /**
- * Returns a new transaction object for the active database.
+ * Returns a new Transaction object for the active database.
  *
  * @param string $name
  *   Optional name of the transaction.
@@ -397,8 +397,8 @@ function db_select($table, $alias = NULL, array $options = array()) {
  *   An array of options to control how the transaction operates:
  *   - target: The database target name.
  *
- * @return DatabaseTransaction
- *   A new DatabaseTransaction object for this connection.
+ * @return Drupal\Core\Database\Transaction
+ *   A new Transaction object for this connection.
  */
 function db_transaction($name = NULL, array $options = array()) {
   if (empty($options['target'])) {
@@ -413,7 +413,7 @@ function db_transaction($name = NULL, array $options = array()) {
  * @param $key
  *   The key in the $databases array to set as the default database.
  *
- * @return
+ * @return string
  *   The key of the formerly active database.
  */
 function db_set_active($key = 'default') {
@@ -428,7 +428,7 @@ function db_set_active($key = 'default') {
  * @param $table
  *   The table name to escape.
  *
- * @return
+ * @return string
  *   The escaped table name as a string.
  */
 function db_escape_table($table) {
@@ -443,7 +443,7 @@ function db_escape_table($table) {
  * @param $field
  *   The field name to escape.
  *
- * @return
+ * @return string
  *   The escaped field name as a string.
  */
 function db_escape_field($field) {
@@ -477,7 +477,7 @@ function db_escape_field($field) {
  * @param $string
  *   The string to escape.
  *
- * @return
+ * @return string
  *   The escaped string.
  */
 function db_like($string) {
@@ -487,7 +487,7 @@ function db_like($string) {
 /**
  * Retrieves the name of the currently active database driver.
  *
- * @return
+ * @return string
  *   The name of the currently active database driver.
  */
 function db_driver() {
@@ -520,7 +520,7 @@ function db_close(array $options = array()) {
  *   by passing in a minimum ID, it can be assured that we never issue the same
  *   ID.
  *
- * @return
+ * @return int
  *   An integer number larger than any number returned before for this sequence.
  */
 function db_next_id($existing_id = 0) {
@@ -528,41 +528,42 @@ function db_next_id($existing_id = 0) {
 }
 
 /**
- * Returns a new DatabaseCondition, set to "OR" all conditions together.
+ * Returns a new Condition, set to "OR" all conditions together.
  *
- * @return Condition
+ * @return Drupal\Core\Database\Condition
  */
 function db_or() {
   return new Condition('OR');
 }
 
 /**
- * Returns a new DatabaseCondition, set to "AND" all conditions together.
+ * Returns a new Condition, set to "AND" all conditions together.
  *
- * @return Condition
+ * @return Drupal\Core\Database\Condition
  */
 function db_and() {
   return new Condition('AND');
 }
 
 /**
- * Returns a new DatabaseCondition, set to "XOR" all conditions together.
+ * Returns a new Condition, set to "XOR" all conditions together.
  *
- * @return Condition
+ * @return Drupal\Core\Database\Condition
  */
 function db_xor() {
   return new Condition('XOR');
 }
 
 /**
- * Returns a new DatabaseCondition, set to the specified conjunction.
+ * Returns a new Condition, set to the specified conjunction.
  *
  * Internal API function call.  The db_and(), db_or(), and db_xor()
  * functions are preferred.
  *
  * @param $conjunction
  *   The conjunction to use for query conditions (AND, OR or XOR).
- * @return Condition
+ *   
+ * @return Drupal\Core\Database\Condition
  */
 function db_condition($conjunction) {
   return new Condition($conjunction);
@@ -599,7 +600,7 @@ function db_create_table($name, $table) {
  * @param $fields
  *   An array of key/index column specifiers.
  *
- * @return
+ * @return array
  *   An array of field names.
  */
 function db_field_names($fields) {
@@ -614,7 +615,7 @@ function db_field_names($fields) {
  * @param $name
  *   The name of the index in drupal (no prefixing).
  *
- * @return
+ * @return bool
  *   TRUE if the given index exists, otherwise FALSE.
  */
 function db_index_exists($table, $name) {
@@ -627,7 +628,7 @@ function db_index_exists($table, $name) {
  * @param $table
  *   The name of the table in drupal (no prefixing).
  *
- * @return
+ * @return bool
  *   TRUE if the given table exists, otherwise FALSE.
  */
 function db_table_exists($table) {
@@ -642,7 +643,7 @@ function db_table_exists($table) {
  * @param $field
  *   The name of the field.
  *
- * @return
+ * @return bool
  *   TRUE if the given column exists, otherwise FALSE.
  */
 function db_field_exists($table, $field) {
@@ -656,7 +657,7 @@ function db_field_exists($table, $field) {
  *   An SQL expression, for example "simpletest%" (without the quotes).
  *   BEWARE: this is not prefixed, the caller should take care of that.
  *
- * @return
+ * @return array
  *   Array, both the keys and the values are the matching tables.
  */
 function db_find_tables($table_expression) {