diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index dcc054d..ffea387 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2553,7 +2553,7 @@ function language_default_locked_languages($weight = 0) {
  * @param string $langcode
  *   The language code.
  *
- * @return Drupal\core\Language\Language|null
+ * @return \Drupal\core\Language\Language|null
  *   A fully-populated language object or NULL.
  */
 function language_load($langcode) {
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 70a8d1c..28b5969 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -192,12 +192,12 @@ function entity_get_view_modes($entity_type = NULL) {
  *   Whether to reset the internal cache for the requested entity type.
  *
  * @return Drupal\Core\Entity\EntityInterface
- *   The entity object, or FALSE if there is no entity with the given id.
+ *   The entity object, or NULL if there is no entity with the given id.
  *
  * @see \Drupal\Core\Entity\EntityManager
- * @see Drupal\Core\Entity\EntityStorageControllerInterface
- * @see Drupal\Core\Entity\DatabaseStorageController
- * @see Drupal\Core\Entity\Query\QueryInterface
+ * @see \Drupal\Core\Entity\EntityStorageControllerInterface
+ * @see \Drupal\Core\Entity\DatabaseStorageController
+ * @see \Drupal\Core\Entity\Query\QueryInterface
  */
 function entity_load($entity_type, $id, $reset = FALSE) {
   $controller = Drupal::entityManager()->getStorageController($entity_type);
@@ -220,8 +220,8 @@ function entity_load($entity_type, $id, $reset = FALSE) {
  *   id.
  *
  * @see \Drupal\Core\Entity\EntityManager
- * @see Drupal\Core\Entity\EntityStorageControllerInterface
- * @see Drupal\Core\Entity\DatabaseStorageController
+ * @see \Drupal\Core\Entity\EntityStorageControllerInterface
+ * @see \Drupal\Core\Entity\DatabaseStorageController
  */
 function entity_revision_load($entity_type, $revision_id) {
   return Drupal::entityManager()
@@ -307,9 +307,9 @@ function entity_load_by_uuid($entity_type, $uuid, $reset = FALSE) {
  *   An array of entity objects indexed by their ids.
  *
  * @see \Drupal\Core\Entity\EntityManager
- * @see Drupal\Core\Entity\EntityStorageControllerInterface
- * @see Drupal\Core\Entity\DatabaseStorageController
- * @see Drupal\Core\Entity\Query\QueryInterface
+ * @see \Drupal\Core\Entity\EntityStorageControllerInterface
+ * @see \Drupal\Core\Entity\DatabaseStorageController
+ * @see \Drupal\Core\Entity\Query\QueryInterface
  */
 function entity_load_multiple($entity_type, array $ids = NULL, $reset = FALSE) {
   $controller = Drupal::entityManager()->getStorageController($entity_type);
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index ee62eb3..080bcab 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -114,7 +114,7 @@ public static function createInstance(ContainerInterface $container, $entity_typ
   }
 
   /**
-   * Implements Drupal\Core\Entity\EntityStorageControllerInterface::loadMultiple().
+   * {@inheritdoc}
    */
   public function loadMultiple(array $ids = NULL) {
     $entities = array();
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index cdf8eb3..e2dc1b4 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -111,7 +111,7 @@ public function __construct($entity_type, array $entity_info, Connection $databa
   }
 
   /**
-   * Implements \Drupal\Core\Entity\EntityStorageControllerInterface::loadMultiple().
+   * {@inheritdoc}
    */
   public function loadMultiple(array $ids = NULL) {
     $entities = array();
diff --git a/core/modules/block/custom_block/custom_block.module b/core/modules/block/custom_block/custom_block.module
index 467c006..4e55a85 100644
--- a/core/modules/block/custom_block/custom_block.module
+++ b/core/modules/block/custom_block/custom_block.module
@@ -121,7 +121,7 @@ function custom_block_theme($existing, $type, $theme, $path) {
  * @param int $id
  *   The ID of the custom block type to load.
  *
- * @return Drupal\custom_block\Plugin\Core\Entity\CustomBlockType|null
+ * @return \Drupal\custom_block\Plugin\Core\Entity\CustomBlockType|null
  *   A CustomBlockType object or NULL if the requested $id does not exist.
  */
 function custom_block_type_load($id) {
@@ -134,7 +134,7 @@ function custom_block_type_load($id) {
  * @param int $id
  *   The id of the custom block.
  *
- * @return Drupal\custom_block\Plugin\Core\Entity\CustomBlock|null
+ * @return \Drupal\custom_block\Plugin\Core\Entity\CustomBlock|null
  *   A CustomBlock object or NULL if the requested $id does not exist.
  */
 function custom_block_load($id) {
diff --git a/core/modules/breakpoint/breakpoint.module b/core/modules/breakpoint/breakpoint.module
index 9384b2a..ce3c894 100644
--- a/core/modules/breakpoint/breakpoint.module
+++ b/core/modules/breakpoint/breakpoint.module
@@ -294,7 +294,7 @@ function breakpoint_get_module_media_queries($module) {
  * @param string $id
  *   The id of the breakpoint group to load.
  *
- * @return Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup|null
+ * @return \Drupal\breakpoint\Plugin\Core\Entity\BreakpointGroup|null
  *   The breakpoint group, or NULL if there is no entity with the given id.
  *
  * @todo Remove this in a follow-up issue.
@@ -310,7 +310,7 @@ function breakpoint_group_load($id) {
  * @param int $id
  *   The id of the breakpoint to load.
  *
- * @return Drupal\breakpoint\Plugin\Core\Entity\Breakpoint
+ * @return \Drupal\breakpoint\Plugin\Core\Entity\Breakpoint|null
  *   The entity object, or NULL if there is no entity with the given id.
  *
  * @todo Remove this in a follow-up issue.
diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module
index 0b41801..8b681f4 100644
--- a/core/modules/contact/contact.module
+++ b/core/modules/contact/contact.module
@@ -232,7 +232,7 @@ function contact_field_extra_fields() {
  * @param $id
  *   The ID of the contact category to load.
  *
- * @return Drupal\contact\Plugin\Core\Entity\Category|null
+ * @return \Drupal\contact\Plugin\Core\Entity\Category|null
  *   A Category object or NULL if the requested $id does not exist.
  */
 function contact_category_load($id) {
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index f1a5e80..70ffd49 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -584,8 +584,8 @@ function node_load_multiple(array $nids = NULL, $reset = FALSE) {
  *   (optional) Whether to reset the node_load_multiple() cache. Defaults to
  *   FALSE.
  *
- * @return Drupal\node\Node|null
- *   A fully-populated node entity, or NULL if the node is not found.
+ * @return \Drupal\node\Node|null
+ *   A fully-populated node entity or NULL if the node is not found.
  */
 function node_load($nid = NULL, $reset = FALSE) {
   $entity = entity_load('node', $nid, $reset);
@@ -598,8 +598,8 @@ function node_load($nid = NULL, $reset = FALSE) {
  * @param int $nid
  *   The node revision id.
  *
- * @return Drupal\node\Node|null
- *   A fully-populated node entity, or NULL if the node is not found.
+ * @return \Drupal\node\Node|null
+ *   A fully-populated node entity or NULL if the node is not found.
  */
 function node_revision_load($vid = NULL) {
   return entity_revision_load('node', $vid);
diff --git a/core/modules/picture/picture.module b/core/modules/picture/picture.module
index 08494df..deba3b0 100644
--- a/core/modules/picture/picture.module
+++ b/core/modules/picture/picture.module
@@ -104,7 +104,7 @@ function picture_library_info() {
  * @param int $id
  *   The id of the picture mapping to load.
  *
- * @return Drupal\picture\Picture
+ * @return \Drupal\picture\Picture
  *   The entity object, or NULL if there is no entity with the given id.
  *
  * @todo Needed for menu_callback
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index fd2ee73..5c45377 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -835,7 +835,7 @@ function taxonomy_vocabulary_sort(array &$vocabularies = array()) {
  * @param int $vid
  *   The vocabulary's ID.
  *
- * @return Drupal\taxonomy\Plugin\Core\Entity\Vocabulary|null
+ * @return \Drupal\taxonomy\Plugin\Core\Entity\Vocabulary|null
  *   The taxonomy vocabulary entity, if exists, NULL otherwise. Results are
  *   statically cached.
  */
@@ -849,7 +849,7 @@ function taxonomy_vocabulary_load($vid) {
  * @param $tid
  *   A term's ID
  *
- * @return Drupal\taxonomy\Plugin\Core\Entity\Term|null
+ * @return \Drupal\taxonomy\Plugin\Core\Entity\Term|null
  *   A taxonomy term entity, or NULL if the term was not found. Results are
  *   statically cached.
  */
diff --git a/core/modules/views/lib/Drupal/views/ViewStorageController.php b/core/modules/views/lib/Drupal/views/ViewStorageController.php
index 7dc9e69..e88cd27 100644
--- a/core/modules/views/lib/Drupal/views/ViewStorageController.php
+++ b/core/modules/views/lib/Drupal/views/ViewStorageController.php
@@ -16,7 +16,7 @@
 class ViewStorageController extends ConfigStorageController {
 
   /**
-   * Overrides Drupal\config\ConfigStorageController::loadMultiple();
+   * {@inheritdoc}
    */
   public function loadMultiple(array $ids = NULL) {
     $entities = parent::loadMultiple($ids);
@@ -31,7 +31,7 @@ public function loadMultiple(array $ids = NULL) {
   }
 
   /**
-   * Overrides Drupal\config\ConfigStorageController::attachLoad();
+   * {@inheritdoc}
    */
   protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
     foreach ($queried_entities as $id => $entity) {