diff --git a/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
index 7b884f7..0a3736b 100644
--- a/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Definition of Drupal\Core\Database\Schema
+ * Contains \Drupal\Core\Database\Schema
  */
 
 namespace Drupal\Core\Database;
@@ -181,7 +181,7 @@
    * by defining the defaultSchema variable only MySQL has to re-write the
    * method.
    *
-   * @see DatabaseSchema::getPrefixInfo()
+   * @see \Drupal\Core\Database\Schema::getPrefixInfo()
    */
   protected $defaultSchema = 'public';
 
@@ -203,14 +203,14 @@ public function __clone() {
   }
 
   /**
-   * Implements PlaceHolderInterface::uniqueIdentifier().
+   * Implements \Drupal\Core\Database\Query\PlaceholderInterface::uniqueIdentifier().
    */
   public function uniqueIdentifier() {
     return $this->uniqueIdentifier;
   }
 
   /**
-   * Implements PlaceHolderInterface::nextPlaceholder().
+   * Implements \Drupal\Core\Database\Query\PlaceholderInterface::nextPlaceholder().
    */
   public function nextPlaceholder() {
     return $this->placeholder++;
@@ -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\ConditionInterface
+   *   A \Drupal\Core\Database\Query\Condition object.
    */
   protected function buildTableNameCondition($table_name, $operator = '=', $add_prefix = TRUE) {
     $info = $this->connection->getConnectionOptions();
@@ -388,9 +388,9 @@ public function fieldExists($table, $column) {
    * @param $new_name
    *   The new name for the table.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table doesn't exist.
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If a table with the specified new name already exists.
    */
   abstract public function renameTable($table, $new_name);
@@ -428,9 +428,9 @@ public function fieldExists($table, $column) {
    *   or index including it in this array. See db_change_field() for more
    *   explanation why.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table doesn't exist.
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already has a field by that name.
    */
   abstract public function addField($table, $field, $spec, $keys_new = array());
@@ -459,7 +459,7 @@ public function fieldExists($table, $column) {
    * @param $default
    *   Default value to be set. NULL for 'default NULL'.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table or field doesn't exist.
    */
   abstract public function fieldSetDefault($table, $field, $default);
@@ -472,7 +472,7 @@ public function fieldExists($table, $column) {
    * @param $field
    *   The field to be altered.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table or field doesn't exist.
    */
   abstract public function fieldSetNoDefault($table, $field);
@@ -498,9 +498,9 @@ public function fieldExists($table, $column) {
    * @param $fields
    *   Fields for the primary key.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table doesn't exist.
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already has a primary key.
    */
   abstract public function addPrimaryKey($table, $fields);
@@ -527,9 +527,9 @@ public function fieldExists($table, $column) {
    * @param $fields
    *   An array of field names.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table doesn't exist.
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already has a key by that name.
    */
   abstract public function addUniqueKey($table, $name, $fields);
@@ -558,9 +558,9 @@ public function fieldExists($table, $column) {
    * @param $fields
    *   An array of field names.
    *
-   * @throws Drupal\Core\Database\SchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table doesn't exist.
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already has an index by that name.
    */
   abstract public function addIndex($table, $name, $fields);
@@ -639,9 +639,9 @@ public function fieldExists($table, $column) {
    *   table along with changing the field. The format is the same as a
    *   table specification but without the 'fields' element.
    *
-   * @throws DatabaseSchemaObjectDoesNotExistException
+   * @throws \Drupal\Core\Database\SchemaObjectDoesNotExistException
    *   If the specified table or source field doesn't exist.
-   * @throws DatabaseSchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified destination field already exists.
    */
   abstract public function changeField($table, $field, $field_new, $spec, $keys_new = array());
@@ -654,7 +654,7 @@ public function fieldExists($table, $column) {
    * @param $table
    *   A Schema API table definition array.
    *
-   * @throws Drupal\Core\Database\SchemaObjectExistsException
+   * @throws \Drupal\Core\Database\SchemaObjectExistsException
    *   If the specified table already exists.
    */
   public function createTable($name, $table) {