diff --git a/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php b/core/lib/Drupal/Component/Plugin/ContextAwarePluginInterface.php
index 90ee661..5c04b5a 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 2e63536..979b93a 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiverInterface.php
@@ -18,7 +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
+   * @return $this
    *   The called object.
    */
   public function add($file_path);
@@ -29,7 +29,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
+   * @return $this
    *   The called object.
    */
   public function remove($path);
@@ -44,7 +44,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
+   * @return $this
    *   The called object.
    */
   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 f191f9d..e2279f3 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 3b3489a..d959331 100644
--- a/core/lib/Drupal/Core/Cache/BackendChain.php
+++ b/core/lib/Drupal/Core/Cache/BackendChain.php
@@ -44,7 +44,7 @@ public function __construct($bin) {
    * @param CacheBackendInterface $backend
    *   The cache backend to be appended to the cache chain.
    *
-   * @return \Drupal\Core\Cache\BackendChain
+   * @return $this
    *   The called object.
    */
   public function appendBackend(CacheBackendInterface $backend) {
@@ -59,7 +59,7 @@ public function appendBackend(CacheBackendInterface $backend) {
    * @param CacheBackendInterface $backend
    *   The backend to be prepended to the cache chain.
    *
-   * @return \Drupal\Core\Cache\BackendChain
+   * @return $this
    *   The called object.
    */
   public function prependBackend(CacheBackendInterface $backend) {
diff --git a/core/lib/Drupal/Core/Config/Config.php b/core/lib/Drupal/Core/Config/Config.php
index 7299d5e..3cf741f 100644
--- a/core/lib/Drupal/Core/Config/Config.php
+++ b/core/lib/Drupal/Core/Config/Config.php
@@ -117,7 +117,7 @@ public function setData(array $data) {
    * @param array $data
    *   The overridden values of the configuration data.
    *
-   * @return \Drupal\Core\Config\Config
+   * @return $this
    *   The configuration object.
    */
   public function setSettingsOverride(array $data) {
@@ -132,7 +132,7 @@ public function setSettingsOverride(array $data) {
    * @param array $data
    *   The overridden values of the configuration data.
    *
-   * @return \Drupal\Core\Config\Config
+   * @return $this
    *   The configuration object.
    */
   public function setModuleOverride(array $data) {
@@ -149,7 +149,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
+   * @return $this
    *   The configuration object.
    */
   protected function setOverriddenData() {
@@ -169,7 +169,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
+   * @return $this
    *   The configuration object.
    */
   protected function resetOverriddenData() {
@@ -235,7 +235,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 b58f963..5d56500 100644
--- a/core/lib/Drupal/Core/Config/ConfigImporter.php
+++ b/core/lib/Drupal/Core/Config/ConfigImporter.php
@@ -230,7 +230,7 @@ public function getStorageComparer() {
   /**
    * Resets the storage comparer and processed list.
    *
-   * @return \Drupal\Core\Config\ConfigImporter
+   * @return $this
    *   The ConfigImporter instance.
    */
   public function reset() {
@@ -449,7 +449,7 @@ protected function getUnprocessedExtensions($type) {
   /**
    * Imports the changelist to the target storage.
    *
-   * @return \Drupal\Core\Config\ConfigImporter
+   * @return $this
    *   The ConfigImporter instance.
    *
    * @throws \Drupal\Core\Config\ConfigException
diff --git a/core/lib/Drupal/Core/Config/PreExistingConfigException.php b/core/lib/Drupal/Core/Config/PreExistingConfigException.php
index 57f54b2..121b797 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 $this
    */
   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 803e092..ee61c51 100644
--- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -57,7 +57,7 @@ public function getChangelist($op = NULL, $collection = StorageInterface::DEFAUL
   /**
    * Recalculates the differences.
    *
-   * @return \Drupal\Core\Config\StorageComparerInterface
+   * @return $this
    *   An object which implements the StorageComparerInterface.
    */
   public function reset();
diff --git a/core/lib/Drupal/Core/Config/StorageInterface.php b/core/lib/Drupal/Core/Config/StorageInterface.php
index 18a7126..fe6857a 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 $this
    *   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 002e39e..0ea7087 100644
--- a/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/AlterableInterface.php
@@ -19,7 +19,7 @@
    * @param $tag
    *   The tag to add.
    *
-   * @return \Drupal\Core\Database\Query\AlterableInterface
+   * @return $this
    *   The called object.
    */
   public function addTag($tag);
@@ -72,7 +72,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
+   * @return $this
    *   The called object.
    */
   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 221f0e2..420d58a 100644
--- a/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ConditionInterface.php
@@ -58,7 +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
+   * @return $this
    *   The called object.
    *
    * @throws \Drupal\Core\Database\InvalidQueryException
@@ -83,7 +83,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
+   * @return $this
    *   The called object.
    */
   public function where($snippet, $args = []);
@@ -94,7 +94,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
+   * @return $this
    *   The called object.
    */
   public function isNull($field);
@@ -105,7 +105,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
+   * @return $this
    *   The called object.
    */
   public function isNotNull($field);
@@ -116,7 +116,7 @@ public function isNotNull($field);
    * @param \Drupal\Core\Database\Query\SelectInterface $select
    *   The subquery that must contain results.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
+   * @return $this
    *   The called object.
    */
   public function exists(SelectInterface $select);
@@ -127,7 +127,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
+   * @return $this
    *   The called object.
    */
   public function notExists(SelectInterface $select);
@@ -199,7 +199,7 @@ public function compiled();
    *   - AND (default): this is the equivalent of andConditionGroup().
    *   - OR: this is the equivalent of orConditionGroup().
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
+   * @return $this
    *   An object holding a group of conditions.
    */
   public function conditionGroupFactory($conjunction = 'AND');
@@ -207,14 +207,14 @@ public function conditionGroupFactory($conjunction = 'AND');
   /**
    * Creates a new group of conditions ANDed together.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
+   * @return $this
    */
   public function andConditionGroup();
 
   /**
    * Creates a new group of conditions ORed together.
    *
-   * @return \Drupal\Core\Database\Query\ConditionInterface
+   * @return $this
    */
   public function orConditionGroup();
 
diff --git a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
index d512bd6..a588e51 100644
--- a/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/ExtendableInterface.php
@@ -24,7 +24,7 @@
    *   driver-specific subclasses as well, using the same logic as the query
    *   objects themselves.
    *
-   * @return \Drupal\Core\Database\Query\ExtendableInterface
+   * @return $this
    *   The extender object, which now contains a reference to this object.
    */
   public function extend($extender_name);
diff --git a/core/lib/Drupal/Core/Database/Query/Insert.php b/core/lib/Drupal/Core/Database/Query/Insert.php
index 3af2d2a..011d442 100644
--- a/core/lib/Drupal/Core/Database/Query/Insert.php
+++ b/core/lib/Drupal/Core/Database/Query/Insert.php
@@ -44,7 +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
+   * @return $this
    *   The called object.
    */
   public function from(SelectInterface $query) {
diff --git a/core/lib/Drupal/Core/Database/Query/Merge.php b/core/lib/Drupal/Core/Database/Query/Merge.php
index 43188ec..4d40184 100644
--- a/core/lib/Drupal/Core/Database/Query/Merge.php
+++ b/core/lib/Drupal/Core/Database/Query/Merge.php
@@ -146,7 +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
+   * @return $this
    *   The called object.
    */
   protected function conditionTable($table) {
@@ -161,7 +161,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
+   * @return $this
    *   The called object.
    */
   public function updateFields(array $fields) {
@@ -186,7 +186,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
+   * @return $this
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
@@ -211,7 +211,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
+   * @return $this
    *   The called object.
    */
   public function insertFields(array $fields, array $values = []) {
@@ -238,7 +238,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
+   * @return $this
    *   The called object.
    */
   public function useDefaults(array $fields) {
@@ -264,7 +264,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
+   * @return $this
    *   The called object.
    */
   public function fields(array $fields, array $values = []) {
diff --git a/core/lib/Drupal/Core/Database/Query/Select.php b/core/lib/Drupal/Core/Database/Query/Select.php
index 61cb397..a15ff21 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 $this
    *   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 e42fcc6..a1b86bd 100644
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -169,7 +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
+   * @return $this
    *   The called object.
    */
   public function distinct($distinct = TRUE);
@@ -211,7 +211,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
+   * @return $this
    *   The called object.
    */
   public function fields($table_alias, array $fields = []);
@@ -411,7 +411,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
+   * @return $this
    *   The called object.
    */
   public function orderBy($field, $direction = 'ASC');
@@ -433,7 +433,7 @@ public function orderBy($field, $direction = 'ASC');
    *
    * for an example of such an alternate sorting mechanism.
    *
-   * @return \Drupal\Core\Database\Query\SelectInterface
+   * @return $this
    *   The called object
    */
   public function orderRandom();
@@ -449,7 +449,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
+   * @return $this
    *   The called object.
    */
   public function range($start = NULL, $length = NULL);
@@ -474,7 +474,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
+   * @return $this
    *   The called object.
    */
   public function union(SelectInterface $query, $type = '');
@@ -484,7 +484,7 @@ 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
+   * @return $this
    *   The called object.
    */
   public function groupBy($field);
@@ -492,7 +492,7 @@ public function groupBy($field);
   /**
    * Get the equivalent COUNT query of this query as a new query object.
    *
-   * @return \Drupal\Core\Database\Query\SelectInterface
+   * @return $this
    *   A new SelectQuery object with no fields or expressions besides COUNT(*).
    */
   public function countQuery();
diff --git a/core/lib/Drupal/Core/Database/Query/Update.php b/core/lib/Drupal/Core/Database/Query/Update.php
index ba0661c..5de5d68 100644
--- a/core/lib/Drupal/Core/Database/Query/Update.php
+++ b/core/lib/Drupal/Core/Database/Query/Update.php
@@ -75,7 +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
+   * @return $this
    *   The called object.
    */
   public function fields(array $fields) {
@@ -98,7 +98,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
+   * @return $this
    *   The called object.
    */
   public function expression($field, $expression, array $arguments = NULL) {
diff --git a/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php b/core/lib/Drupal/Core/Entity/EntityConstraintViolationListInterface.php
index 273a64f..d8d0344 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 $this
    *   A list of violations on the entity level.
    */
   public function getEntityViolations();
@@ -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 $this
    *   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 383f41e..c7480ed 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -24,7 +24,7 @@ public function getConjunction();
    * @param string $operator
    * @param string $langcode
    *
-   * @return \Drupal\Core\Entity\Query\ConditionAggregateInterface
+   * @return $this
    *   The called object.
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 3c94ba7..590c7d9 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -23,7 +23,7 @@
    * @param string $alias
    *   (optional) The key that will be used on the resultset.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
+   * @return $this
    *   The called object.
    */
   public function aggregate($field, $function, $langcode = NULL, &$alias = NULL);
@@ -34,7 +34,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
+   * @return $this
    *   The called object.
    */
   public function groupBy($field);
@@ -60,7 +60,7 @@ public function groupBy($field);
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
+   * @return $this
    *   The called object.
    *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
@@ -77,7 +77,7 @@ public function conditionAggregate($field, $function = NULL, $value = NULL, $ope
    * @param $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
+   * @return $this
    *   The called object.
    */
   public function existsAggregate($field, $function, $langcode = NULL);
@@ -92,7 +92,7 @@ public function existsAggregate($field, $function, $langcode = NULL);
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
+   * @return $this
    *   The called object.
    */
   public function notExistsAggregate($field, $function, $langcode = NULL);
@@ -124,7 +124,7 @@ public function conditionAggregateGroupFactory($conjunction = 'AND');
    * @param string $langcode
    *   (optional) The language code.
    *
-   * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
+   * @return $this
    *   The called object.
    */
   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 d4b0608..1d5ed5d 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,7 +132,7 @@ 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
+   * @return $this
    *   The called object.
    */
   public function pager($limit = 10, $element = NULL);
@@ -140,7 +140,7 @@ public function pager($limit = 10, $element = NULL);
   /**
    * @param null $start
    * @param null $length
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    *   The called object.
    */
   public function range($start = NULL, $length = NULL);
@@ -151,7 +151,7 @@ public function range($start = NULL, $length = NULL);
    * @param string $direction
    * @param $langcode
    *   Language code (optional).
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    *   The called object.
    */
   public function sort($field, $direction = 'ASC', $langcode = NULL);
@@ -161,7 +161,7 @@ public function sort($field, $direction = 'ASC', $langcode = NULL);
    *
    * For count queries, execute() returns the number entities found.
    *
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    *   The called object.
    */
   public function count();
@@ -175,13 +175,13 @@ 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
+   * @return $this
    *   The called object.
    */
   public function tableSort(&$headers);
 
   /**
-   * @return \Drupal\Core\Entity\Query\QueryInterface
+   * @return $this
    *   The called object.
    */
   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 50b81bb..e3eb24c 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Query.php
@@ -80,7 +80,7 @@ public function execute() {
   /**
    * Prepares the basic query with proper metadata/tags and base fields.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
+   * @return $this
    *   Returns the called object.
    *
    * @throws \Drupal\Core\Entity\Query\QueryException
@@ -156,7 +156,7 @@ protected function prepare() {
   /**
    * Compiles the conditions.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
+   * @return $this
    *   Returns the called object.
    */
   protected function compile() {
@@ -167,7 +167,7 @@ protected function compile() {
   /**
    * Adds the sort to the build query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
+   * @return $this
    *   Returns the called object.
    */
   protected function addSort() {
@@ -225,7 +225,7 @@ protected function addSort() {
   /**
    * Finish the query by adding fields, GROUP BY and range.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\Query
+   * @return $this
    *   Returns the called object.
    */
   protected function finish() {
diff --git a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
index c791bb5..9350571 100644
--- a/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/QueryAggregate.php
@@ -69,7 +69,7 @@ public function notExistsAggregate($field, $function, $langcode = NULL) {
   /**
    * Adds the aggregations to the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
+   * @return $this
    *   Returns the called object.
    */
   protected function addAggregate() {
@@ -85,7 +85,7 @@ protected function addAggregate() {
   /**
    * Builds the aggregation conditions part of the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
+   * @return $this
    *   Returns the called object.
    */
   protected function compileAggregate() {
@@ -96,7 +96,7 @@ protected function compileAggregate() {
   /**
    * Adds the groupby values to the actual query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
+   * @return $this
    *   Returns the called object.
    */
   protected function addGroupBy() {
@@ -114,7 +114,7 @@ protected function addGroupBy() {
   /**
    * Builds the aggregation sort part of the query.
    *
-   * @return \Drupal\Core\Entity\Query\Sql\QueryAggregate
+   * @return $this
    *   Returns the called object.
    */
   protected function addSortAggregate() {
diff --git a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
index 555e22a..efa71a3 100644
--- a/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
+++ b/core/lib/Drupal/Core/Field/Entity/BaseFieldOverride.php
@@ -57,7 +57,7 @@ class BaseFieldOverride extends FieldConfigBase {
    * @param string $bundle
    *   The bundle to which the override applies.
    *
-   * @return \Drupal\Core\Field\Entity\BaseFieldOverride
+   * @return $this
    *   A new base field override object.
    */
   public static function createFromBaseFieldDefinition(BaseFieldDefinition $base_field_definition, $bundle) {
diff --git a/core/lib/Drupal/Core/Form/EnforcedResponse.php b/core/lib/Drupal/Core/Form/EnforcedResponse.php
index 2b1466d..6e73cb5 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 $this|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 51867f4..0f6e218 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitInterface.php
@@ -52,7 +52,7 @@
    * @param string $source
    *   The source path of the image file.
    *
-   * @return \Drupal\Core\ImageToolkit\ImageToolkitInterface
+   * @return $this
    *   An instance of the current toolkit object.
    *
    * @throws \BadMethodCallException
diff --git a/core/lib/Drupal/Core/Language/LanguageManagerInterface.php b/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
index eaefd18..1de764c 100644
--- a/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
+++ b/core/lib/Drupal/Core/Language/LanguageManagerInterface.php
@@ -58,7 +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
+   * @return \$this
    *   The language manager that has been reset.
    */
   public function reset($type = NULL);
diff --git a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
index 7fb301e..31e0fd7 100644
--- a/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
+++ b/core/lib/Drupal/Core/Menu/LocalTaskInterface.php
@@ -70,7 +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
+   * @return $this
    *   The called object for chaining.
    */
   public function setActive($active = TRUE);
diff --git a/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php b/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
index 2f32609..127e45f 100644
--- a/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
+++ b/core/lib/Drupal/Core/Session/AccountSwitcherInterface.php
@@ -19,7 +19,7 @@
    * @param \Drupal\Core\Session\AccountInterface $account
    *   The account to switch to.
    *
-   * @return \Drupal\Core\Session\AccountSwitcherInterface
+   * @return $this
    *   $this.
    */
   public function switchTo(AccountInterface $account);
@@ -27,7 +27,7 @@ public function switchTo(AccountInterface $account);
   /**
    * Reverts to a previous account after switching.
    *
-   * @return \Drupal\Core\Session\AccountSwitcherInterface
+   * @return \$this
    *   $this.
    *
    * @throws \RuntimeException
diff --git a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
index 4600c17..2b37e32 100644
--- a/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
+++ b/core/lib/Drupal/Core/StringTranslation/PluralTranslatableMarkup.php
@@ -87,7 +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
+   * @return $this
    *   A PluralTranslatableMarkup object.
    */
   public static function createFromTranslatedString($count, $translated_string, array $args = [], array $options = []) {
diff --git a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
index 001c58b..9310832 100644
--- a/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
+++ b/core/lib/Drupal/Core/TypedData/ListDataDefinition.php
@@ -20,7 +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
+   * @return $this
    *   A new List Data Definition object.
    */
   public static function create($item_type) {
diff --git a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
index a6892d2..f6da49d 100644
--- a/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
+++ b/core/lib/Drupal/Core/TypedData/TypedDataInterface.php
@@ -97,7 +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
+   * @return $this
    *   Returns itself to allow for chaining.
    */
   public function applyDefaultValue($notify = TRUE);
diff --git a/core/lib/Drupal/Core/Updater/Updater.php b/core/lib/Drupal/Core/Updater/Updater.php
index a1ba103..d6d5169 100644
--- a/core/lib/Drupal/Core/Updater/Updater.php
+++ b/core/lib/Drupal/Core/Updater/Updater.php
@@ -55,7 +55,7 @@ public function __construct($source, $root) {
    *   new project. Usually this is the app root (the directory in which the
    *   Drupal site is installed).
    *
-   * @return \Drupal\Core\Updater\Updater
+   * @return $this
    *   A new Drupal\Core\Updater\Updater object.
    *
    * @throws \Drupal\Core\Updater\UpdaterException
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 76dc46c..3f48d03 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 $this
    *   A new Url object for a routed (internal to Drupal) URL.
    *
    * @see \Drupal\Core\Url::fromUserInput()
@@ -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 $this
    *   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 $this
    *   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 $this
    *   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 $this
    *   A new Url object for a 'route:' URI.
    *
    * @throws \InvalidArgumentException
diff --git a/core/modules/block_content/src/BlockContentInterface.php b/core/modules/block_content/src/BlockContentInterface.php
index 75fdc59..85b8da2 100644
--- a/core/modules/block_content/src/BlockContentInterface.php
+++ b/core/modules/block_content/src/BlockContentInterface.php
@@ -29,7 +29,7 @@ public function getRevisionLog();
    * @param string $info
    *   The block description.
    *
-   * @return \Drupal\block_content\BlockContentInterface
+   * @return $this
    *   The class instance that this method is called on.
    */
   public function setInfo($info);
@@ -40,7 +40,7 @@ public function setInfo($info);
    * @param string $revision_log
    *   The revision log message.
    *
-   * @return \Drupal\block_content\BlockContentInterface
+   * @return $this
    *   The class instance that this method is called on.
    *
    * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
@@ -58,7 +58,7 @@ public function setRevisionLog($revision_log);
    * @param string $theme
    *   The theme name.
    *
-   * @return \Drupal\block_content\BlockContentInterface
+   * @return $this
    *   The class instance that this method is called on.
    */
   public function setTheme($theme);
diff --git a/core/modules/comment/src/CommentInterface.php b/core/modules/comment/src/CommentInterface.php
index e80e5ed..e556496 100644
--- a/core/modules/comment/src/CommentInterface.php
+++ b/core/modules/comment/src/CommentInterface.php
@@ -48,7 +48,7 @@ public function hasParentComment();
   /**
    * Returns the parent comment entity if this is a reply to a comment.
    *
-   * @return \Drupal\comment\CommentInterface|null
+   * @return $this|null
    *   A comment entity of the parent comment or NULL if there is no parent.
    */
   public function getParentComment();
diff --git a/core/modules/image/src/ImageStyleInterface.php b/core/modules/image/src/ImageStyleInterface.php
index 7dec361..fba209b 100644
--- a/core/modules/image/src/ImageStyleInterface.php
+++ b/core/modules/image/src/ImageStyleInterface.php
@@ -37,7 +37,7 @@ public function getName();
    * @param string $name
    *   The name of the image style.
    *
-   * @return \Drupal\image\ImageStyleInterface
+   * @return $this
    *   The class instance this method is called on.
    */
   public function setName($name);
diff --git a/core/modules/locale/src/StringStorageInterface.php b/core/modules/locale/src/StringStorageInterface.php
index 18c5edc..51dd7d5 100644
--- a/core/modules/locale/src/StringStorageInterface.php
+++ b/core/modules/locale/src/StringStorageInterface.php
@@ -101,7 +101,7 @@ public function findTranslation(array $conditions);
    * @param \Drupal\locale\StringInterface $string
    *   The string object.
    *
-   * @return \Drupal\locale\StringStorageInterface
+   * @return $this
    *   The called object.
    *
    * @throws \Drupal\locale\StringStorageException
@@ -115,7 +115,7 @@ public function save($string);
    * @param \Drupal\locale\StringInterface $string
    *   The string object.
    *
-   * @return \Drupal\locale\StringStorageInterface
+   * @return $this
    *   The called object.
    *
    * @throws \Drupal\locale\StringStorageException
diff --git a/core/modules/locale/src/TranslationString.php b/core/modules/locale/src/TranslationString.php
index 63f4543..c32d23f 100644
--- a/core/modules/locale/src/TranslationString.php
+++ b/core/modules/locale/src/TranslationString.php
@@ -58,7 +58,7 @@ public function __construct($values = []) {
    * @param bool $customized
    *   (optional) Whether the string is customized or not. Defaults to TRUE.
    *
-   * @return \Drupal\locale\TranslationString
+   * @return $this
    *   The called object.
    */
   public function setCustomized($customized = TRUE) {
diff --git a/core/modules/node/src/NodeInterface.php b/core/modules/node/src/NodeInterface.php
index 87b6892..55f77c9 100644
--- a/core/modules/node/src/NodeInterface.php
+++ b/core/modules/node/src/NodeInterface.php
@@ -65,7 +65,7 @@ public function getTitle();
    * @param string $title
    *   The node title.
    *
-   * @return \Drupal\node\NodeInterface
+   * @return $this
    *   The called node entity.
    */
   public function setTitle($title);
@@ -84,7 +84,7 @@ public function getCreatedTime();
    * @param int $timestamp
    *   The node creation timestamp.
    *
-   * @return \Drupal\node\NodeInterface
+   * @return $this
    *   The called node entity.
    */
   public function setCreatedTime($timestamp);
@@ -103,7 +103,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
+   * @return $this
    *   The called node entity.
    */
   public function setPromoted($promoted);
@@ -122,7 +122,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
+   * @return $this
    *   The called node entity.
    */
   public function setSticky($sticky);
@@ -141,7 +141,7 @@ public function getRevisionCreationTime();
    * @param int $timestamp
    *   The UNIX timestamp of when this revision was created.
    *
-   * @return \Drupal\node\NodeInterface
+   * @return $this
    *   The called node entity.
    */
   public function setRevisionCreationTime($timestamp);
@@ -163,7 +163,7 @@ public function getRevisionAuthor();
    * @param int $uid
    *   The user ID of the revision author.
    *
-   * @return \Drupal\node\NodeInterface
+   * @return $this
    *   The called node entity.
    *
    * @deprecated in Drupal 8.2.0, will be removed before Drupal 9.0.0. Use
diff --git a/core/modules/search/src/Plugin/SearchInterface.php b/core/modules/search/src/Plugin/SearchInterface.php
index 8f95ce8..b1421ff 100644
--- a/core/modules/search/src/Plugin/SearchInterface.php
+++ b/core/modules/search/src/Plugin/SearchInterface.php
@@ -21,7 +21,7 @@
    * @param array $attributes
    *   Array of attributes, usually from the current request object.
    *
-   * @return \Drupal\search\Plugin\SearchInterface
+   * @return $this
    *   A search plugin object for chaining.
    */
   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 e434266..d095bfc 100644
--- a/core/modules/shortcut/src/ShortcutInterface.php
+++ b/core/modules/shortcut/src/ShortcutInterface.php
@@ -23,7 +23,7 @@ public function getTitle();
    * @param string $title
    *   The title of this shortcut.
    *
-   * @return \Drupal\shortcut\ShortcutInterface
+   * @return $this
    *   The called shortcut entity.
    */
   public function setTitle($title);
@@ -42,7 +42,7 @@ public function getWeight();
    * @param int $weight
    *   The shortcut weight.
    *
-   * @return \Drupal\shortcut\ShortcutInterface
+   * @return $this
    *   The called shortcut entity.
    */
   public function setWeight($weight);
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 308a807..7ad703e 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -114,7 +114,7 @@ public static function create(ContainerInterface $container, array $configuratio
    * @param resource $resource
    *   The GD image resource.
    *
-   * @return \Drupal\system\Plugin\ImageToolkit\GDToolkit
+   * @return $this
    *   An instance of the current toolkit object.
    */
   public function setResource($resource) {
diff --git a/core/modules/user/src/UserInterface.php b/core/modules/user/src/UserInterface.php
index 6919e0d..64cbc19 100644
--- a/core/modules/user/src/UserInterface.php
+++ b/core/modules/user/src/UserInterface.php
@@ -83,7 +83,7 @@ public function removeRole($rid);
    * @param string $username
    *   The new user name.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function setUsername($username);
@@ -102,7 +102,7 @@ public function getPassword();
    * @param string $password
    *   The new unhashed password.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function setPassword($password);
@@ -113,7 +113,7 @@ public function setPassword($password);
    * @param string $mail
    *   The new email address of the user.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function setEmail($mail);
@@ -132,7 +132,7 @@ public function getCreatedTime();
    * @param int $timestamp
    *   Timestamp of the last access.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function setLastAccessTime($timestamp);
@@ -151,7 +151,7 @@ public function getLastLoginTime();
    * @param int $timestamp
    *   Timestamp of the last login time.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function setLastLoginTime($timestamp);
@@ -175,7 +175,7 @@ public function isBlocked();
   /**
    * Activates the user.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function activate();
@@ -183,7 +183,7 @@ public function activate();
   /**
    * Blocks the user.
    *
-   * @return \Drupal\user\UserInterface
+   * @return $this
    *   The called user entity.
    */
   public function block();