diff --git a/core/includes/database.inc b/core/includes/database.inc
index 75f6a96..7082c37 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()
@@ -285,8 +285,8 @@ function db_query_temporary($query, array $args = array(), array $options = arra
  * @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') {
@@ -303,8 +303,8 @@ function db_insert($table, array $options = array()) {
  * @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') {
@@ -321,8 +321,8 @@ function db_merge($table, array $options = array()) {
  * @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') {
@@ -339,8 +339,8 @@ function db_update($table, array $options = array()) {
  * @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') {
@@ -357,8 +357,8 @@ function db_delete($table, array $options = array()) {
  * @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
+ *   A new Select object for this connection.
  */
 function db_select($table, $alias = NULL, array $options = array()) {
   if (empty($options['target'])) {
@@ -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'])) {
@@ -530,7 +530,7 @@ function db_next_id($existing_id = 0) {
 /**
  * Returns a new DatabaseCondition, set to "OR" all conditions together.
  *
- * @return Condition
+ * @return \Drupal\Core\Database\Query\Condition
  */
 function db_or() {
   return new Condition('OR');
@@ -539,7 +539,7 @@ function db_or() {
 /**
  * Returns a new DatabaseCondition, set to "AND" all conditions together.
  *
- * @return Condition
+ * @return \Drupal\Core\Database\Query\Condition
  */
 function db_and() {
   return new Condition('AND');
@@ -548,7 +548,7 @@ function db_and() {
 /**
  * Returns a new DatabaseCondition, set to "XOR" all conditions together.
  *
- * @return Condition
+ * @return \Drupal\Core\Database\Query\Condition
  */
 function db_xor() {
   return new Condition('XOR');
@@ -562,7 +562,7 @@ function db_xor() {
  *
  * @param $conjunction
  *   The conjunction to use for query conditions (AND, OR or XOR).
- * @return Condition
+ * @return \Drupal\Core\Database\Query\Condition
  */
 function db_condition($conjunction) {
   return new Condition($conjunction);