diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
index 5aa737d..aa6f9ec 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityInterface.php
@@ -28,23 +28,21 @@ public function getOriginalId();
    * @param string $id
    *   The new ID to set as original ID.
    *
-   * @return self
+   * @return static
    */
   public function setOriginalId($id);
 
   /**
    * Enables the configuration entity.
    *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface
-   *   The configuration entity.
+   * @return static
    */
   public function enable();
 
   /**
    * Disables the configuration entity.
    *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface
-   *   The configuration entity.
+   * @return static
    */
   public function disable();
 
@@ -54,8 +52,7 @@ public function disable();
    * @param bool $status
    *   The status of the configuration entity.
    *
-   * @return \Drupal\Core\Config\Entity\ConfigEntityInterface
-   *   The class instance that this method is called on.
+   * @return static
    */
   public function setStatus($status);
 
@@ -117,7 +114,7 @@ public function set($property_name, $value);
    *
    * These are the values that get saved into config.
    *
-   * @return array
+   * @return mixed[]
    *   An array of exportable properties and their values.
    */
   public function getExportProperties();
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 3e6af82..ac64eb3 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -223,7 +223,7 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
    *
    * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
    *   The entity storage controller object.
-   * @param array $values
+   * @param mixed[] $values
    *   An array of values to set, keyed by property name. If the entity type has
    *   bundles the bundle key has to be specified.
    */
@@ -232,7 +232,7 @@ public static function preCreate(EntityStorageControllerInterface $storage_contr
   /**
    * Acts on an entity after it is created but before hooks are invoked.
    *
-   * @param EntityStorageControllerInterface $storage_controller
+   * @param \Drupal\Core\Entity\EntityStorageControllerInterface $storage_controller
    *   The entity storage controller object.
    */
   public function postCreate(EntityStorageControllerInterface $storage_controller);
@@ -244,7 +244,7 @@ public function postCreate(EntityStorageControllerInterface $storage_controller)
    *
    * @param EntityStorageControllerInterface $storage_controller
    *   The entity storage controller object.
-   * @param \Drupal\Core\Entity\EntityInterface[] $entities
+   * @param static[] $entities
    *   An array of entities.
    */
   public static function preDelete(EntityStorageControllerInterface $storage_controller, array $entities);
@@ -256,7 +256,7 @@ public static function preDelete(EntityStorageControllerInterface $storage_contr
    *
    * @param EntityStorageControllerInterface $storage_controller
    *   The entity storage controller object.
-   * @param \Drupal\Core\Entity\EntityInterface[] $entities
+   * @param static[] $entities
    *   An array of entities.
    */
   public static function postDelete(EntityStorageControllerInterface $storage_controller, array $entities);
@@ -266,7 +266,7 @@ public static function postDelete(EntityStorageControllerInterface $storage_cont
    *
    * @param EntityStorageControllerInterface $storage_controller
    *   The entity storage controller object.
-   * @param \Drupal\Core\Entity\EntityInterface[] $entities
+   * @param static[] $entities
    *   An array of entities.
    */
   public static function postLoad(EntityStorageControllerInterface $storage_controller, array &$entities);