diff --git a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
index 642044e2b90858330836054461b28c97e806c36f..43d9e86224af44c4714abd8e2ea97ed62b2499db 100644
--- a/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
+++ b/core/lib/Drupal/Core/Config/ConfigInstallerInterface.php
@@ -55,16 +55,14 @@ public function installCollectionDefaultConfig($collection);
    *
    * @param \Drupal\Core\Config\StorageInterface $storage
    *
-   * @return self
-   *   The configuration installer.
+   * @return $this
    */
   public function setSourceStorage(StorageInterface $storage);
 
   /**
    * Resets the configuration storage that provides the default configuration.
    *
-   * @return self
-   *   The configuration installer.
+   * @return $this
    */
   public function resetSourceStorage();
 
diff --git a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
index a2c65d5eca47ecca9c8d2fdc64f1f7d501d2bcd6..4d7251d56328f027bb47d7fc14d8c5642b676f2c 100644
--- a/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
+++ b/core/lib/Drupal/Core/Config/ConfigModuleOverridesEvent.php
@@ -89,8 +89,7 @@ public function getOverrides() {
    * @param array $values
    *   The values in the configuration object to override.
    *
-   * @return self
-   *   The ConfigModuleOverridesEvent object.
+   * @return $this
    */
   public function setOverride($name, array $values) {
     if (in_array($name, $this->names)) {
diff --git a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
index 45663ac5f81a30d6afa0956242909d1aba090f5f..719d865aa27620b30f7554d24e0b20395d0479d8 100644
--- a/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
+++ b/core/lib/Drupal/Core/Entity/Display/EntityDisplayInterface.php
@@ -21,8 +21,7 @@ interface EntityDisplayInterface {
    * @param $view_mode
    *   The view mode for the new object.
    *
-   * @return self
-   *   The new object.
+   * @return static
    */
   public function createCopy($view_mode);
 
@@ -54,8 +53,7 @@ public function getComponent($name);
    * @param array $options
    *   The display options.
    *
-   * @return self
-   *   The entity display object.
+   * @return $this
    */
   public function setComponent($name, array $options = array());
 
@@ -65,8 +63,7 @@ public function setComponent($name, array $options = array());
    * @param string $name
    *   The name of the component.
    *
-   * @return self
-   *   The entity display object.
+   * @return $this
    */
   public function removeComponent($name);
 
diff --git a/core/lib/Drupal/Core/Entity/EntityInterface.php b/core/lib/Drupal/Core/Entity/EntityInterface.php
index 396449237db1ae381696c42717237439f3f4368d..c6054a343880e0fa552fc03173165a20be3144ce 100644
--- a/core/lib/Drupal/Core/Entity/EntityInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityInterface.php
@@ -65,7 +65,7 @@ public function isNew();
    *   (optional) Whether the entity should be forced to be new. Defaults to
    *   TRUE.
    *
-   * @return self
+   * @return $this
    *
    * @see \Drupal\Core\Entity\EntityInterface::isNew()
    */
diff --git a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
index d0d51ae447496724cc9ddd423039742fc494d5dc..b737a54f53cc69f0b578ae7418c5c9277862345a 100644
--- a/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
+++ b/core/lib/Drupal/Core/File/MimeType/MimeTypeGuesser.php
@@ -63,8 +63,7 @@ public function guess($path) {
    * @param int $priority
    *   The priority of the guesser being added.
    *
-   * @return self
-   *   The called object.
+   * @return $this
    */
   public function addGuesser(MimeTypeGuesserInterface $guesser, $priority = 0) {
     $this->guessers[$priority][] = $guesser;
diff --git a/core/lib/Drupal/Core/Image/ImageFactory.php b/core/lib/Drupal/Core/Image/ImageFactory.php
index ebd30b59fd0d51e2a552f4b45973c1852d59e75c..efcf3d984fd6a5bb7f6a9b410f7dafa06ebc9a1b 100644
--- a/core/lib/Drupal/Core/Image/ImageFactory.php
+++ b/core/lib/Drupal/Core/Image/ImageFactory.php
@@ -45,8 +45,7 @@ public function __construct(ImageToolkitManager $toolkit_manager) {
    * @param string $toolkit_id
    *   The ID of the image toolkit to use for this image factory.
    *
-   * @return self
-   *   Returns this image.
+   * @return $this
    */
   public function setToolkitId($toolkit_id) {
     $this->toolkitId = $toolkit_id;
diff --git a/core/lib/Drupal/Core/Page/HeadElement.php b/core/lib/Drupal/Core/Page/HeadElement.php
index 85055ad6fafe7cc2c9d2f4ba001ad43bfeeae61b..49c1f2d73298717cdf01ffe8ba7144a0debe1be9 100644
--- a/core/lib/Drupal/Core/Page/HeadElement.php
+++ b/core/lib/Drupal/Core/Page/HeadElement.php
@@ -63,8 +63,7 @@ public function __toString() {
    * @param mixed $value
    *   The value to which to set it.
    *
-   * @return self
-   *   The invoked object.
+   * @return $this
    */
   public function setAttribute($key, $value) {
     $this->attributes[$key] = $value;
@@ -88,8 +87,7 @@ public function &getAttributes() {
    *   (optional) Whether or not this element should be wrapped in <noscript>.
    *   Defaults to TRUE.
    *
-   * @return self
-   *   The element..
+   * @return $this
    */
   public function setNoScript($value = TRUE) {
     $this->noScript = $value;
diff --git a/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
index a6bb5c9cb8ca1d6f5b8c63e8850b200abdfb5950..9287d7c64b292d86f258156633d5c5e6c6575af3 100644
--- a/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
+++ b/core/lib/Drupal/Core/Plugin/DefaultPluginBag.php
@@ -86,8 +86,7 @@ protected function initializePlugin($instance_id) {
   /**
    * Sorts all plugin instances in this bag.
    *
-   * @return self
-   *   Returns the plugin bag.
+   * @return $this
    */
   public function sort() {
     uasort($this->instanceIDs, array($this, 'sortHelper'));
diff --git a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
index be253e1256832272c0a5256b2f2897d2590448e3..b710a75ea5e18dbf1c1e192d428c7ee3a95b556f 100644
--- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -106,8 +106,7 @@ public function getItemDefinition() {
    * @param \Drupal\Core\TypedData\DataDefinition $definition
    *   A list item's data definition.
    *
-   * @return self
-   *   The object itself for chaining.
+   * @return $this
    */
   public function setItemDefinition(DataDefinitionInterface $definition) {
     $this->itemDefinition = $definition;
diff --git a/core/modules/image/src/ImageEffectInterface.php b/core/modules/image/src/ImageEffectInterface.php
index 7079d634184983d560776fdac3244dd558c1e0d9..d2db1cdef3648bfe1274f92c162e827fa3260787 100644
--- a/core/modules/image/src/ImageEffectInterface.php
+++ b/core/modules/image/src/ImageEffectInterface.php
@@ -74,8 +74,7 @@ public function getWeight();
    * @param int $weight
    *   The weight for this image effect.
    *
-   * @return self
-   *   This image effect.
+   * @return $this
    */
   public function setWeight($weight);
 
diff --git a/core/modules/image/src/ImageStyleInterface.php b/core/modules/image/src/ImageStyleInterface.php
index efff9abd01393c890e2a840fe3e75dc49265fe67..175213e2bfae8239d0e55af08217ffe2d04f79c7 100644
--- a/core/modules/image/src/ImageStyleInterface.php
+++ b/core/modules/image/src/ImageStyleInterface.php
@@ -95,8 +95,7 @@ public function getPathToken($uri);
    *   (optional) The original image path or URI. If it's supplied, only this
    *   image derivative will be flushed.
    *
-   * @return self
-   *   This image style.
+   * @return $this
    */
   public function flush($path = NULL);
 
@@ -167,8 +166,7 @@ public function addImageEffect(array $configuration);
    * @param \Drupal\image\ImageEffectInterface $effect
    *   The image effect object.
    *
-   * @return self
-   *   This image style.
+   * @return $this
    */
   public function deleteImageEffect(ImageEffectInterface $effect);
 
diff --git a/core/modules/system/src/DateFormatInterface.php b/core/modules/system/src/DateFormatInterface.php
index 0d6b34b4862a0e388436d256684cf686b99cb9b1..fe1353d1a71c51b1007c661e426903c7bf1386cd 100644
--- a/core/modules/system/src/DateFormatInterface.php
+++ b/core/modules/system/src/DateFormatInterface.php
@@ -29,8 +29,7 @@ public function getPattern();
    * @param string $pattern
    *   The date pattern to use for this format.
    *
-   * @return self
-   *   Returns the date format.
+   * @return $this
    */
   public function setPattern($pattern);
 
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index aa373cab20e134a65d93af07db6ace410789c69c..2adc45a60a02408e34d8839b5039cf5e4bb2c83f 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -42,8 +42,7 @@ class GDToolkit extends ImageToolkitBase {
    * @param resource $resource
    *   The GD image resource.
    *
-   * @return self
-   *   Returns this toolkit object.
+   * @return $this
    */
   public function setResource($resource) {
     $this->resource = $resource;