diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index d7d6816..b463e7b 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -73,7 +73,7 @@ public function enforceIsNew($value = TRUE);
    * Returns the type of the entity.
    *
    * @return string
-   *   The type of the entity.
+   *   The entity type ID.
    */
   public function entityTypeId();
 
@@ -81,8 +81,8 @@ public function entityTypeId();
    * Returns the bundle of the entity.
    *
    * @return
-   *   The bundle of the entity. Defaults to the entity type if the entity type
-   *   does not make use of different bundles.
+   *   The bundle of the entity. Defaults to the entity type ID if the entity
+   *   type does not make use of different bundles.
    */
   public function bundle();
 
@@ -221,9 +221,10 @@ public static function postLoad(EntityStorageControllerInterface $storage_contro
   public function createDuplicate();
 
   /**
-   * Returns the info of the type of the entity.
+   * Returns the entity type definition.
    *
    * @return \Drupal\Core\Entity\EntityTypeInterface
+   *   Entity type definition.
    */
   public function entityType();
 
diff --git a/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php b/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
index a14ac40..761b0b5 100644
--- a/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityStorageControllerInterface.php
@@ -155,18 +155,18 @@ public function save(EntityInterface $entity);
   public function getQueryServicename();
 
   /**
-   * Returns the entity type.
+   * Returns the entity type ID.
    *
    * @return string
-   *   The entity type.
+   *   The entity type ID.
    */
   public function entityTypeId();
 
   /**
-   * Returns the entity info.
+   * Returns the entity type definition.
    *
-   * @return string
-   *   The entity info.
+   * @return \Drupal\Core\Entity\EntityTypeInterface
+   *   Entity type definition.
    */
   public function entityType();