diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
index 90ee661201..5c04b5a2c5 100644
--- a/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
+++ b/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
@@ -103,7 +103,7 @@ public function setContext($name, ContextInterface $context);
    *   The value to set the context to. The value has to validate against the
    *   provided context definition.
    *
-   * @return \Drupal\Component\Plugin\ContextAwarePluginInterface
+   * @return $this
    *   A context aware plugin object for chaining.
    *
    * @throws \Drupal\Component\Plugin\Exception\PluginException
diff --git a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
index 2e635364bc..dcf4c490b6 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
@@ -18,8 +18,7 @@
    *   The full system path of the file or directory to add. Only local files
    *   and directories are supported.
    *
-   * @return \Drupal\Core\Archiver\ArchiverInterface
-   *   The called object.
+   * @return $this
    */
   public function add($file_path);
 
@@ -29,8 +28,7 @@ public function add($file_path);
    * @param string $path
    *   The file name relative to the root of the archive to remove.
    *
-   * @return \Drupal\Core\Archiver\ArchiverInterface
-   *   The called object.
+   * @return $this
    */
   public function remove($path);
 
@@ -44,8 +42,7 @@ public function remove($path);
    *   relative to the root of the archive. If not specified, all files
    *   in the archive will be extracted.
    *
-   * @return \Drupal\Core\Archiver\ArchiverInterface
-   *   The called object.
+   * @return $this
    */
   public function extract($path, array $files = []);
 
diff --git a/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
index f191f9d20f..e2279f314e 100644
--- a/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
+++ b/core/lib/Drupal/Core/Asset/AttachedAssetsInterface.php
@@ -21,7 +21,7 @@
    * @param array $render_array
    *   A render array.
    *
-   * @return \Drupal\Core\Asset\AttachedAssetsInterface
+   * @return $this
    *
    * @throws \LogicException
    */
diff --git a/core/lib/Drupal/Core/Cache/BackendChain.php b/core/lib/Drupal/Core/Cache/BackendChain.php
index 3b3489af9d..50cbd3c96f 100644
--- a/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -44,8 +44,7 @@ public function __construct($bin) {
    * @param CacheBackendInterface $backend
    *   The cache backend to be appended to the cache chain.
    *
-   * @return \Drupal\Core\Cache\BackendChain
-   *   The called object.
+   * @return $this
    */
   public function appendBackend(CacheBackendInterface $backend) {
     $this->backends[] = $backend;
@@ -59,8 +58,7 @@ public function appendBackend(CacheBackendInterface $backend) {
    * @param CacheBackendInterface $backend
    *   The backend to be prepended to the cache chain.
    *
-   * @return \Drupal\Core\Cache\BackendChain
-   *   The called object.
+   * @return $this
    */
   public function prependBackend(CacheBackendInterface $backend) {
     array_unshift($this->backends, $backend);
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 7299d5e642..c62e2ace3f 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -117,8 +117,7 @@ public function setData(array $data) {
    * @param array $data
    *   The overridden values of the configuration data.
    *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
+   * @return $this
    */
   public function setSettingsOverride(array $data) {
     $this->settingsOverrides = $data;
@@ -132,8 +131,7 @@ public function setSettingsOverride(array $data) {
    * @param array $data
    *   The overridden values of the configuration data.
    *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
+   * @return $this
    */
   public function setModuleOverride(array $data) {
     $this->moduleOverrides = $data;
@@ -149,8 +147,7 @@ public function setModuleOverride(array $data) {
    * provided by modules. Precedence or different module overrides is
    * determined by the priority of the config.factory.override tagged services.
    *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
+   * @return $this
    */
   protected function setOverriddenData() {
     $this->overriddenData = $this->data;
@@ -169,8 +166,7 @@ protected function setOverriddenData() {
    * This method should be called after the original data or the overridden data
    * has been changed.
    *
-   * @return \Drupal\Core\Config\Config
-   *   The configuration object.
+   * @return $this
    */
   protected function resetOverriddenData() {
     unset($this->overriddenData);
@@ -235,7 +231,7 @@ public function save($has_trusted_data = FALSE) {
   /**
    * Deletes the configuration object.
    *
-   * @return \Drupal\Core\Config\Config
+   * @return $this
    *   The configuration object.
    */
   public function delete() {
diff --git a/core/lib/Drupal/Core/Config/ConfigImporter.php b/core/lib/Drupal/Core/Config/ConfigImporter.php
index b58f96358b..4929921990 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -230,8 +230,7 @@ public function getStorageComparer() {
   /**
    * Resets the storage comparer and processed list.
    *
-   * @return \Drupal\Core\Config\ConfigImporter
-   *   The ConfigImporter instance.
+   * @return $this
    */
   public function reset() {
     $this->storageComparer->reset();
@@ -449,8 +448,7 @@ protected function getUnprocessedExtensions($type) {
   /**
    * Imports the changelist to the target storage.
    *
-   * @return \Drupal\Core\Config\ConfigImporter
-   *   The ConfigImporter instance.
+   * @return $this
    *
    * @throws \Drupal\Core\Config\ConfigException
    */
diff --git a/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/core/lib/Drupal/Core/Config/PreExistingConfigException.php
index 57f54b2965..10a3551961 100644
--- a/core/lib/Drupal/Core/Config/PreExistingConfigException.php
+++ b/core/lib/Drupal/Core/Config/PreExistingConfigException.php
@@ -53,7 +53,7 @@ public function getExtension() {
    *   A list of configuration objects that already exist in active
    *   configuration, keyed by config collection.
    *
-   * @return \Drupal\Core\Config\PreExistingConfigException
+   * @return static
    */
   public static function create($extension, array $config_objects) {
     $message = SafeMarkup::format('Configuration objects (@config_names) provided by @extension already exist in active configuration',
diff --git a/core/lib/Drupal/Core/Config/StorageComparerInterface.php b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
index 803e092e89..86b682d9d8 100644
--- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -57,8 +57,7 @@ public function getChangelist($op = NULL, $collection = StorageInterface::DEFAUL
   /**
    * Recalculates the differences.
    *
-   * @return \Drupal\Core\Config\StorageComparerInterface
-   *   An object which implements the StorageComparerInterface.
+   * @return $this
    */
   public function reset();
 
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index 18a7126334..250cf6ee40 100644
--- a/core/lib/Drupal/Core/Config/StorageInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageInterface.php
@@ -173,7 +173,7 @@ public function deleteAll($prefix = '');
    *   configuration in a way that allows retrieval of configuration for a
    *   particular collection.
    *
-   * @return \Drupal\Core\Config\StorageInterface
+   * @return static
    *   A new instance of the storage backend with the collection set.
    */
   public function createCollection($collection);
diff --git a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
index 002e39e45a..a59a73ac29 100644
--- a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
@@ -19,8 +19,7 @@
    * @param $tag
    *   The tag to add.
    *
-   * @return \Drupal\Core\Database\Query\AlterableInterface
-   *   The called object.
+   * @return $this
    */
   public function addTag($tag);
 
@@ -72,8 +71,7 @@ public function hasAnyTag();
    * @param $object
    *   The additional data to add to the query. May be any valid PHP variable.
    *
-   * @return \Drupal\Core\Database\Query\AlterableInterface
-   *   The called object.
+   * @return $this
    */
   public function addMetaData($key, $object);
 
diff --git a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
index 221f0e2b49..93dfb4146a 100644
--- a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -58,8 +58,7 @@
    *   - The operators (NOT) BETWEEN, (NOT) IN, (NOT) EXISTS, (NOT) LIKE.
    *   Other operators (e.g. LIKE, BINARY) may or may not work. Defaults to =.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    *
    * @throws \Drupal\Core\Database\InvalidQueryException
    *   If passed invalid arguments, such as an empty array as $value.
@@ -83,8 +82,7 @@ public function condition($field, $value = NULL, $operator = '=');
    * @param array $args
    *   An associative array of arguments keyed by the named placeholders.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    */
   public function where($snippet, $args = []);
 
@@ -94,8 +92,7 @@ public function where($snippet, $args = []);
    * @param string|\Drupal\Core\Database\Query\SelectInterface $field
    *   The name of the field or a subquery to check.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    */
   public function isNull($field);
 
@@ -105,8 +102,7 @@ public function isNull($field);
    * @param string|\Drupal\Core\Database\Query\SelectInterface $field
    *   The name of the field or a subquery to check.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    */
   public function isNotNull($field);
 
@@ -116,8 +112,7 @@ public function isNotNull($field);
    * @param \Drupal\Core\Database\Query\SelectInterface $select
    *   The subquery that must contain results.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    */
   public function exists(SelectInterface $select);
 
@@ -127,8 +122,7 @@ public function exists(SelectInterface $select);
    * @param \Drupal\Core\Database\Query\SelectInterface $select
    *   The subquery that must not contain results.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
+   * @return $this
    */
   public function notExists(SelectInterface $select);
 
diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php
index 3af2d2ac6f..d6a4036fc2 100644
--- a/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -44,8 +44,7 @@ public function __construct($connection, $table, array $options = []) {
    * @param \Drupal\Core\Database\Query\SelectInterface $query
    *   The query to fetch the rows that should be inserted.
    *
-   * @return \Drupal\Core\Database\Query\Insert
-   *   The called object.
+   * @return $this
    */
   public function from(SelectInterface $query) {
     $this->fromQuery = $query;
diff --git a/core/lib/Drupal/Core/Database/Query/InsertTrait.php b/core/lib/Drupal/Core/Database/Query/InsertTrait.php
index f291da1a81..e06efc7253 100644
--- a/core/lib/Drupal/Core/Database/Query/InsertTrait.php
+++ b/core/lib/Drupal/Core/Database/Query/InsertTrait.php
@@ -65,7 +65,6 @@
    *   must be specified in the same order as the $fields array.
    *
    * @return $this
-   *   The called object.
    */
   public function fields(array $fields, array $values = []) {
     if (empty($this->insertFields)) {
@@ -96,7 +95,6 @@ public function fields(array $fields, array $values = []) {
    *   An array of values to add to the query.
    *
    * @return $this
-   *   The called object.
    */
   public function values(array $values) {
     if (is_numeric(key($values))) {
@@ -130,7 +128,6 @@ public function values(array $values) {
    *   specified in the table definition.
    *
    * @return $this
-   *   The called object.
    */
   public function useDefaults(array $fields) {
     $this->defaultFields = $fields;
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index 6a4a5ca1d3..1dbf4405bd 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -146,8 +146,7 @@ public function __construct(Connection $connection, $table, array $options = [])
    *   The table name or the subquery to be used. Use a Select query object to
    *   pass in a subquery.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   protected function conditionTable($table) {
     $this->conditionTable = $table;
@@ -161,8 +160,7 @@ protected function conditionTable($table) {
    *   An associative array of fields to write into the database. The array keys
    *   are the field names and the values are the values to which to set them.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   public function updateFields(array $fields) {
     $this->updateFields = $fields;
@@ -186,8 +184,7 @@ public function updateFields(array $fields) {
    *   If specified, this is an array of key/value pairs for named placeholders
    *   corresponding to the expression.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   public function expression($field, $expression, array $arguments = NULL) {
     $this->expressionFields[$field] = [
@@ -211,8 +208,7 @@ public function expression($field, $expression, array $arguments = NULL) {
    *   An array of fields to insert into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   public function insertFields(array $fields, array $values = []) {
     if ($values) {
@@ -238,8 +234,7 @@ public function insertFields(array $fields, array $values = []) {
    *   An array of values for which to use the default values
    *   specified in the table definition.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   public function useDefaults(array $fields) {
     $this->defaultFields = $fields;
@@ -264,8 +259,7 @@ public function useDefaults(array $fields) {
    *   An array of values to set into the database. The values must be
    *   specified in the same order as the $fields array.
    *
-   * @return \Drupal\Core\Database\Query\Merge
-   *   The called object.
+   * @return $this
    */
   public function fields(array $fields, array $values = []) {
     if ($values) {
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index 61cb39731b..0509ad6b54 100644
--- a/core/lib/Drupal/Core/Database/Query/Select.php
+++ b/core/lib/Drupal/Core/Database/Query/Select.php
@@ -729,7 +729,7 @@ public function countQuery() {
   /**
    * Prepares a count query from the current query object.
    *
-   * @return \Drupal\Core\Database\Query\Select
+   * @return static
    *   A new query object ready to have COUNT(*) performed on it.
    */
   protected function prepareCountQuery() {
diff --git a/core/lib/Drupal/Core/Database/Query/SelectInterface.php b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
index e42fcc64c2..fe2eb3eaa0 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -169,8 +169,7 @@ public function getArguments(PlaceholderInterface $queryPlaceholder = NULL);
    *
    * @param $distinct
    *   TRUE to flag this query DISTINCT, FALSE to disable it.
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function distinct($distinct = TRUE);
 
@@ -211,8 +210,7 @@ public function addField($table_alias, $field, $alias = NULL);
    *   An indexed array of fields present in the specified table that should be
    *   included in this query. If not specified, $table_alias.* will be generated
    *   without any aliases.
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function fields($table_alias, array $fields = []);
 
@@ -411,8 +409,7 @@ public function addJoin($type, $table, $alias = NULL, $condition = NULL, $argume
    * @param $direction
    *   The direction to sort. Legal values are "ASC" and "DESC". Any other value
    *   will be converted to "ASC".
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function orderBy($field, $direction = 'ASC');
 
@@ -433,8 +430,7 @@ public function orderBy($field, $direction = 'ASC');
    *
    * for an example of such an alternate sorting mechanism.
    *
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object
+   * @return $this
    */
   public function orderRandom();
 
@@ -449,8 +445,7 @@ public function orderRandom();
    *   range directives that are set.
    * @param $length
    *   The number of records to return from the result set.
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function range($start = NULL, $length = NULL);
 
@@ -474,8 +469,7 @@ public function range($start = NULL, $length = NULL);
    * @param $type
    *   The type of UNION to add to the query. Defaults to plain
    *   UNION.
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function union(SelectInterface $query, $type = '');
 
@@ -484,15 +478,14 @@ public function union(SelectInterface $query, $type = '');
    *
    * @param $field
    *   The field on which to group. This should be the field as aliased.
-   * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
+   * @return $this
    */
   public function groupBy($field);
 
   /**
    * Get the equivalent COUNT query of this query as a new query object.
    *
-   * @return \Drupal\Core\Database\Query\SelectInterface
+   * @return static
    *   A new SelectQuery object with no fields or expressions besides COUNT(*).
    */
   public function countQuery();
@@ -540,7 +533,6 @@ public function execute();
    *   options such as IN, LIKE, or BETWEEN. Defaults to IN if $value is an array
    *   = otherwise.
    * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
    */
   public function havingCondition($field, $value = NULL, $operator = NULL);
 
@@ -647,7 +639,6 @@ public function __clone();
    *   IF TRUE, FOR UPDATE will be added to the query, if FALSE then it won't.
    *
    * @return \Drupal\Core\Database\Query\ConditionInterface
-   *   The called object.
    */
   public function forUpdate($set = TRUE);
 
diff --git a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
index 4f739ee304..77b2ed481d 100644
--- a/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
+++ b/core/lib/Drupal/Core/Database/Query/TableSortExtender.php
@@ -30,7 +30,6 @@ public function __construct(SelectInterface $query, Connection $connection) {
    *   Table header array.
    *
    * @return \Drupal\Core\Database\Query\SelectInterface
-   *   The called object.
    *
    * @see table.html.twig
    */
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index ba0661c7a0..0a13f1869b 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -75,8 +75,7 @@ public function __construct(Connection $connection, $table, array $options = [])
    *   An associative array of fields to write into the database. The array keys
    *   are the field names and the values are the values to which to set them.
    *
-   * @return \Drupal\Core\Database\Query\Update
-   *   The called object.
+   * @return $this
    */
   public function fields(array $fields) {
     $this->fields = $fields;
@@ -98,8 +97,7 @@ public function fields(array $fields) {
    *   If specified, this is an array of key/value pairs for named placeholders
    *   corresponding to the expression.
    *
-   * @return \Drupal\Core\Database\Query\Update
-   *   The called object.
+   * @return $this
    */
   public function expression($field, $expression, array $arguments = NULL) {
     $this->expressionFields[$field] = [
diff --git a/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php b/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php
index 273a64f689..69f67320c4 100644
--- a/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php
@@ -17,7 +17,7 @@
   /**
    * Gets violations flagged on entity level, not associated with any field.
    *
-   * @return \Drupal\Core\Entity\EntityConstraintViolationListInterface
+   * @return static
    *   A list of violations on the entity level.
    */
   public function getEntityViolations();
@@ -28,7 +28,7 @@ public function getEntityViolations();
    * @param string $field_name
    *   The name of the field to get violations for.
    *
-   * @return \Symfony\Component\Validator\ConstraintViolationListInterface
+   * @return static
    *   The violations of the given field.
    */
   public function getByField($field_name);
@@ -42,7 +42,7 @@ public function getByField($field_name);
    * @param string[] $field_names
    *   The names of the fields to get violations for.
    *
-   * @return \Drupal\Core\Entity\EntityConstraintViolationListInterface
+   * @return static
    *   A list of violations of the given fields.
    */
   public function getByFields(array $field_names);
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index 383f41e4b7..4357e8d347 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -24,8 +24,7 @@ public function getConjunction();
    * @param string $operator
    * @param string $langcode
    *
-   * @return \Drupal\Core\Entity\Query\ConditionAggregateInterface
-   *   The called object.
+   * @return $this
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function condition($field, $function = NULL, $value = NULL, $operator = NULL, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 3c94ba7c78..be980d6602 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -23,8 +23,7 @@
    * @param string $alias
    *   (optional) The key that will be used on the resultset.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    */
   public function aggregate($field, $function, $langcode = NULL, &$alias = NULL);
 
@@ -34,8 +33,7 @@ public function aggregate($field, $function, $langcode = NULL, &$alias = NULL);
    * @param string $field
    *   The name of the field to group by.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    */
   public function groupBy($field);
 
@@ -60,8 +58,7 @@ public function groupBy($field);
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
@@ -77,8 +74,7 @@ public function conditionAggregate($field, $function = NULL, $value = NULL, $ope
    * @param $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    */
   public function existsAggregate($field, $function, $langcode = NULL);
 
@@ -92,8 +88,7 @@ public function existsAggregate($field, $function, $langcode = NULL);
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    */
   public function notExistsAggregate($field, $function, $langcode = NULL);
 
@@ -124,8 +119,7 @@ public function conditionAggregateGroupFactory($conjunction = 'AND');
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
-   *   The called object.
+   * @return $this
    */
   public function sortAggregate($field, $function, $direction = 'ASC', $langcode = NULL);
 
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index d4b0608e80..22c3af11c8 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -94,7 +94,7 @@ public function getEntityTypeId();
    *   and another does not they are not presumed to apply to the same
    *   translation.
    *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    * @see \Drupal\Core\Entity\Query\andConditionGroup
    * @see \Drupal\Core\Entity\Query\orConditionGroup
    */
@@ -107,7 +107,7 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N
    *   Name of a field.
    * @param $langcode
    *   Language code (optional).
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    */
   public function exists($field, $langcode = NULL);
 
@@ -118,7 +118,7 @@ public function exists($field, $langcode = NULL);
    *   Name of a field.
    * @param $langcode
    *   Language code (optional).
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    */
   public function notExists($field, $langcode = NULL);
 
@@ -132,16 +132,14 @@ public function notExists($field, $langcode = NULL);
    *   An optional integer to distinguish between multiple pagers on one page.
    *   If not provided, one is automatically calculated.
    *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function pager($limit = 10, $element = NULL);
 
   /**
    * @param null $start
    * @param null $length
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function range($start = NULL, $length = NULL);
 
@@ -151,8 +149,7 @@ public function range($start = NULL, $length = NULL);
    * @param string $direction
    * @param $langcode
    *   Language code (optional).
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function sort($field, $direction = 'ASC', $langcode = NULL);
 
@@ -161,8 +158,7 @@ public function sort($field, $direction = 'ASC', $langcode = NULL);
    *
    * For count queries, execute() returns the number entities found.
    *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function count();
 
@@ -175,14 +171,12 @@ public function count();
    *   specify what to sort on. This can be an entity or a field as described
    *   in condition().
    *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function tableSort(&$headers);
 
   /**
-   * @return \Drupal\Core\Entity\Query\QueryInterface
-   *   The called object.
+   * @return $this
    */
   public function accessCheck($access_check = TRUE);
 
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
index 50b81bba91..77143a3629 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -80,8 +80,7 @@ public function execute() {
   /**
    * Prepares the basic query with proper metadata/tags and base fields.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
-   *   Returns the called object.
+   * @return $this
    *
    * @throws \Drupal\Core\Entity\Query\QueryException
    *   Thrown if the base table does not exist.
@@ -156,8 +155,7 @@ protected function prepare() {
   /**
    * Compiles the conditions.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
-   *   Returns the called object.
+   * @return $this
    */
   protected function compile() {
     $this->condition->compile($this->sqlQuery);
@@ -167,8 +165,7 @@ protected function compile() {
   /**
    * Adds the sort to the build query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
-   *   Returns the called object.
+   * @return $this
    */
   protected function addSort() {
     if ($this->count) {
@@ -225,8 +222,7 @@ protected function addSort() {
   /**
    * Finish the query by adding fields, GROUP BY and range.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
-   *   Returns the called object.
+   * @return $this
    */
   protected function finish() {
     $this->initializePager();
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index c791bb5552..ccfab6b979 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -69,8 +69,7 @@ public function notExistsAggregate($field, $function, $langcode = NULL) {
   /**
    * Adds the aggregations to the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
-   *   Returns the called object.
+   * @return $this
    */
   protected function addAggregate() {
     if ($this->aggregate) {
@@ -85,8 +84,7 @@ protected function addAggregate() {
   /**
    * Builds the aggregation conditions part of the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
-   *   Returns the called object.
+   * @return $this
    */
   protected function compileAggregate() {
     $this->conditionAggregate->compile($this->sqlQuery);
@@ -96,8 +94,7 @@ protected function compileAggregate() {
   /**
    * Adds the groupby values to the actual query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
-   *   Returns the called object.
+   * @return $this
    */
   protected function addGroupBy() {
     foreach ($this->groupBy as $group_by) {
@@ -114,8 +111,7 @@ protected function addGroupBy() {
   /**
    * Builds the aggregation sort part of the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
-   *   Returns the called object.
+   * @return $this
    */
   protected function addSortAggregate() {
     if (!$this->count) {
diff --git a/core/lib/Drupal/Core/Form/EnforcedResponse.php b/core/lib/Drupal/Core/Form/EnforcedResponse.php
index 2b1466d0a3..47fa75fb8c 100644
--- a/core/lib/Drupal/Core/Form/EnforcedResponse.php
+++ b/core/lib/Drupal/Core/Form/EnforcedResponse.php
@@ -37,7 +37,7 @@ class EnforcedResponse extends Response {
    * @param \Exception $e
    *   The exception where the enforced response is to be extracted from.
    *
-   * @return \Drupal\Core\Form\EnforcedResponse|null
+   * @return static|null
    *   The enforced response or NULL if the exception chain does not contain a
    *   \Drupal\Core\Form\EnforcedResponseException exception.
    */
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
index 51867f4c3f..b621246bb7 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
@@ -52,8 +52,7 @@
    * @param string $source
    *   The source path of the image file.
    *
-   * @return \Drupal\Core\ImageToolkit\ImageToolkitInterface
-   *   An instance of the current toolkit object.
+   * @return $this
    *
    * @throws \BadMethodCallException
    *   After being set initially, the source image cannot be changed.
diff --git a/core/lib/Drupal/Core/Language/LanguageManagerInterface.php b/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
index eaefd18a27..43fc9a37bb 100644
--- a/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
+++ b/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
@@ -58,8 +58,7 @@ public function getCurrentLanguage($type = LanguageInterface::TYPE_INTERFACE);
    *   LanguageInterface::TYPE_INTERFACE, or NULL to reset all language types.
    *   Defaults to NULL.
    *
-   * @return \Drupal\Core\Language\LanguageManagerInterface
-   *   The language manager that has been reset.
+   * @return $this
    */
   public function reset($type = NULL);
 
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
index 7fb301edd4..76c06948b6 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
@@ -70,8 +70,7 @@ public function getOptions(RouteMatchInterface $route_match);
    * @param bool $active
    *   Sets whether this tab is active (e.g. a parent of the current tab).
    *
-   * @return \Drupal\Core\Menu\LocalTaskInterface
-   *   The called object for chaining.
+   * @return $this
    */
   public function setActive($active = TRUE);
 
diff --git a/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php b/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
index 2f326093cb..ba9238bf1e 100644
--- a/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
+++ b/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
@@ -19,16 +19,14 @@
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account to switch to.
    *
-   * @return \Drupal\Core\Session\AccountSwitcherInterface
-   *   $this.
+   * @return $this
    */
   public function switchTo(AccountInterface $account);
 
   /**
    * Reverts to a previous account after switching.
    *
-   * @return \Drupal\Core\Session\AccountSwitcherInterface
-   *   $this.
+   * @return $this
    *
    * @throws \RuntimeException
    *   When there are no more account switches to revert.
diff --git a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
index 4600c170aa..6a444b4fb3 100644
--- a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
+++ b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
@@ -87,8 +87,7 @@ public function __construct($count, $singular, $plural, array $args = [], array
    * @param array $options
    *   An associative array of additional options. See t() for allowed keys.
    *
-   * @return \Drupal\Core\StringTranslation\PluralTranslatableMarkup
-   *   A PluralTranslatableMarkup object.
+   * @return static
    */
   public static function createFromTranslatedString($count, $translated_string, array $args = [], array $options = []) {
     $plural = new static($count, '', '', $args, $options);
diff --git a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
index 001c58b287..5c2236744f 100644
--- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -20,8 +20,7 @@ class ListDataDefinition extends DataDefinition implements ListDataDefinitionInt
    * @param string $item_type
    *   The data type of the list items; e.g., 'string', 'integer' or 'any'.
    *
-   * @return \Drupal\Core\TypedData\ListDataDefinition
-   *   A new List Data Definition object.
+   * @return static
    */
   public static function create($item_type) {
     return static::createFromItemType($item_type);
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
index a6892d24f3..aea084495c 100644
--- a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
@@ -97,8 +97,7 @@ public function validate();
    *   TRUE. If a property is updated from a parent object, set it to FALSE to
    *   avoid being notified again.
    *
-   * @return \Drupal\Core\TypedData\TypedDataInterface
-   *   Returns itself to allow for chaining.
+   * @return $this
    */
   public function applyDefaultValue($notify = TRUE);
 
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 76dc46c77b..4daf7b2e79 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -132,7 +132,7 @@ public function __construct($route_name, $route_parameters = [], $options = [])
    * @param array $options
    *   See \Drupal\Core\Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a routed (internal to Drupal) URL.
    *
    * @see \Drupal\Core\Url::fromUserInput()
@@ -148,7 +148,7 @@ public static function fromRoute($route_name, $route_parameters = [], $options =
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The route match.
    *
-   * @return $this
+   * @return static
    */
   public static function fromRouteMatch(RouteMatchInterface $route_match) {
     if ($route_match->getRouteObject()) {
@@ -253,7 +253,7 @@ public static function fromUserInput($user_input, $options = []) {
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object with properties depending on the URI scheme. Call the
    *   access() method on this to do access checking.
    *
@@ -332,7 +332,7 @@ public static function fromUri($uri, $options = []) {
    * @param string $uri
    *   The original entered URI.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for an entity's canonical route.
    *
    * @throws \InvalidArgumentException
@@ -382,7 +382,7 @@ protected static function fromEntityUri(array $uri_parts, array $options, $uri)
    * @param array $options
    *   An array of options, see \Drupal\Core\Url::fromUri() for details.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a 'internal:' URI.
    *
    * @throws \InvalidArgumentException
@@ -431,7 +431,7 @@ protected static function fromInternalUri(array $uri_parts, array $options) {
    * @param string $uri
    *   The original passed in URI.
    *
-   * @return \Drupal\Core\Url
+   * @return static
    *   A new Url object for a 'route:' URI.
    *
    * @throws \InvalidArgumentException
diff --git a/core/modules/aggregator/src/ItemInterface.php b/core/modules/aggregator/src/ItemInterface.php
index 8639ff8717..4751023786 100644
--- a/core/modules/aggregator/src/ItemInterface.php
+++ b/core/modules/aggregator/src/ItemInterface.php
@@ -24,7 +24,6 @@ public function getFeedId();
    *   The feed id.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setFeedId($fid);
 
@@ -43,7 +42,6 @@ public function getTitle();
    *   The title of the feed item.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setTitle($title);
 
@@ -62,7 +60,6 @@ public function getLink();
    *   The link to the feed item.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setLink($link);
 
@@ -81,7 +78,6 @@ public function getAuthor();
    *   The author name of the feed item.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setAuthor($author);
 
@@ -100,7 +96,6 @@ public function getDescription();
    *   The body of the feed item.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setDescription($description);
 
@@ -119,7 +114,6 @@ public function getPostedTime();
    *   The posted date of the feed item, as a Unix timestamp.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setPostedTime($timestamp);
 
@@ -138,7 +132,6 @@ public function getGuid();
    *   The unique identifier for the feed item.
    *
    * @return \Drupal\aggregator\ItemInterface
-   *   The called feed item entity.
    */
   public function setGuid($guid);
 
diff --git a/core/modules/block_content/src/BlockContentInterface.php b/core/modules/block_content/src/BlockContentInterface.php
index 75fdc5979b..150fa34f3e 100644
--- a/core/modules/block_content/src/BlockContentInterface.php
+++ b/core/modules/block_content/src/BlockContentInterface.php
@@ -29,8 +29,7 @@ public function getRevisionLog();
    * @param string $info
    *   The block description.
    *
-   * @return \Drupal\block_content\BlockContentInterface
-   *   The class instance that this method is called on.
+   * @return $this
    */
   public function setInfo($info);
 
@@ -40,8 +39,7 @@ public function setInfo($info);
    * @param string $revision_log
    *   The revision log message.
    *
-   * @return \Drupal\block_content\BlockContentInterface
-   *   The class instance that this method is called on.
+   * @return $this
    *
    * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
    *   \Drupal\Core\Entity\RevisionLogInterface::setRevisionLogMessage() instead.
@@ -58,8 +56,7 @@ public function setRevisionLog($revision_log);
    * @param string $theme
    *   The theme name.
    *
-   * @return \Drupal\block_content\BlockContentInterface
-   *   The class instance that this method is called on.
+   * @return $this
    */
   public function setTheme($theme);
 
diff --git a/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php b/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php
index 2ae2ed9d9c..b675d4b3ff 100644
--- a/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php
+++ b/core/modules/ckeditor/src/Ajax/AddStyleSheetCommand.php
@@ -43,7 +43,6 @@ public function __construct($editor_id, array $stylesheets = []) {
    *   The style sheet URL.
    *
    * @return $this
-   *   The called object, for chaining.
    */
   public function addStyleSheet($stylesheet) {
     $this->styleSheets[] = $stylesheet;
diff --git a/core/modules/image/src/ImageStyleInterface.php b/core/modules/image/src/ImageStyleInterface.php
index 7dec361075..775c9b689c 100644
--- a/core/modules/image/src/ImageStyleInterface.php
+++ b/core/modules/image/src/ImageStyleInterface.php
@@ -37,8 +37,7 @@ public function getName();
    * @param string $name
    *   The name of the image style.
    *
-   * @return \Drupal\image\ImageStyleInterface
-   *   The class instance this method is called on.
+   * @return $this
    */
   public function setName($name);
 
diff --git a/core/modules/locale/src/StringStorageInterface.php b/core/modules/locale/src/StringStorageInterface.php
index 18c5edc2b6..e1a86d34cd 100644
--- a/core/modules/locale/src/StringStorageInterface.php
+++ b/core/modules/locale/src/StringStorageInterface.php
@@ -101,8 +101,7 @@ public function findTranslation(array $conditions);
    * @param \Drupal\locale\StringInterface $string
    *   The string object.
    *
-   * @return \Drupal\locale\StringStorageInterface
-   *   The called object.
+   * @return $this
    *
    * @throws \Drupal\locale\StringStorageException
    *   In case of failures, an exception is thrown.
@@ -115,8 +114,7 @@ public function save($string);
    * @param \Drupal\locale\StringInterface $string
    *   The string object.
    *
-   * @return \Drupal\locale\StringStorageInterface
-   *   The called object.
+   * @return $this
    *
    * @throws \Drupal\locale\StringStorageException
    *   In case of failures, an exception is thrown.
diff --git a/core/modules/locale/src/TranslationString.php b/core/modules/locale/src/TranslationString.php
index 63f4543cb5..be9ec7889a 100644
--- a/core/modules/locale/src/TranslationString.php
+++ b/core/modules/locale/src/TranslationString.php
@@ -58,8 +58,7 @@ public function __construct($values = []) {
    * @param bool $customized
    *   (optional) Whether the string is customized or not. Defaults to TRUE.
    *
-   * @return \Drupal\locale\TranslationString
-   *   The called object.
+   * @return $this
    */
   public function setCustomized($customized = TRUE) {
     $this->customized = $customized ? LOCALE_CUSTOMIZED : LOCALE_NOT_CUSTOMIZED;
diff --git a/core/modules/media/src/MediaInterface.php b/core/modules/media/src/MediaInterface.php
index 912bf97f3e..9c832c1dce 100644
--- a/core/modules/media/src/MediaInterface.php
+++ b/core/modules/media/src/MediaInterface.php
@@ -51,8 +51,7 @@ public function getCreatedTime();
    * @param int $timestamp
    *   The media creation timestamp.
    *
-   * @return \Drupal\media\MediaInterface
-   *   The called media item.
+   * @return $this
    */
   public function setCreatedTime($timestamp);
 
diff --git a/core/modules/node/src/NodeInterface.php b/core/modules/node/src/NodeInterface.php
index 87b68927c0..c1e867a989 100644
--- a/core/modules/node/src/NodeInterface.php
+++ b/core/modules/node/src/NodeInterface.php
@@ -65,8 +65,7 @@ public function getTitle();
    * @param string $title
    *   The node title.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    */
   public function setTitle($title);
 
@@ -84,8 +83,7 @@ public function getCreatedTime();
    * @param int $timestamp
    *   The node creation timestamp.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    */
   public function setCreatedTime($timestamp);
 
@@ -103,8 +101,7 @@ public function isPromoted();
    * @param bool $promoted
    *   TRUE to set this node to promoted, FALSE to set it to not promoted.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    */
   public function setPromoted($promoted);
 
@@ -122,8 +119,7 @@ public function isSticky();
    * @param bool $sticky
    *   TRUE to set this node to sticky, FALSE to set it to not sticky.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    */
   public function setSticky($sticky);
 
@@ -141,8 +137,7 @@ public function getRevisionCreationTime();
    * @param int $timestamp
    *   The UNIX timestamp of when this revision was created.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    */
   public function setRevisionCreationTime($timestamp);
 
@@ -163,8 +158,7 @@ public function getRevisionAuthor();
    * @param int $uid
    *   The user ID of the revision author.
    *
-   * @return \Drupal\node\NodeInterface
-   *   The called node entity.
+   * @return $this
    *
    * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
    *   \Drupal\Core\Entity\RevisionLogInterface::setRevisionUserId() instead.
diff --git a/core/modules/search/src/Plugin/SearchInterface.php b/core/modules/search/src/Plugin/SearchInterface.php
index 8f95ce8246..5325413406 100644
--- a/core/modules/search/src/Plugin/SearchInterface.php
+++ b/core/modules/search/src/Plugin/SearchInterface.php
@@ -21,8 +21,7 @@
    * @param array $attributes
    *   Array of attributes, usually from the current request object.
    *
-   * @return \Drupal\search\Plugin\SearchInterface
-   *   A search plugin object for chaining.
+   * @return $this
    */
   public function setSearch($keywords, array $parameters, array $attributes);
 
diff --git a/core/modules/shortcut/src/ShortcutInterface.php b/core/modules/shortcut/src/ShortcutInterface.php
index e434266eec..86cfcd75f1 100644
--- a/core/modules/shortcut/src/ShortcutInterface.php
+++ b/core/modules/shortcut/src/ShortcutInterface.php
@@ -23,8 +23,7 @@ public function getTitle();
    * @param string $title
    *   The title of this shortcut.
    *
-   * @return \Drupal\shortcut\ShortcutInterface
-   *   The called shortcut entity.
+   * @return $this
    */
   public function setTitle($title);
 
@@ -42,8 +41,7 @@ public function getWeight();
    * @param int $weight
    *   The shortcut weight.
    *
-   * @return \Drupal\shortcut\ShortcutInterface
-   *   The called shortcut entity.
+   * @return $this
    */
   public function setWeight($weight);
 
diff --git a/core/modules/shortcut/src/ShortcutSetInterface.php b/core/modules/shortcut/src/ShortcutSetInterface.php
index 3ad5e696c5..920017d944 100644
--- a/core/modules/shortcut/src/ShortcutSetInterface.php
+++ b/core/modules/shortcut/src/ShortcutSetInterface.php
@@ -16,8 +16,7 @@
    * to the set. If the link is added to the end of the array and this function
    * is called, it will force that link to display at the end of the list.
    *
-   * @return \Drupal\shortcut\ShortcutSetInterface
-   *   The shortcut set.
+   * @return $this
    */
   public function resetLinkWeights();
 
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 308a8075b5..675c272f1d 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -114,8 +114,7 @@ public static function create(ContainerInterface $container, array $configuratio
    * @param resource $resource
    *   The GD image resource.
    *
-   * @return \Drupal\system\Plugin\ImageToolkit\GDToolkit
-   *   An instance of the current toolkit object.
+   * @return $this
    */
   public function setResource($resource) {
     if (!is_resource($resource) || get_resource_type($resource) != 'gd') {
diff --git a/core/modules/user/src/UserInterface.php b/core/modules/user/src/UserInterface.php
index 6919e0d7b4..d1283c394a 100644
--- a/core/modules/user/src/UserInterface.php
+++ b/core/modules/user/src/UserInterface.php
@@ -83,8 +83,7 @@ public function removeRole($rid);
    * @param string $username
    *   The new user name.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function setUsername($username);
 
@@ -102,8 +101,7 @@ public function getPassword();
    * @param string $password
    *   The new unhashed password.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function setPassword($password);
 
@@ -113,8 +111,7 @@ public function setPassword($password);
    * @param string $mail
    *   The new email address of the user.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function setEmail($mail);
 
@@ -132,8 +129,7 @@ public function getCreatedTime();
    * @param int $timestamp
    *   Timestamp of the last access.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function setLastAccessTime($timestamp);
 
@@ -151,8 +147,7 @@ public function getLastLoginTime();
    * @param int $timestamp
    *   Timestamp of the last login time.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function setLastLoginTime($timestamp);
 
@@ -175,16 +170,14 @@ public function isBlocked();
   /**
    * Activates the user.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function activate();
 
   /**
    * Blocks the user.
    *
-   * @return \Drupal\user\UserInterface
-   *   The called user entity.
+   * @return $this
    */
   public function block();