diff --git a/core/modules/comment/lib/Drupal/comment/Comment.php b/core/modules/comment/lib/Drupal/comment/Comment.php
index a335d501b02295f3a96b33edbbac151a0d054d92..9eee762df5ae97fd630aae287e4a14a08f07b31a 100644
--- a/core/modules/comment/lib/Drupal/comment/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Comment.php
@@ -78,14 +78,14 @@ class Comment extends Entity {
   public $homepage;
 
   /**
-   * Implements EntityInterface::id().
+   * Implements Drupal\entity\EntityInterface::id().
    */
   public function id() {
     return $this->cid;
   }
 
   /**
-   * Implements EntityInterface::bundle().
+   * Implements Drupal\entity\EntityInterface::bundle().
    */
   public function bundle() {
     return $this->node_type;
diff --git a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php b/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
index 2909a99d05ee30eb84933d158b47f94979db517c..961c2f12ea54f431832574696fa64707534bb87a 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentStorageController.php
@@ -13,13 +13,13 @@
 /**
  * Defines the controller class for comments.
  *
- * This extends the EntityDatabaseStorageController class, adding required
- * special handling for comment entities.
+ * This extends the Drupal\entity\EntityDatabaseStorageController class, adding
+ * required special handling for comment entities.
  */
 class CommentStorageController extends EntityDatabaseStorageController {
 
   /**
-   * Overrides EntityDatabaseStorageController::buildQuery().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::buildQuery().
    */
   protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
     $query = parent::buildQuery($ids, $conditions, $revision_id);
@@ -33,7 +33,7 @@ protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE)
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::attachLoad().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::attachLoad().
    */
   protected function attachLoad(&$comments, $revision_id = FALSE) {
     // Set up standard comment properties.
@@ -47,7 +47,7 @@ protected function attachLoad(&$comments, $revision_id = FALSE) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::preSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::preSave().
    *
    * @see comment_int_to_alphadecimal()
    * @see comment_increment_alphadecimal()
@@ -129,7 +129,7 @@ protected function preSave(EntityInterface $comment) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::postSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::postSave().
    */
   protected function postSave(EntityInterface $comment, $update) {
     // Update the {node_comment_statistics} table prior to executing the hook.
@@ -140,7 +140,7 @@ protected function postSave(EntityInterface $comment, $update) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::postDelete().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::postDelete().
    */
   protected function postDelete($comments) {
     // Delete the comments' replies.
diff --git a/core/modules/node/lib/Drupal/node/Node.php b/core/modules/node/lib/Drupal/node/Node.php
index 1655ffaacb811539275f078cc735a571d8f2b5f1..0e8347b04adce173e61ebe60bbbcd43b7ed451a6 100644
--- a/core/modules/node/lib/Drupal/node/Node.php
+++ b/core/modules/node/lib/Drupal/node/Node.php
@@ -145,21 +145,21 @@ class Node extends Entity {
   public $revision_uid;
 
   /**
-   * Implements EntityInterface::id().
+   * Implements Drupal\entity\EntityInterface::id().
    */
   public function id() {
     return $this->nid;
   }
 
   /**
-   * Implements EntityInterface::bundle().
+   * Implements Drupal\entity\EntityInterface::bundle().
    */
   public function bundle() {
     return $this->type;
   }
 
   /**
-   * Overrides Entity::createDuplicate().
+   * Overrides Drupal\entity\Entity::createDuplicate().
    */
   public function createDuplicate() {
     $duplicate = clone $this;
diff --git a/core/modules/node/lib/Drupal/node/NodeStorageController.php b/core/modules/node/lib/Drupal/node/NodeStorageController.php
index c4747f2229b968e9eb6deb5956891f5fd91fe64c..dccec718e8c4609fbe64ef8a6fc5822d626a4d93 100644
--- a/core/modules/node/lib/Drupal/node/NodeStorageController.php
+++ b/core/modules/node/lib/Drupal/node/NodeStorageController.php
@@ -15,13 +15,13 @@
 /**
  * Controller class for nodes.
  *
- * This extends the EntityDatabaseStorageController class, adding required
- * special handling for node entities.
+ * This extends the Drupal\entity\EntityDatabaseStorageController class, adding
+ * required special handling for node entities.
  */
 class NodeStorageController extends EntityDatabaseStorageController {
 
   /**
-   * Overrides EntityDatabaseStorageController::create().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::create().
    */
   public function create(array $values) {
     $node = parent::create($values);
@@ -35,7 +35,7 @@ public function create(array $values) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::delete().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::delete().
    */
   public function delete($ids) {
     $entities = $ids ? $this->load($ids) : FALSE;
@@ -80,7 +80,7 @@ public function delete($ids) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::save().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::save().
    */
   public function save(EntityInterface $entity) {
     $transaction = db_transaction();
@@ -192,7 +192,7 @@ protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE)
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::invokeHook().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::invokeHook().
    */
   protected function invokeHook($hook, EntityInterface $node) {
     if ($hook == 'insert' || $hook == 'update') {
@@ -241,7 +241,7 @@ protected function invokeHook($hook, EntityInterface $node) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::preSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::preSave().
    */
   protected function preSave(EntityInterface $node) {
     // Before saving the node, set changed and revision times.
@@ -257,14 +257,14 @@ protected function preSave(EntityInterface $node) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::postSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::postSave().
    */
   function postSave(EntityInterface $node, $update) {
     node_access_acquire_grants($node, $update);
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::preDelete().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::preDelete().
    */
   function preDelete($entities) {
     if (module_exists('search')) {
@@ -275,7 +275,7 @@ function preDelete($entities) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::postDelete().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::postDelete().
    */
   protected function postDelete($nodes) {
     // Delete values from other tables also referencing this node.
diff --git a/core/modules/user/lib/Drupal/user/User.php b/core/modules/user/lib/Drupal/user/User.php
index a64652c53b34a1f7274e9674017e0f0c685f68fd..992923c8634c99e88d65908a8c28d687a46d451e 100644
--- a/core/modules/user/lib/Drupal/user/User.php
+++ b/core/modules/user/lib/Drupal/user/User.php
@@ -136,7 +136,7 @@ class User extends Entity {
   public $roles = array();
 
   /**
-   * Implements EntityInterface::id().
+   * Implements Drupal\entity\EntityInterface::id().
    */
   public function id() {
     return $this->uid;
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index 06d7fbc0651af3ee825a162f0edbb8fce093ce24..347e7e1fef7fe1ec50fcad77b9c10923fc29fcc2 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -14,13 +14,13 @@
 /**
  * Controller class for users.
  *
- * This extends the EntityDatabaseStorageController class, adding required
- * special handling for user objects.
+ * This extends the Drupal\entity\EntityDatabaseStorageController class, adding
+ * required special handling for user objects.
  */
 class UserStorageController extends EntityDatabaseStorageController {
 
   /**
-   * Overrides EntityDatabaseStorageController::attachLoad().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::attachLoad().
    */
   function attachLoad(&$queried_users, $revision_id = FALSE) {
     // Build an array of user picture IDs so that these can be fetched later.
@@ -60,7 +60,7 @@ function attachLoad(&$queried_users, $revision_id = FALSE) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::create().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::create().
    */
   public function create(array $values) {
     if (!isset($values['created'])) {
@@ -73,7 +73,7 @@ public function create(array $values) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::save().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::save().
    */
   public function save(EntityInterface $entity) {
     if (empty($entity->uid)) {
@@ -84,7 +84,7 @@ public function save(EntityInterface $entity) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::preSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::preSave().
    */
   protected function preSave(EntityInterface $entity) {
     // Update the user password if it has changed.
@@ -159,7 +159,7 @@ protected function preSave(EntityInterface $entity) {
   }
 
   /**
-   * Overrides EntityDatabaseStorageController::postSave().
+   * Overrides Drupal\entity\EntityDatabaseStorageController::postSave().
    */
   protected function postSave(EntityInterface $entity, $update) {