diff --git a/core/lib/Drupal/Core/Queue/Batch.php b/core/lib/Drupal/Core/Queue/Batch.php
index 8979fc36b43575f2bf0f16a09c0a4fb6f996238f..9715d9d5ca115cbe377c2131fde69d005e5867fc 100644
--- a/core/lib/Drupal/Core/Queue/Batch.php
+++ b/core/lib/Drupal/Core/Queue/Batch.php
@@ -23,11 +23,11 @@
 class Batch extends DatabaseQueue {
 
   /**
-   * Overrides Drupal\Core\Queue\System::claimItem().
+   * Overrides \Drupal\Core\Queue\DatabaseQueue::claimItem().
    *
-   * Unlike Drupal\Core\Queue\System::claimItem(), this method provides a
-   * default lease time of 0 (no expiration) instead of 30. This allows the item
-   * to be claimed repeatedly until it is deleted.
+   * Unlike \Drupal\Core\Queue\DatabaseQueue::claimItem(), this method provides
+   * a default lease time of 0 (no expiration) instead of 30. This allows the
+   * item to be claimed repeatedly until it is deleted.
    */
   public function claimItem($lease_time = 0) {
     $item = $this->connection->queryRange('SELECT data, item_id FROM {queue} q WHERE name = :name ORDER BY item_id ASC', 0, 1, array(':name' => $this->name))->fetchObject();
@@ -42,7 +42,7 @@ public function claimItem($lease_time = 0) {
    * Retrieves all remaining items in the queue.
    *
    * This is specific to Batch API and is not part of the
-   * Drupal\Core\Queue\QueueInterface.
+   * \Drupal\Core\Queue\QueueInterface.
    *
    * @return array
    *   An array of queue items.
diff --git a/core/lib/Drupal/Core/Queue/BatchMemory.php b/core/lib/Drupal/Core/Queue/BatchMemory.php
index e17e7adc708c94c578ae44772e23b7ac2c298b12..20c2f9a444716486c24da92bdc38e8b834781b9b 100644
--- a/core/lib/Drupal/Core/Queue/BatchMemory.php
+++ b/core/lib/Drupal/Core/Queue/BatchMemory.php
@@ -21,9 +21,9 @@
 class BatchMemory extends Memory {
 
   /**
-   * Overrides Drupal\Core\Queue\Memory::claimItem().
+   * Overrides \Drupal\Core\Queue\Memory::claimItem().
    *
-   * Unlike Drupal\Core\Queue\Memory::claimItem(), this method provides a
+   * Unlike \Drupal\Core\Queue\Memory::claimItem(), this method provides a
    * default lease time of 0 (no expiration) instead of 30. This allows the item
    * to be claimed repeatedly until it is deleted.
    */
@@ -39,7 +39,7 @@ public function claimItem($lease_time = 0) {
    * Retrieves all remaining items in the queue.
    *
    * This is specific to Batch API and is not part of the
-   * Drupal\Core\Queue\QueueInterface.
+   * \Drupal\Core\Queue\QueueInterface.
    *
    * @return array
    *   An array of queue items.
diff --git a/core/lib/Drupal/Core/Queue/DatabaseQueue.php b/core/lib/Drupal/Core/Queue/DatabaseQueue.php
index 69ff16f307ed83156c6d4701ca4a61ba05aed888..9a9573bc40a3dd07b3aeb06582274af0da0f94a5 100644
--- a/core/lib/Drupal/Core/Queue/DatabaseQueue.php
+++ b/core/lib/Drupal/Core/Queue/DatabaseQueue.php
@@ -47,7 +47,7 @@ function __construct($name, Connection $connection) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::createItem().
+   * {@inheritdoc}
    */
   public function createItem($data) {
     $query = $this->connection->insert('queue')
@@ -63,14 +63,14 @@ public function createItem($data) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::numberOfItems().
+   * {@inheritdoc}
    */
   public function numberOfItems() {
     return $this->connection->query('SELECT COUNT(item_id) FROM {queue} WHERE name = :name', array(':name' => $this->name))->fetchField();
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::claimItem().
+   * {@inheritdoc}
    */
   public function claimItem($lease_time = 30) {
     // Claim an item by updating its expire fields. If claim is not successful
@@ -106,7 +106,7 @@ public function claimItem($lease_time = 30) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::releaseItem().
+   * {@inheritdoc}
    */
   public function releaseItem($item) {
     $update = $this->connection->update('queue')
@@ -118,7 +118,7 @@ public function releaseItem($item) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::deleteItem().
+   * {@inheritdoc}
    */
   public function deleteItem($item) {
     $this->connection->delete('queue')
@@ -127,7 +127,7 @@ public function deleteItem($item) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::createQueue().
+   * {@inheritdoc}
    */
   public function createQueue() {
     // All tasks are stored in a single database table (which is created when
@@ -136,7 +136,7 @@ public function createQueue() {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::deleteQueue().
+   * {@inheritdoc}
    */
   public function deleteQueue() {
     $this->connection->delete('queue')
diff --git a/core/lib/Drupal/Core/Queue/Memory.php b/core/lib/Drupal/Core/Queue/Memory.php
index 0dff021134a65d1845edaca56fdd9a955078243b..a565450fcfb5a5773944f7ca247889bd7093e7ce 100644
--- a/core/lib/Drupal/Core/Queue/Memory.php
+++ b/core/lib/Drupal/Core/Queue/Memory.php
@@ -43,7 +43,7 @@ public function __construct($name) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::createItem().
+   * {@inheritdoc}
    */
   public function createItem($data) {
     $item = new \stdClass();
@@ -56,14 +56,14 @@ public function createItem($data) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::numberOfItems().
+   * {@inheritdoc}
    */
   public function numberOfItems() {
     return count($this->queue);
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::claimItem().
+   * {@inheritdoc}
    */
   public function claimItem($lease_time = 30) {
     foreach ($this->queue as $key => $item) {
@@ -77,14 +77,14 @@ public function claimItem($lease_time = 30) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::deleteItem().
+   * {@inheritdoc}
    */
   public function deleteItem($item) {
     unset($this->queue[$item->item_id]);
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::releaseItem().
+   * {@inheritdoc}
    */
   public function releaseItem($item) {
     if (isset($this->queue[$item->item_id]) && $this->queue[$item->item_id]->expire != 0) {
@@ -95,14 +95,14 @@ public function releaseItem($item) {
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::createQueue().
+   * {@inheritdoc}
    */
   public function createQueue() {
     // Nothing needed here.
   }
 
   /**
-   * Implements Drupal\Core\Queue\QueueInterface::deleteQueue().
+   * {@inheritdoc}
    */
   public function deleteQueue() {
     $this->queue = array();
diff --git a/core/lib/Drupal/Core/Queue/QueueInterface.php b/core/lib/Drupal/Core/Queue/QueueInterface.php
index d9afc5f0bf0899d016734ade68a6f112ccdcde1d..b0d9e4dde7d7a10e48cdc8b03a76890ac5508898 100644
--- a/core/lib/Drupal/Core/Queue/QueueInterface.php
+++ b/core/lib/Drupal/Core/Queue/QueueInterface.php
@@ -77,7 +77,7 @@ public function claimItem($lease_time = 3600);
    * Deletes a finished item from the queue.
    *
    * @param $item
-   *   The item returned by Drupal\Core\Queue\QueueInterface::claimItem().
+   *   The item returned by \Drupal\Core\Queue\QueueInterface::claimItem().
    */
   public function deleteItem($item);
 
@@ -87,7 +87,7 @@ public function deleteItem($item);
    * Another worker can come in and process it before the timeout expires.
    *
    * @param $item
-   *   The item returned by Drupal\Core\Queue\QueueInterface::claimItem().
+   *   The item returned by \Drupal\Core\Queue\QueueInterface::claimItem().
    *
    * @return boolean
    *   TRUE if the item has been released, FALSE otherwise.