diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 308896b..8b1aa45 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -83,7 +83,7 @@ class ConfigStorageController extends EntityStorageControllerBase implements Con
    * Constructs a ConfigStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory service.
    * @param \Drupal\Core\Config\StorageInterface $config_storage
diff --git a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
index 2354bdb..7dfedbc 100644
--- a/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/DatabaseStorageController.php
@@ -38,8 +38,6 @@ class DatabaseStorageController extends EntityStorageControllerBase {
   /**
    * Whether this entity type should use the static cache.
    *
-   * Set by entity info.
-   *
    * @var boolean
    */
   protected $cache;
@@ -73,7 +71,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a DatabaseStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
diff --git a/core/lib/Drupal/Core/Entity/EntityAccessController.php b/core/lib/Drupal/Core/Entity/EntityAccessController.php
index 1ef40ff..835bb5a 100644
--- a/core/lib/Drupal/Core/Entity/EntityAccessController.php
+++ b/core/lib/Drupal/Core/Entity/EntityAccessController.php
@@ -44,7 +44,7 @@ class EntityAccessController extends EntityControllerBase implements EntityAcces
    * Constructs an access controller instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    */
   public function __construct(EntityTypeInterface $entity_type) {
     $this->entityTypeId = $entity_type->id();
diff --git a/core/lib/Drupal/Core/Entity/EntityControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
index 4e077e3..a9bf653 100644
--- a/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityControllerInterface.php
@@ -32,7 +32,7 @@
    * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
    *   The service container this object should use.
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    *
    * @return static
    *   A new instance of the entity controller.
diff --git a/core/lib/Drupal/Core/Entity/EntityListController.php b/core/lib/Drupal/Core/Entity/EntityListController.php
index 1ad0dd5..0703f50 100644
--- a/core/lib/Drupal/Core/Entity/EntityListController.php
+++ b/core/lib/Drupal/Core/Entity/EntityListController.php
@@ -52,7 +52,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a new EntityListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    */
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
index bf9fed3..5416935 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerBase.php
@@ -62,7 +62,7 @@
    * Constructs an EntityStorageControllerBase instance.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    */
   public function __construct(EntityTypeInterface $entity_type) {
     $this->entityTypeId = $entity_type->id();
diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
index 990f089..58f01c7 100644
--- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
+++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php
@@ -61,7 +61,7 @@ class EntityViewBuilder extends EntityControllerBase implements EntityController
    * Constructs a new EntityViewBuilder.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity information array.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
diff --git a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
index d9e7adf..33cef2d 100644
--- a/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
+++ b/core/lib/Drupal/Core/Entity/FieldableDatabaseStorageController.php
@@ -63,8 +63,6 @@ class FieldableDatabaseStorageController extends FieldableEntityStorageControlle
   /**
    * Whether this entity type should use the static cache.
    *
-   * Set by entity info.
-   *
    * @var boolean
    */
   protected $cache;
@@ -98,7 +96,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a DatabaseStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\field\FieldInfo $field_info
diff --git a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
index c8e7f34..22b54a3 100644
--- a/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
+++ b/core/lib/Drupal/Core/Entity/FieldableEntityStorageControllerBase.php
@@ -34,7 +34,7 @@
    * Constructs a FieldableEntityStorageControllerBase object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    */
   public function __construct(EntityTypeInterface $entity_type) {
     parent::__construct($entity_type);
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index 3fdf764..7d7d901 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -20,7 +20,7 @@
 class Query extends QueryBase implements QueryInterface {
 
   /**
-   * Contains the entity info for the entity type of that query.
+   * The entity type definition.
    *
    * @var \Drupal\Core\Entity\EntityTypeInterface
    */
@@ -71,7 +71,7 @@ class Query extends QueryBase implements QueryInterface {
    * @param string $entity_type
    *   The entity type.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
-   *   The entity manager storing the entity info.
+   *   The entity manager service.
    * @param string $conjunction
    *   - AND: all of the conditions on the query need to match.
    *   - OR: at least one of the conditions on the query need to match.
diff --git a/core/modules/action/lib/Drupal/action/ActionListController.php b/core/modules/action/lib/Drupal/action/ActionListController.php
index 0525ff1..946bcca 100644
--- a/core/modules/action/lib/Drupal/action/ActionListController.php
+++ b/core/modules/action/lib/Drupal/action/ActionListController.php
@@ -36,7 +36,7 @@ class ActionListController extends ConfigEntityListController implements EntityC
    * Constructs a new ActionListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The action storage controller.
    * @param \Drupal\Core\Action\ActionManager $action_manager
diff --git a/core/modules/block/lib/Drupal/block/BlockAccessController.php b/core/modules/block/lib/Drupal/block/BlockAccessController.php
index 2cb5c23..9469ffc 100644
--- a/core/modules/block/lib/Drupal/block/BlockAccessController.php
+++ b/core/modules/block/lib/Drupal/block/BlockAccessController.php
@@ -32,7 +32,7 @@ class BlockAccessController extends EntityAccessController implements EntityCont
    * Constructs a BlockAccessController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Path\AliasManagerInterface $alias_manager
    *   The alias manager.
    */
diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php
index aa8ce99..b210574 100644
--- a/core/modules/block/lib/Drupal/block/BlockListController.php
+++ b/core/modules/block/lib/Drupal/block/BlockListController.php
@@ -57,7 +57,7 @@ class BlockListController extends ConfigEntityListController implements FormInte
    * Constructs a new BlockListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $block_manager
diff --git a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
index 11a1f87..8612170 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentViewBuilder.php
@@ -60,7 +60,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a new CommentViewBuilder.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity information array.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager service.
    * @param \Drupal\Core\Language\LanguageManagerInterface $language_manager
diff --git a/core/modules/comment/lib/Drupal/comment/Form/CommentAdminOverview.php b/core/modules/comment/lib/Drupal/comment/Form/CommentAdminOverview.php
index 96834ab..ebd2623 100644
--- a/core/modules/comment/lib/Drupal/comment/Form/CommentAdminOverview.php
+++ b/core/modules/comment/lib/Drupal/comment/Form/CommentAdminOverview.php
@@ -107,13 +107,13 @@ public function getFormID() {
    *   An associative array containing the structure of the form.
    * @param array $form_state
    *   An associative array containing the current state of the form.
-   * @param string $typeId
+   * @param string $type
    *   The type of the overview form ('approval' or 'new').
    *
    * @return array
    *   The form structure.
    */
-  public function buildForm(array $form, array &$form_state, $typeId = 'new') {
+  public function buildForm(array $form, array &$form_state, $type = 'new') {
 
     // Build an 'Update options' form.
     $form['options'] = array(
@@ -122,7 +122,7 @@ public function buildForm(array $form, array &$form_state, $typeId = 'new') {
       '#attributes' => array('class' => array('container-inline')),
     );
 
-    if ($typeId == 'approval') {
+    if ($type == 'approval') {
       $options['publish'] = $this->t('Publish the selected comments');
     }
     else {
@@ -143,7 +143,7 @@ public function buildForm(array $form, array &$form_state, $typeId = 'new') {
     );
 
     // Load the comments that need to be displayed.
-    $status = ($typeId == 'approval') ? CommentInterface::NOT_PUBLISHED : CommentInterface::PUBLISHED;
+    $status = ($type == 'approval') ? CommentInterface::NOT_PUBLISHED : CommentInterface::PUBLISHED;
     $header = array(
       'subject' => array(
         'data' => $this->t('Subject'),
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php
index 89b2b30..760b8cb 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationFieldInstanceListController.php
@@ -65,7 +65,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a new ConfigTranslationFieldInstanceListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
diff --git a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
index 271b621..f6f5a94 100644
--- a/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
+++ b/core/modules/edit/lib/Drupal/edit/Form/EditFieldForm.php
@@ -80,19 +80,19 @@ public function getFormId() {
    *
    * Builds a form for a single entity field.
    */
-  public function buildForm(array $form, array &$form_state, EntityInterface $entityId = NULL, $field_name = NULL) {
+  public function buildForm(array $form, array &$form_state, EntityInterface $entity = NULL, $field_name = NULL) {
     if (!isset($form_state['entity'])) {
-      $this->init($form_state, $entityId, $field_name);
+      $this->init($form_state, $entity, $field_name);
     }
 
     // Add the field form.
     field_attach_form($form_state['entity'], $form, $form_state, $form_state['langcode'], array('field_name' =>  $form_state['field_name']));
 
     // Add a dummy changed timestamp field to attach form errors to.
-    if ($entityId instanceof EntityChangedInterface) {
+    if ($entity instanceof EntityChangedInterface) {
       $form['changed_field'] = array(
         '#type' => 'hidden',
-        '#value' => $entityId->getChangedTime(),
+        '#value' => $entity->getChangedTime(),
       );
     }
 
diff --git a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
index 7062a4b..3e244b3 100644
--- a/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
+++ b/core/modules/entity/lib/Drupal/entity/EntityDisplayModeListController.php
@@ -29,7 +29,7 @@ class EntityDisplayModeListController extends ConfigEntityListController {
    * Constructs a new EntityListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Entity\EntityTypeInterface[] $entity_types
diff --git a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
index d0735b5..82c03e9 100644
--- a/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldInstanceStorageController.php
@@ -47,7 +47,7 @@ class FieldInstanceStorageController extends ConfigStorageController {
    * Constructs a FieldInstanceStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory service.
    * @param \Drupal\Core\Config\StorageInterface $config_storage
diff --git a/core/modules/field/lib/Drupal/field/FieldStorageController.php b/core/modules/field/lib/Drupal/field/FieldStorageController.php
index 39b88b9..4a9727b 100644
--- a/core/modules/field/lib/Drupal/field/FieldStorageController.php
+++ b/core/modules/field/lib/Drupal/field/FieldStorageController.php
@@ -49,7 +49,7 @@ class FieldStorageController extends ConfigStorageController {
    * Constructs a FieldStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
    *   The config factory service.
    * @param \Drupal\Core\Config\StorageInterface $config_storage
diff --git a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
index a008805..8f5a4b1 100644
--- a/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
+++ b/core/modules/field/lib/Drupal/field/Tests/TranslationTest.php
@@ -19,7 +19,7 @@ class TranslationTest extends FieldUnitTestBase {
   /**
    * Modules to enable.
    *
-   * node is required because the tests alter node entity info.
+   * node is required because the tests alter the node entity type.
    *
    * @var array
    */
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php b/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
index d6720d2..9ccfe22 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FieldListController.php
@@ -51,7 +51,7 @@ class FieldListController extends ConfigEntityListController {
    * Constructs a new EntityListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
    * @param \Drupal\Core\Field\FieldTypePluginManagerInterface $field_type_manager
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
index 3b586f7..b83c0a9 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatListController.php
@@ -37,7 +37,7 @@ class FilterFormatListController extends DraggableListController implements Enti
    * Constructs a new FilterFormatListController.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Config\ConfigFactory $config_factory
diff --git a/core/modules/image/lib/Drupal/image/ImageStyleListController.php b/core/modules/image/lib/Drupal/image/ImageStyleListController.php
index f528f50..8d9de4d 100644
--- a/core/modules/image/lib/Drupal/image/ImageStyleListController.php
+++ b/core/modules/image/lib/Drupal/image/ImageStyleListController.php
@@ -32,7 +32,7 @@ class ImageStyleListController extends ConfigEntityListController implements Ent
    * Constructs a new ImageStyleListController object.
    *
    * @param EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $image_style_storage
    *   The image style entity storage controller class.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
index 9bdb3b0..d244a71 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/MenuLinkStorageController.php
@@ -50,7 +50,7 @@ class MenuLinkStorageController extends DatabaseStorageController implements Men
    * Overrides DatabaseStorageController::__construct().
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\Component\Uuid\UuidInterface $uuid_service
diff --git a/core/modules/node/lib/Drupal/node/NodeAccessController.php b/core/modules/node/lib/Drupal/node/NodeAccessController.php
index d497a48..96204a4 100644
--- a/core/modules/node/lib/Drupal/node/NodeAccessController.php
+++ b/core/modules/node/lib/Drupal/node/NodeAccessController.php
@@ -35,7 +35,7 @@ class NodeAccessController extends EntityAccessController implements NodeAccessC
    * Constructs a NodeAccessController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\node\NodeGrantDatabaseStorageInterface $grant_storage
    *   The node grant storage.
    */
diff --git a/core/modules/node/lib/Drupal/node/NodeListController.php b/core/modules/node/lib/Drupal/node/NodeListController.php
index 1ec30d1..4ac1ebb 100644
--- a/core/modules/node/lib/Drupal/node/NodeListController.php
+++ b/core/modules/node/lib/Drupal/node/NodeListController.php
@@ -33,7 +33,7 @@ class NodeListController extends EntityListController {
    * Constructs a new NodeListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Datetime\Date $date_service
diff --git a/core/modules/node/lib/Drupal/node/NodeTypeListController.php b/core/modules/node/lib/Drupal/node/NodeTypeListController.php
index 05e16f9..b1829f6 100644
--- a/core/modules/node/lib/Drupal/node/NodeTypeListController.php
+++ b/core/modules/node/lib/Drupal/node/NodeTypeListController.php
@@ -32,7 +32,7 @@ class NodeTypeListController extends ConfigEntityListController implements Entit
    * Constructs a NodeTypeFormController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Routing\UrlGeneratorInterface $url_generator
diff --git a/core/modules/search/lib/Drupal/search/SearchPageListController.php b/core/modules/search/lib/Drupal/search/SearchPageListController.php
index 2385b7a..8c69ac0 100644
--- a/core/modules/search/lib/Drupal/search/SearchPageListController.php
+++ b/core/modules/search/lib/Drupal/search/SearchPageListController.php
@@ -46,7 +46,7 @@ class SearchPageListController extends DraggableListController implements FormIn
    * Constructs a new SearchPageListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\search\SearchPluginManager $search_manager
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php
index c5032eb..45d3731 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutAccessController.php
@@ -30,7 +30,7 @@ class ShortcutAccessController extends EntityAccessController implements EntityC
    * Constructs a ShortcutAccessController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\shortcut\ShortcutSetStorageController $shortcut_set_storage
    *   The shortcut_set storage controller.
    */
diff --git a/core/modules/system/lib/Drupal/system/DateFormatListController.php b/core/modules/system/lib/Drupal/system/DateFormatListController.php
index cefbef6..9472d8c 100644
--- a/core/modules/system/lib/Drupal/system/DateFormatListController.php
+++ b/core/modules/system/lib/Drupal/system/DateFormatListController.php
@@ -31,7 +31,7 @@ class DateFormatListController extends ConfigEntityListController {
    * Constructs a new DateFormatListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Datetime\Date $date_service
diff --git a/core/modules/user/lib/Drupal/user/Controller/UserListController.php b/core/modules/user/lib/Drupal/user/Controller/UserListController.php
index 9e6f94e..72c1a84 100644
--- a/core/modules/user/lib/Drupal/user/Controller/UserListController.php
+++ b/core/modules/user/lib/Drupal/user/Controller/UserListController.php
@@ -33,7 +33,7 @@ class UserListController extends EntityListController implements EntityControlle
    * Constructs a new UserListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage
    *   The entity storage controller class.
    * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
diff --git a/core/modules/user/lib/Drupal/user/UserStorageController.php b/core/modules/user/lib/Drupal/user/UserStorageController.php
index 3709829..0694019 100644
--- a/core/modules/user/lib/Drupal/user/UserStorageController.php
+++ b/core/modules/user/lib/Drupal/user/UserStorageController.php
@@ -43,7 +43,7 @@ class UserStorageController extends FieldableDatabaseStorageController implement
    * Constructs a new UserStorageController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   The entity info for the entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    * @param \Drupal\field\FieldInfo $field_info
diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
index 44955a5..ba67b0a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/ViewStorageTest.php
@@ -40,11 +40,11 @@ class ViewStorageTest extends ViewUnitTestBase {
   );
 
   /**
-   * The configuration entity information from entity_get_info().
+   * The entity type definition.
    *
-   * @var array
+   * @var \Drupal\Core\Entity\EntityTypeInterface
    */
-  protected $info;
+  protected $entityType;
 
   /**
    * The configuration entity storage controller.
@@ -72,12 +72,12 @@ public static function getInfo() {
    * Tests CRUD operations.
    */
   function testConfigurationEntityCRUD() {
-    // Get the configuration entity information and controller.
-    $this->info = \Drupal::entityManager()->getDefinition('view');
+    // Get the configuration entity type and controller.
+    $this->entityType = \Drupal::entityManager()->getDefinition('view');
     $this->controller = $this->container->get('entity.manager')->getStorageController('view');
 
     // Confirm that an info array has been returned.
-    $this->assertTrue($this->info instanceof EntityTypeInterface, 'The View info array is loaded.');
+    $this->assertTrue($this->entityType instanceof EntityTypeInterface, 'The View info array is loaded.');
 
     // Confirm we have the correct controller class.
     $this->assertTrue($this->controller instanceof ViewStorageController, 'The correct controller is loaded.');
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
index f76f5fe..9ff3d79 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
@@ -43,7 +43,7 @@ public static function createInstance(ContainerInterface $container, EntityTypeI
    * Constructs a new EntityListController object.
    *
    * @param \Drupal\Core\Entity\EntityTypeInterface $entity_type
-   *   An array of entity info for this entity type.
+   *   The entity type definition.
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage.
    *   The entity storage controller class.
    * @param \Drupal\Component\Plugin\PluginManagerInterface $display_manager