diff --git a/src/Adapter/Adapter.php b/src/Adapter/Adapter.php
index a5fe3881..592269a7 100644
--- a/src/Adapter/Adapter.php
+++ b/src/Adapter/Adapter.php
@@ -93,7 +93,7 @@ public function __construct(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
diff --git a/src/Adapter/AdapterAwareTrait.php b/src/Adapter/AdapterAwareTrait.php
index 67d75bd9..6cf7e34b 100644
--- a/src/Adapter/AdapterAwareTrait.php
+++ b/src/Adapter/AdapterAwareTrait.php
@@ -10,7 +10,7 @@ trait AdapterAwareTrait
     /**
      * Set db adapter
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDbAdapter(Adapter $adapter)
     {
diff --git a/src/Adapter/Driver/AbstractConnection.php b/src/Adapter/Driver/AbstractConnection.php
index 915607f4..0911758c 100644
--- a/src/Adapter/Driver/AbstractConnection.php
+++ b/src/Adapter/Driver/AbstractConnection.php
@@ -95,7 +95,7 @@ public function inTransaction()
 
     /**
      * @param  array $connectionParameters
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setConnectionParameters(array $connectionParameters)
     {
@@ -107,7 +107,7 @@ public function setConnectionParameters(array $connectionParameters)
     /**
      * {@inheritDoc}
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(ProfilerInterface $profiler)
     {
diff --git a/src/Adapter/Driver/IbmDb2/Connection.php b/src/Adapter/Driver/IbmDb2/Connection.php
index dbbe3385..25de7352 100644
--- a/src/Adapter/Driver/IbmDb2/Connection.php
+++ b/src/Adapter/Driver/IbmDb2/Connection.php
@@ -57,7 +57,7 @@ public function __construct($connectionParameters = null)
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(IbmDb2 $driver)
     {
@@ -68,7 +68,7 @@ public function setDriver(IbmDb2 $driver)
 
     /**
      * @param  resource $resource DB2 resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource($resource)
     {
@@ -204,7 +204,7 @@ public function commit()
     /**
      * Rollback
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\RuntimeException
      */
     public function rollback()
diff --git a/src/Adapter/Driver/IbmDb2/IbmDb2.php b/src/Adapter/Driver/IbmDb2/IbmDb2.php
index b2dda391..91ab9f05 100644
--- a/src/Adapter/Driver/IbmDb2/IbmDb2.php
+++ b/src/Adapter/Driver/IbmDb2/IbmDb2.php
@@ -40,7 +40,7 @@ public function __construct($connection, ?Statement $statementPrototype = null,
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -63,7 +63,7 @@ public function getProfiler()
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
@@ -73,7 +73,7 @@ public function registerConnection(Connection $connection)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerStatementPrototype(Statement $statementPrototype)
     {
@@ -83,7 +83,7 @@ public function registerStatementPrototype(Statement $statementPrototype)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerResultPrototype(Result $resultPrototype)
     {
diff --git a/src/Adapter/Driver/IbmDb2/Result.php b/src/Adapter/Driver/IbmDb2/Result.php
index d36a1648..3f399a29 100644
--- a/src/Adapter/Driver/IbmDb2/Result.php
+++ b/src/Adapter/Driver/IbmDb2/Result.php
@@ -27,7 +27,7 @@ class Result implements ResultInterface
     /**
      * @param  resource $resource
      * @param  mixed $generatedValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize($resource, $generatedValue = null)
     {
diff --git a/src/Adapter/Driver/IbmDb2/Statement.php b/src/Adapter/Driver/IbmDb2/Statement.php
index dafeb8eb..fe408ccd 100644
--- a/src/Adapter/Driver/IbmDb2/Statement.php
+++ b/src/Adapter/Driver/IbmDb2/Statement.php
@@ -42,7 +42,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
 
     /**
      * @param resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize($resource)
     {
@@ -51,7 +51,7 @@ public function initialize($resource)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(IbmDb2 $driver)
     {
@@ -60,7 +60,7 @@ public function setDriver(IbmDb2 $driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -80,7 +80,7 @@ public function getProfiler()
      * Set sql
      *
      * @param null|string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -101,7 +101,7 @@ public function getSql()
     /**
      * Set parameter container
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
@@ -145,7 +145,7 @@ public function getResource()
      * Prepare sql
      *
      * @param string|null $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\RuntimeException
      */
     public function prepare($sql = null)
diff --git a/src/Adapter/Driver/Mysqli/Connection.php b/src/Adapter/Driver/Mysqli/Connection.php
index 1ad07ef2..4a35a0ac 100644
--- a/src/Adapter/Driver/Mysqli/Connection.php
+++ b/src/Adapter/Driver/Mysqli/Connection.php
@@ -44,7 +44,7 @@ public function __construct($connectionInfo = null)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Mysqli $driver)
     {
@@ -71,7 +71,7 @@ public function getCurrentSchema()
     /**
      * Set resource
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource(\mysqli $resource)
     {
diff --git a/src/Adapter/Driver/Mysqli/Mysqli.php b/src/Adapter/Driver/Mysqli/Mysqli.php
index 92a992d6..7cddb5db 100644
--- a/src/Adapter/Driver/Mysqli/Mysqli.php
+++ b/src/Adapter/Driver/Mysqli/Mysqli.php
@@ -55,7 +55,7 @@ public function __construct(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -80,7 +80,7 @@ public function getProfiler()
     /**
      * Register connection
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
diff --git a/src/Adapter/Driver/Mysqli/Result.php b/src/Adapter/Driver/Mysqli/Result.php
index 10a3ec09..3fcd6174 100644
--- a/src/Adapter/Driver/Mysqli/Result.php
+++ b/src/Adapter/Driver/Mysqli/Result.php
@@ -64,7 +64,7 @@ class Result implements
      * @param mixed $resource
      * @param mixed $generatedValue
      * @param bool|null $isBuffered
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function initialize($resource, $generatedValue, $isBuffered = null)
diff --git a/src/Adapter/Driver/Mysqli/Statement.php b/src/Adapter/Driver/Mysqli/Statement.php
index a2c17570..59ae62aa 100644
--- a/src/Adapter/Driver/Mysqli/Statement.php
+++ b/src/Adapter/Driver/Mysqli/Statement.php
@@ -57,7 +57,7 @@ public function __construct($bufferResults = false)
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Mysqli $driver)
     {
@@ -66,7 +66,7 @@ public function setDriver(Mysqli $driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -85,7 +85,7 @@ public function getProfiler()
     /**
      * Initialize
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize(\mysqli $mysqli)
     {
@@ -97,7 +97,7 @@ public function initialize(\mysqli $mysqli)
      * Set sql
      *
      * @param  string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -108,7 +108,7 @@ public function setSql($sql)
     /**
      * Set Parameter container
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
@@ -129,7 +129,7 @@ public function getResource()
     /**
      * Set resource
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource(mysqli_stmt $mysqliStatement)
     {
@@ -172,7 +172,7 @@ public function isPrepared()
      * Prepare
      *
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidQueryException
      * @throws Exception\RuntimeException
      */
diff --git a/src/Adapter/Driver/Oci8/Connection.php b/src/Adapter/Driver/Oci8/Connection.php
index 6b1f7459..6c039c0d 100644
--- a/src/Adapter/Driver/Oci8/Connection.php
+++ b/src/Adapter/Driver/Oci8/Connection.php
@@ -35,7 +35,7 @@ public function __construct($connectionInfo = null)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Oci8 $driver)
     {
@@ -65,7 +65,7 @@ public function getCurrentSchema()
      * Set resource
      *
      * @param  resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource($resource)
     {
diff --git a/src/Adapter/Driver/Oci8/Oci8.php b/src/Adapter/Driver/Oci8/Oci8.php
index 93369af4..cf2d10fd 100644
--- a/src/Adapter/Driver/Oci8/Oci8.php
+++ b/src/Adapter/Driver/Oci8/Oci8.php
@@ -69,7 +69,7 @@ public function __construct(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -94,7 +94,7 @@ public function getProfiler()
     /**
      * Register connection
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
@@ -106,7 +106,7 @@ public function registerConnection(Connection $connection)
     /**
      * Register statement prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerStatementPrototype(Statement $statementPrototype)
     {
@@ -126,7 +126,7 @@ public function getStatementPrototype()
     /**
      * Register result prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerResultPrototype(Result $resultPrototype)
     {
@@ -147,7 +147,7 @@ public function getResultPrototype()
      *
      * @param string $name
      * @param AbstractFeature $feature
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeature($name, $feature)
     {
@@ -162,7 +162,7 @@ public function addFeature($name, $feature)
     /**
      * Setup the default features for Pdo
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setupDefaultFeatures()
     {
diff --git a/src/Adapter/Driver/Oci8/Result.php b/src/Adapter/Driver/Oci8/Result.php
index 0ab993bb..9ca5c4c4 100644
--- a/src/Adapter/Driver/Oci8/Result.php
+++ b/src/Adapter/Driver/Oci8/Result.php
@@ -58,7 +58,7 @@ class Result implements Iterator, ResultInterface
      * @param resource $resource
      * @param null|int $generatedValue
      * @param null|int $rowCount
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize($resource, $generatedValue = null, $rowCount = null)
     {
diff --git a/src/Adapter/Driver/Oci8/Statement.php b/src/Adapter/Driver/Oci8/Statement.php
index 5f27d2c0..3519bc9c 100644
--- a/src/Adapter/Driver/Oci8/Statement.php
+++ b/src/Adapter/Driver/Oci8/Statement.php
@@ -49,7 +49,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
      * Set driver
      *
      * @param  Oci8 $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver($driver)
     {
@@ -58,7 +58,7 @@ public function setDriver($driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -78,7 +78,7 @@ public function getProfiler()
      * Initialize
      *
      * @param  resource $oci8
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize($oci8)
     {
@@ -90,7 +90,7 @@ public function initialize($oci8)
      * Set sql
      *
      * @param  string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -101,7 +101,7 @@ public function setSql($sql)
     /**
      * Set Parameter container
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
@@ -123,7 +123,7 @@ public function getResource()
      * Set resource
      *
      * @param  resource $oci8Statement
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource($oci8Statement)
     {
@@ -167,7 +167,7 @@ public function isPrepared()
 
     /**
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function prepare($sql = null)
     {
diff --git a/src/Adapter/Driver/Pdo/Connection.php b/src/Adapter/Driver/Pdo/Connection.php
index e4366df4..47299cc5 100644
--- a/src/Adapter/Driver/Pdo/Connection.php
+++ b/src/Adapter/Driver/Pdo/Connection.php
@@ -50,7 +50,7 @@ public function __construct($connectionParameters = null)
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Pdo $driver)
     {
@@ -135,7 +135,7 @@ public function getCurrentSchema()
     /**
      * Set resource
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource(\PDO $resource)
     {
diff --git a/src/Adapter/Driver/Pdo/Pdo.php b/src/Adapter/Driver/Pdo/Pdo.php
index 1fd219be..ea3589d7 100644
--- a/src/Adapter/Driver/Pdo/Pdo.php
+++ b/src/Adapter/Driver/Pdo/Pdo.php
@@ -66,7 +66,7 @@ public function __construct(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -91,7 +91,7 @@ public function getProfiler()
     /**
      * Register connection
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
@@ -122,7 +122,7 @@ public function registerResultPrototype(Result $resultPrototype)
      *
      * @param string $name
      * @param AbstractFeature $feature
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeature($name, $feature)
     {
@@ -137,7 +137,7 @@ public function addFeature($name, $feature)
     /**
      * Setup the default features for Pdo
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setupDefaultFeatures()
     {
diff --git a/src/Adapter/Driver/Pdo/Result.php b/src/Adapter/Driver/Pdo/Result.php
index 7a810d43..be729cda 100644
--- a/src/Adapter/Driver/Pdo/Result.php
+++ b/src/Adapter/Driver/Pdo/Result.php
@@ -88,7 +88,7 @@ class Result implements Iterator, ResultInterface
      *
      * @param  mixed        $generatedValue
      * @param  int          $rowCount
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize(PDOStatement $resource, $generatedValue, $rowCount = null)
     {
diff --git a/src/Adapter/Driver/Pdo/Statement.php b/src/Adapter/Driver/Pdo/Statement.php
index 94b3345d..4606de40 100644
--- a/src/Adapter/Driver/Pdo/Statement.php
+++ b/src/Adapter/Driver/Pdo/Statement.php
@@ -46,7 +46,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Pdo $driver)
     {
@@ -55,7 +55,7 @@ public function setDriver(Pdo $driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -74,7 +74,7 @@ public function getProfiler()
     /**
      * Initialize
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize(\PDO $connectionResource)
     {
@@ -85,7 +85,7 @@ public function initialize(\PDO $connectionResource)
     /**
      * Set resource
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource(PDOStatement $pdoStatement)
     {
@@ -107,7 +107,7 @@ public function getResource()
      * Set sql
      *
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -126,7 +126,7 @@ public function getSql()
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
diff --git a/src/Adapter/Driver/Pgsql/Connection.php b/src/Adapter/Driver/Pgsql/Connection.php
index 2a966e18..49c80da8 100644
--- a/src/Adapter/Driver/Pgsql/Connection.php
+++ b/src/Adapter/Driver/Pgsql/Connection.php
@@ -55,7 +55,7 @@ public function __construct($connectionInfo = null)
      * Set resource
      *
      * @param resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource($resource)
     {
@@ -67,7 +67,7 @@ public function setResource($resource)
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Pgsql $driver)
     {
@@ -78,7 +78,7 @@ public function setDriver(Pgsql $driver)
 
     /**
      * @param int|null $type
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setType($type)
     {
diff --git a/src/Adapter/Driver/Pgsql/Pgsql.php b/src/Adapter/Driver/Pgsql/Pgsql.php
index 844561e6..dd1f8af9 100644
--- a/src/Adapter/Driver/Pgsql/Pgsql.php
+++ b/src/Adapter/Driver/Pgsql/Pgsql.php
@@ -50,7 +50,7 @@ public function __construct(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -75,7 +75,7 @@ public function getProfiler()
     /**
      * Register connection
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
@@ -87,7 +87,7 @@ public function registerConnection(Connection $connection)
     /**
      * Register statement prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerStatementPrototype(Statement $statement)
     {
@@ -99,7 +99,7 @@ public function registerStatementPrototype(Statement $statement)
     /**
      * Register result prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerResultPrototype(Result $result)
     {
diff --git a/src/Adapter/Driver/Pgsql/Statement.php b/src/Adapter/Driver/Pgsql/Statement.php
index debc2fa7..5303733c 100644
--- a/src/Adapter/Driver/Pgsql/Statement.php
+++ b/src/Adapter/Driver/Pgsql/Statement.php
@@ -44,7 +44,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
     protected $parameterContainer;
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Pgsql $driver)
     {
@@ -53,7 +53,7 @@ public function setDriver(Pgsql $driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -109,7 +109,7 @@ public function getResource()
      * Set sql
      *
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -130,7 +130,7 @@ public function getSql()
     /**
      * Set parameter container
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
diff --git a/src/Adapter/Driver/Sqlsrv/Connection.php b/src/Adapter/Driver/Sqlsrv/Connection.php
index 46089851..c24cdde8 100644
--- a/src/Adapter/Driver/Sqlsrv/Connection.php
+++ b/src/Adapter/Driver/Sqlsrv/Connection.php
@@ -46,7 +46,7 @@ public function __construct($connectionInfo)
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Sqlsrv $driver)
     {
@@ -74,7 +74,7 @@ public function getCurrentSchema()
      * Set resource
      *
      * @param  resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setResource($resource)
diff --git a/src/Adapter/Driver/Sqlsrv/Result.php b/src/Adapter/Driver/Sqlsrv/Result.php
index 1ed1b290..5eaafb8c 100644
--- a/src/Adapter/Driver/Sqlsrv/Result.php
+++ b/src/Adapter/Driver/Sqlsrv/Result.php
@@ -39,7 +39,7 @@ class Result implements Iterator, ResultInterface
      *
      * @param  resource $resource
      * @param  mixed    $generatedValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function initialize($resource, $generatedValue = null)
     {
diff --git a/src/Adapter/Driver/Sqlsrv/Sqlsrv.php b/src/Adapter/Driver/Sqlsrv/Sqlsrv.php
index 95b11e9f..a4577532 100644
--- a/src/Adapter/Driver/Sqlsrv/Sqlsrv.php
+++ b/src/Adapter/Driver/Sqlsrv/Sqlsrv.php
@@ -39,7 +39,7 @@ public function __construct($connection, ?Statement $statementPrototype = null,
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -64,7 +64,7 @@ public function getProfiler()
     /**
      * Register connection
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerConnection(Connection $connection)
     {
@@ -76,7 +76,7 @@ public function registerConnection(Connection $connection)
     /**
      * Register statement prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerStatementPrototype(Statement $statementPrototype)
     {
@@ -88,7 +88,7 @@ public function registerStatementPrototype(Statement $statementPrototype)
     /**
      * Register result prototype
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function registerResultPrototype(Result $resultPrototype)
     {
diff --git a/src/Adapter/Driver/Sqlsrv/Statement.php b/src/Adapter/Driver/Sqlsrv/Statement.php
index 9cfd28e8..6511cd09 100644
--- a/src/Adapter/Driver/Sqlsrv/Statement.php
+++ b/src/Adapter/Driver/Sqlsrv/Statement.php
@@ -57,7 +57,7 @@ class Statement implements StatementInterface, Profiler\ProfilerAwareInterface
     /**
      * Set driver
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDriver(Sqlsrv $driver)
     {
@@ -66,7 +66,7 @@ public function setDriver(Sqlsrv $driver)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setProfiler(Profiler\ProfilerInterface $profiler)
     {
@@ -89,7 +89,7 @@ public function getProfiler()
      * (there will need to already be a bound param set if it applies to this query)
      *
      * @param resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function initialize($resource)
@@ -111,7 +111,7 @@ public function initialize($resource)
     /**
      * Set parameter container
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
@@ -129,7 +129,7 @@ public function getParameterContainer()
 
     /**
      * @param resource $resource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setResource($resource)
     {
@@ -149,7 +149,7 @@ public function getResource()
 
     /**
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -170,7 +170,7 @@ public function getSql()
     /**
      * @param string $sql
      * @param array $options
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\RuntimeException
      */
     public function prepare($sql = null, array $options = [])
diff --git a/src/Adapter/ParameterContainer.php b/src/Adapter/ParameterContainer.php
index f3a77268..3a8e3e06 100644
--- a/src/Adapter/ParameterContainer.php
+++ b/src/Adapter/ParameterContainer.php
@@ -179,7 +179,7 @@ public function offsetSet($name, $value, $errata = null, $maxLength = null)
      * Offset unset
      *
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     #[ReturnTypeWillChange]
     public function offsetUnset($name)
@@ -195,7 +195,7 @@ public function offsetUnset($name)
      * Set from array
      *
      * @param  array $data
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setFromArray(array $data)
     {
@@ -437,7 +437,7 @@ public function rewind()
 
     /**
      * @param array|ParameterContainer $parameters
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function merge($parameters)
diff --git a/src/Adapter/Platform/Mysql.php b/src/Adapter/Platform/Mysql.php
index 8aadbc7f..6b0bd547 100644
--- a/src/Adapter/Platform/Mysql.php
+++ b/src/Adapter/Platform/Mysql.php
@@ -45,7 +45,7 @@ public function __construct($driver = null)
 
     /**
      * @param \Laminas\Db\Adapter\Driver\Mysqli\Mysqli|\Laminas\Db\Adapter\Driver\Pdo\Pdo|\mysqli|\PDO $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws InvalidArgumentException
      */
     public function setDriver($driver)
diff --git a/src/Adapter/Platform/Oracle.php b/src/Adapter/Platform/Oracle.php
index fe35ad33..38d302c3 100644
--- a/src/Adapter/Platform/Oracle.php
+++ b/src/Adapter/Platform/Oracle.php
@@ -39,7 +39,7 @@ public function __construct($options = [], $driver = null)
 
     /**
      * @param Pdo|Oci8 $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws InvalidArgumentException
      */
     public function setDriver($driver)
diff --git a/src/Adapter/Platform/Postgresql.php b/src/Adapter/Platform/Postgresql.php
index 4f79b4bc..1bfa8cd3 100644
--- a/src/Adapter/Platform/Postgresql.php
+++ b/src/Adapter/Platform/Postgresql.php
@@ -45,7 +45,7 @@ public function __construct($driver = null)
 
     /**
      * @param Pgsql\Pgsql|Pdo\Pdo|resource|\PDO $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setDriver($driver)
diff --git a/src/Adapter/Platform/SqlServer.php b/src/Adapter/Platform/SqlServer.php
index 0dba0aeb..d6ec6a60 100644
--- a/src/Adapter/Platform/SqlServer.php
+++ b/src/Adapter/Platform/SqlServer.php
@@ -41,7 +41,7 @@ public function __construct($driver = null)
 
     /**
      * @param Sqlsrv|\Laminas\Db\Adapter\Driver\Pdo\Pdo|resource|\PDO $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws InvalidArgumentException
      */
     public function setDriver($driver)
diff --git a/src/Adapter/Platform/Sqlite.php b/src/Adapter/Platform/Sqlite.php
index 9bd2c09f..31e74c04 100644
--- a/src/Adapter/Platform/Sqlite.php
+++ b/src/Adapter/Platform/Sqlite.php
@@ -29,7 +29,7 @@ public function __construct($driver = null)
 
     /**
      * @param Pdo\Pdo|\PDO $driver
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setDriver($driver)
diff --git a/src/Adapter/Profiler/Profiler.php b/src/Adapter/Profiler/Profiler.php
index be1c1d16..f19dc1b0 100644
--- a/src/Adapter/Profiler/Profiler.php
+++ b/src/Adapter/Profiler/Profiler.php
@@ -20,7 +20,7 @@ class Profiler implements ProfilerInterface
 
     /**
      * @param string|StatementContainerInterface $target
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws InvalidArgumentException
      */
     public function profilerStart($target)
@@ -49,7 +49,7 @@ public function profilerStart($target)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function profilerFinish()
     {
diff --git a/src/Adapter/StatementContainer.php b/src/Adapter/StatementContainer.php
index deec33a0..6a57e629 100644
--- a/src/Adapter/StatementContainer.php
+++ b/src/Adapter/StatementContainer.php
@@ -23,7 +23,7 @@ public function __construct($sql = null, ?ParameterContainer $parameterContainer
 
     /**
      * @param string $sql
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSql($sql)
     {
@@ -40,7 +40,7 @@ public function getSql()
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setParameterContainer(ParameterContainer $parameterContainer)
     {
diff --git a/src/Metadata/Object/ColumnObject.php b/src/Metadata/Object/ColumnObject.php
index 0f7db5c1..8632e83e 100644
--- a/src/Metadata/Object/ColumnObject.php
+++ b/src/Metadata/Object/ColumnObject.php
@@ -93,7 +93,7 @@ public function getTableName()
      * Set table name
      *
      * @param string $tableName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTableName($tableName)
     {
@@ -131,7 +131,7 @@ public function getOrdinalPosition()
 
     /**
      * @param int $ordinalPosition to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOrdinalPosition($ordinalPosition)
     {
@@ -149,7 +149,7 @@ public function getColumnDefault()
 
     /**
      * @param mixed $columnDefault to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setColumnDefault($columnDefault)
     {
@@ -167,7 +167,7 @@ public function getIsNullable()
 
     /**
      * @param bool $isNullable to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIsNullable($isNullable)
     {
@@ -193,7 +193,7 @@ public function getDataType()
 
     /**
      * @param string $dataType the $dataType to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDataType($dataType)
     {
@@ -211,7 +211,7 @@ public function getCharacterMaximumLength()
 
     /**
      * @param int $characterMaximumLength the $characterMaximumLength to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setCharacterMaximumLength($characterMaximumLength)
     {
@@ -229,7 +229,7 @@ public function getCharacterOctetLength()
 
     /**
      * @param int $characterOctetLength the $characterOctetLength to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setCharacterOctetLength($characterOctetLength)
     {
@@ -247,7 +247,7 @@ public function getNumericPrecision()
 
     /**
      * @param int $numericPrecision the $numericPrevision to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setNumericPrecision($numericPrecision)
     {
@@ -265,7 +265,7 @@ public function getNumericScale()
 
     /**
      * @param int $numericScale the $numericScale to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setNumericScale($numericScale)
     {
@@ -283,7 +283,7 @@ public function getNumericUnsigned()
 
     /**
      * @param  bool $numericUnsigned
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setNumericUnsigned($numericUnsigned)
     {
@@ -309,7 +309,7 @@ public function getErratas()
 
     /**
      * @param array $erratas
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setErratas(array $erratas)
     {
@@ -335,7 +335,7 @@ public function getErrata($errataName)
     /**
      * @param string $errataName
      * @param mixed $errataValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setErrata($errataName, $errataValue)
     {
diff --git a/src/Metadata/Object/ConstraintKeyObject.php b/src/Metadata/Object/ConstraintKeyObject.php
index 49a33d17..a8fe9f8b 100644
--- a/src/Metadata/Object/ConstraintKeyObject.php
+++ b/src/Metadata/Object/ConstraintKeyObject.php
@@ -58,7 +58,7 @@ public function getColumnName()
      * Set column name
      *
      * @param  string $columnName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setColumnName($columnName)
     {
@@ -80,7 +80,7 @@ public function getOrdinalPosition()
      * Set ordinal position
      *
      * @param  int $ordinalPosition
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOrdinalPosition($ordinalPosition)
     {
@@ -102,7 +102,7 @@ public function getPositionInUniqueConstraint()
      * Set position in unique constraint
      *
      * @param  bool $positionInUniqueConstraint
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setPositionInUniqueConstraint($positionInUniqueConstraint)
     {
@@ -124,7 +124,7 @@ public function getReferencedTableSchema()
      * Set referenced table schema
      *
      * @param string $referencedTableSchema
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedTableSchema($referencedTableSchema)
     {
@@ -146,7 +146,7 @@ public function getReferencedTableName()
      * Set Referenced table name
      *
      * @param  string $referencedTableName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedTableName($referencedTableName)
     {
@@ -168,7 +168,7 @@ public function getReferencedColumnName()
      * Set referenced column name
      *
      * @param  string $referencedColumnName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedColumnName($referencedColumnName)
     {
diff --git a/src/Metadata/Object/ConstraintObject.php b/src/Metadata/Object/ConstraintObject.php
index 4c7fb988..ba019e28 100644
--- a/src/Metadata/Object/ConstraintObject.php
+++ b/src/Metadata/Object/ConstraintObject.php
@@ -112,7 +112,7 @@ public function getTableName()
      * Set table name
      *
      * @param  string $tableName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTableName($tableName)
     {
@@ -160,7 +160,7 @@ public function getColumns()
      * Set Columns.
      *
      * @param string[] $columns
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setColumns(array $columns)
     {
@@ -182,7 +182,7 @@ public function getReferencedTableSchema()
      * Set Referenced Table Schema.
      *
      * @param string $referencedTableSchema
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedTableSchema($referencedTableSchema)
     {
@@ -204,7 +204,7 @@ public function getReferencedTableName()
      * Set Referenced Table Name.
      *
      * @param string $referencedTableName
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedTableName($referencedTableName)
     {
@@ -226,7 +226,7 @@ public function getReferencedColumns()
      * Set Referenced Columns.
      *
      * @param string[] $referencedColumns
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferencedColumns(array $referencedColumns)
     {
@@ -248,7 +248,7 @@ public function getMatchOption()
      * Set Match Option.
      *
      * @param string $matchOption
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setMatchOption($matchOption)
     {
@@ -270,7 +270,7 @@ public function getUpdateRule()
      * Set Update Rule.
      *
      * @param string $updateRule
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setUpdateRule($updateRule)
     {
@@ -292,7 +292,7 @@ public function getDeleteRule()
      * Set Delete Rule.
      *
      * @param string $deleteRule
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDeleteRule($deleteRule)
     {
@@ -314,7 +314,7 @@ public function getCheckClause()
      * Set Check Clause.
      *
      * @param string $checkClause
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setCheckClause($checkClause)
     {
diff --git a/src/Metadata/Object/TriggerObject.php b/src/Metadata/Object/TriggerObject.php
index f33ef980..6a59e471 100644
--- a/src/Metadata/Object/TriggerObject.php
+++ b/src/Metadata/Object/TriggerObject.php
@@ -65,7 +65,7 @@ public function getName()
      * Set Name.
      *
      * @param string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setName($name)
     {
@@ -87,7 +87,7 @@ public function getEventManipulation()
      * Set Event Manipulation.
      *
      * @param string $eventManipulation
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setEventManipulation($eventManipulation)
     {
@@ -109,7 +109,7 @@ public function getEventObjectCatalog()
      * Set Event Object Catalog.
      *
      * @param string $eventObjectCatalog
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setEventObjectCatalog($eventObjectCatalog)
     {
@@ -131,7 +131,7 @@ public function getEventObjectSchema()
      * Set Event Object Schema.
      *
      * @param string $eventObjectSchema
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setEventObjectSchema($eventObjectSchema)
     {
@@ -153,7 +153,7 @@ public function getEventObjectTable()
      * Set Event Object Table.
      *
      * @param string $eventObjectTable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setEventObjectTable($eventObjectTable)
     {
@@ -175,7 +175,7 @@ public function getActionOrder()
      * Set Action Order.
      *
      * @param string $actionOrder
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionOrder($actionOrder)
     {
@@ -197,7 +197,7 @@ public function getActionCondition()
      * Set Action Condition.
      *
      * @param string $actionCondition
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionCondition($actionCondition)
     {
@@ -219,7 +219,7 @@ public function getActionStatement()
      * Set Action Statement.
      *
      * @param string $actionStatement
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionStatement($actionStatement)
     {
@@ -241,7 +241,7 @@ public function getActionOrientation()
      * Set Action Orientation.
      *
      * @param string $actionOrientation
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionOrientation($actionOrientation)
     {
@@ -263,7 +263,7 @@ public function getActionTiming()
      * Set Action Timing.
      *
      * @param string $actionTiming
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionTiming($actionTiming)
     {
@@ -285,7 +285,7 @@ public function getActionReferenceOldTable()
      * Set Action Reference Old Table.
      *
      * @param string $actionReferenceOldTable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionReferenceOldTable($actionReferenceOldTable)
     {
@@ -307,7 +307,7 @@ public function getActionReferenceNewTable()
      * Set Action Reference New Table.
      *
      * @param string $actionReferenceNewTable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionReferenceNewTable($actionReferenceNewTable)
     {
@@ -329,7 +329,7 @@ public function getActionReferenceOldRow()
      * Set Action Reference Old Row.
      *
      * @param string $actionReferenceOldRow
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionReferenceOldRow($actionReferenceOldRow)
     {
@@ -351,7 +351,7 @@ public function getActionReferenceNewRow()
      * Set Action Reference New Row.
      *
      * @param string $actionReferenceNewRow
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setActionReferenceNewRow($actionReferenceNewRow)
     {
@@ -373,7 +373,7 @@ public function getCreated()
      * Set Created.
      *
      * @param DateTime $created
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setCreated($created)
     {
diff --git a/src/Metadata/Object/ViewObject.php b/src/Metadata/Object/ViewObject.php
index f2db979c..5f2a598c 100644
--- a/src/Metadata/Object/ViewObject.php
+++ b/src/Metadata/Object/ViewObject.php
@@ -23,7 +23,7 @@ public function getViewDefinition()
 
     /**
      * @param string $viewDefinition to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setViewDefinition($viewDefinition)
     {
@@ -41,7 +41,7 @@ public function getCheckOption()
 
     /**
      * @param string $checkOption to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setCheckOption($checkOption)
     {
@@ -59,7 +59,7 @@ public function getIsUpdatable()
 
     /**
      * @param bool $isUpdatable to set
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIsUpdatable($isUpdatable)
     {
diff --git a/src/ResultSet/AbstractResultSet.php b/src/ResultSet/AbstractResultSet.php
index 531a54e3..34cb4b5d 100644
--- a/src/ResultSet/AbstractResultSet.php
+++ b/src/ResultSet/AbstractResultSet.php
@@ -48,7 +48,7 @@ abstract class AbstractResultSet implements Iterator, ResultSetInterface
      * Set the data source for the result set
      *
      * @param  array|Iterator|IteratorAggregate|ResultInterface $dataSource
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function initialize($dataSource)
@@ -91,7 +91,7 @@ public function initialize($dataSource)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\RuntimeException
      */
     public function buffer()
diff --git a/src/ResultSet/HydratingResultSet.php b/src/ResultSet/HydratingResultSet.php
index e7446410..e99b7295 100644
--- a/src/ResultSet/HydratingResultSet.php
+++ b/src/ResultSet/HydratingResultSet.php
@@ -38,7 +38,7 @@ public function __construct(?HydratorInterface $hydrator = null, $objectPrototyp
      * Set the row object prototype
      *
      * @param  object $objectPrototype
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setObjectPrototype($objectPrototype)
@@ -65,7 +65,7 @@ public function getObjectPrototype()
     /**
      * Set the hydrator to use for each row object
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setHydrator(HydratorInterface $hydrator)
     {
diff --git a/src/ResultSet/ResultSet.php b/src/ResultSet/ResultSet.php
index 0574f294..1ed8ae6b 100644
--- a/src/ResultSet/ResultSet.php
+++ b/src/ResultSet/ResultSet.php
@@ -56,7 +56,7 @@ public function __construct($returnType = self::TYPE_ARRAYOBJECT, $arrayObjectPr
      * Set the row object prototype
      *
      * @param  ArrayObject $arrayObjectPrototype
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setArrayObjectPrototype($arrayObjectPrototype)
diff --git a/src/RowGateway/AbstractRowGateway.php b/src/RowGateway/AbstractRowGateway.php
index 277afddd..32cec882 100644
--- a/src/RowGateway/AbstractRowGateway.php
+++ b/src/RowGateway/AbstractRowGateway.php
@@ -76,7 +76,7 @@ public function initialize()
      *
      * @param  array $rowData
      * @param  bool  $rowExistsInDatabase
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function populate(array $rowData, $rowExistsInDatabase = false)
     {
@@ -238,7 +238,7 @@ public function offsetGet($offset)
      *
      * @param  string $offset
      * @param  mixed $value
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     #[ReturnTypeWillChange]
     public function offsetSet($offset, $value)
@@ -251,7 +251,7 @@ public function offsetSet($offset, $value)
      * Offset unset
      *
      * @param  string $offset
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     #[ReturnTypeWillChange]
     public function offsetUnset($offset)
diff --git a/src/RowGateway/Feature/FeatureSet.php b/src/RowGateway/Feature/FeatureSet.php
index 9721fd5e..bd3eebe2 100644
--- a/src/RowGateway/Feature/FeatureSet.php
+++ b/src/RowGateway/Feature/FeatureSet.php
@@ -31,7 +31,7 @@ public function __construct(array $features = [])
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setRowGateway(AbstractRowGateway $rowGateway)
     {
@@ -60,7 +60,7 @@ public function getFeatureByClassName($featureClassName)
 
     /**
      * @param array $features
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeatures(array $features)
     {
@@ -71,7 +71,7 @@ public function addFeatures(array $features)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeature(AbstractFeature $feature)
     {
diff --git a/src/Sql/Combine.php b/src/Sql/Combine.php
index a30b5def..22c2625a 100644
--- a/src/Sql/Combine.php
+++ b/src/Sql/Combine.php
@@ -53,7 +53,7 @@ public function __construct($select = null, $type = self::COMBINE_UNION, $modifi
      * @param Select|array $select
      * @param string $type
      * @param string $modifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function combine($select, $type = self::COMBINE_UNION, $modifier = '')
@@ -93,7 +93,7 @@ public function combine($select, $type = self::COMBINE_UNION, $modifier = '')
      *
      * @param Select|array $select
      * @param string       $modifier
-     * @return self
+     * @return $this
      */
     public function union($select, $modifier = '')
     {
@@ -105,7 +105,7 @@ public function union($select, $modifier = '')
      *
      * @param Select|array $select
      * @param string       $modifier
-     * @return self
+     * @return $this
      */
     public function except($select, $modifier = '')
     {
@@ -117,7 +117,7 @@ public function except($select, $modifier = '')
      *
      * @param Select|array $select
      * @param string $modifier
-     * @return self
+     * @return $this
      */
     public function intersect($select, $modifier = '')
     {
@@ -154,7 +154,7 @@ protected function buildSqlString(
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function alignColumns()
     {
diff --git a/src/Sql/Ddl/AlterTable.php b/src/Sql/Ddl/AlterTable.php
index 8467c27a..3a784406 100644
--- a/src/Sql/Ddl/AlterTable.php
+++ b/src/Sql/Ddl/AlterTable.php
@@ -79,7 +79,7 @@ public function __construct($table = '')
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTable($name)
     {
@@ -89,7 +89,7 @@ public function setTable($name)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addColumn(Column\ColumnInterface $column)
     {
@@ -100,7 +100,7 @@ public function addColumn(Column\ColumnInterface $column)
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function changeColumn($name, Column\ColumnInterface $column)
     {
@@ -111,7 +111,7 @@ public function changeColumn($name, Column\ColumnInterface $column)
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function dropColumn($name)
     {
@@ -122,7 +122,7 @@ public function dropColumn($name)
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function dropConstraint($name)
     {
@@ -132,7 +132,7 @@ public function dropConstraint($name)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addConstraint(Constraint\ConstraintInterface $constraint)
     {
diff --git a/src/Sql/Ddl/Column/AbstractLengthColumn.php b/src/Sql/Ddl/Column/AbstractLengthColumn.php
index c4491e80..67c7e348 100644
--- a/src/Sql/Ddl/Column/AbstractLengthColumn.php
+++ b/src/Sql/Ddl/Column/AbstractLengthColumn.php
@@ -21,7 +21,7 @@ public function __construct($name, $length = null, $nullable = false, $default =
 
     /**
      * @param  int $length
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setLength($length)
     {
diff --git a/src/Sql/Ddl/Column/AbstractPrecisionColumn.php b/src/Sql/Ddl/Column/AbstractPrecisionColumn.php
index 313b08d9..c2a3137e 100644
--- a/src/Sql/Ddl/Column/AbstractPrecisionColumn.php
+++ b/src/Sql/Ddl/Column/AbstractPrecisionColumn.php
@@ -28,7 +28,7 @@ public function __construct(
 
     /**
      * @param  int $digits
-     * @return self
+     * @return $this
      */
     public function setDigits($digits)
     {
@@ -45,7 +45,7 @@ public function getDigits()
 
     /**
      * @param int|null $decimal
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDecimal($decimal)
     {
diff --git a/src/Sql/Ddl/Column/Column.php b/src/Sql/Ddl/Column/Column.php
index fe04902f..ed77bd9d 100644
--- a/src/Sql/Ddl/Column/Column.php
+++ b/src/Sql/Ddl/Column/Column.php
@@ -45,7 +45,7 @@ public function __construct($name = null, $nullable = false, $default = null, ar
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setName($name)
     {
@@ -63,7 +63,7 @@ public function getName()
 
     /**
      * @param  bool $nullable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setNullable($nullable)
     {
@@ -81,7 +81,7 @@ public function isNullable()
 
     /**
      * @param  null|string|int $default
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setDefault($default)
     {
@@ -99,7 +99,7 @@ public function getDefault()
 
     /**
      * @param  array $options
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOptions(array $options)
     {
@@ -110,7 +110,7 @@ public function setOptions(array $options)
     /**
      * @param  string $name
      * @param  string $value
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOption($name, $value)
     {
@@ -127,7 +127,7 @@ public function getOptions()
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addConstraint(ConstraintInterface $constraint)
     {
diff --git a/src/Sql/Ddl/Constraint/AbstractConstraint.php b/src/Sql/Ddl/Constraint/AbstractConstraint.php
index bc36cf4e..e360a3cb 100644
--- a/src/Sql/Ddl/Constraint/AbstractConstraint.php
+++ b/src/Sql/Ddl/Constraint/AbstractConstraint.php
@@ -40,7 +40,7 @@ public function __construct($columns = null, $name = null)
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setName($name)
     {
@@ -58,7 +58,7 @@ public function getName()
 
     /**
      * @param  null|string|array $columns
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setColumns($columns)
     {
@@ -69,7 +69,7 @@ public function setColumns($columns)
 
     /**
      * @param  string $column
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addColumn($column)
     {
diff --git a/src/Sql/Ddl/Constraint/ForeignKey.php b/src/Sql/Ddl/Constraint/ForeignKey.php
index c373306b..e164587d 100644
--- a/src/Sql/Ddl/Constraint/ForeignKey.php
+++ b/src/Sql/Ddl/Constraint/ForeignKey.php
@@ -65,7 +65,7 @@ public function __construct(
 
     /**
      * @param  string $referenceTable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferenceTable($referenceTable)
     {
@@ -83,7 +83,7 @@ public function getReferenceTable()
 
     /**
      * @param  null|string|array $referenceColumn
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setReferenceColumn($referenceColumn)
     {
@@ -102,7 +102,7 @@ public function getReferenceColumn()
 
     /**
      * @param  string $onDeleteRule
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOnDeleteRule($onDeleteRule)
     {
@@ -121,7 +121,7 @@ public function getOnDeleteRule()
 
     /**
      * @param  string $onUpdateRule
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOnUpdateRule($onUpdateRule)
     {
diff --git a/src/Sql/Ddl/CreateTable.php b/src/Sql/Ddl/CreateTable.php
index 73dc15fa..d7cc75be 100644
--- a/src/Sql/Ddl/CreateTable.php
+++ b/src/Sql/Ddl/CreateTable.php
@@ -57,7 +57,7 @@ public function __construct($table = '', $isTemporary = false)
 
     /**
      * @param  bool $temporary
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTemporary($temporary)
     {
@@ -75,7 +75,7 @@ public function isTemporary()
 
     /**
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTable($name)
     {
@@ -84,7 +84,7 @@ public function setTable($name)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addColumn(Column\ColumnInterface $column)
     {
@@ -93,7 +93,7 @@ public function addColumn(Column\ColumnInterface $column)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addConstraint(Constraint\ConstraintInterface $constraint)
     {
diff --git a/src/Sql/Delete.php b/src/Sql/Delete.php
index 5b9a07e4..ccd5aff8 100644
--- a/src/Sql/Delete.php
+++ b/src/Sql/Delete.php
@@ -60,7 +60,7 @@ public function __construct($table = null)
      * Create from statement
      *
      * @param  string|TableIdentifier $table
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function from($table)
     {
@@ -88,7 +88,7 @@ public function getRawState($key = null)
      *
      * @param Where|Closure|string|array $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
     {
diff --git a/src/Sql/Expression.php b/src/Sql/Expression.php
index 0c843128..da40f5dd 100644
--- a/src/Sql/Expression.php
+++ b/src/Sql/Expression.php
@@ -59,7 +59,7 @@ public function __construct($expression = '', $parameters = null, array $types =
 
     /**
      * @param string $expression
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setExpression($expression)
@@ -81,7 +81,7 @@ public function getExpression()
 
     /**
      * @param scalar|array $parameters
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setParameters($parameters)
@@ -105,7 +105,7 @@ public function getParameters()
      * @deprecated
      *
      * @param array $types
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTypes(array $types)
     {
diff --git a/src/Sql/Insert.php b/src/Sql/Insert.php
index d40e4b17..b565ebfc 100644
--- a/src/Sql/Insert.php
+++ b/src/Sql/Insert.php
@@ -64,7 +64,7 @@ public function __construct($table = null)
      * Create INTO clause
      *
      * @param  string|TableIdentifier $table
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function into($table)
     {
@@ -76,7 +76,7 @@ public function into($table)
      * Specify columns
      *
      * @param  array $columns
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function columns(array $columns)
     {
@@ -89,7 +89,7 @@ public function columns(array $columns)
      *
      * @param  array|Select $values
      * @param  string $flag one of VALUES_MERGE or VALUES_SET; defaults to VALUES_SET
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function values($values, $flag = self::VALUES_SET)
@@ -145,7 +145,7 @@ private function isAssocativeArray(array $array)
     /**
      * Create INTO SELECT clause
      *
-     * @return self
+     * @return $this
      */
     public function select(Select $select)
     {
@@ -239,7 +239,7 @@ protected function processSelect(
      *
      * @param  string $name
      * @param  mixed $value
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function __set($name, $value)
     {
diff --git a/src/Sql/Join.php b/src/Sql/Join.php
index fa938b10..3f57966a 100644
--- a/src/Sql/Join.php
+++ b/src/Sql/Join.php
@@ -125,7 +125,7 @@ public function getJoins()
      *     of column names, or (a) specification(s) such as SQL_STAR representing
      *     the columns to join.
      * @param string $type The JOIN type to use; see the JOIN_* constants.
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException For invalid $name values.
      */
     public function join($name, $on, $columns = [Select::SQL_STAR], $type = self::JOIN_INNER)
@@ -153,7 +153,7 @@ public function join($name, $on, $columns = [Select::SQL_STAR], $type = self::JO
     /**
      * Reset to an empty list of JOIN specifications.
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function reset()
     {
diff --git a/src/Sql/Literal.php b/src/Sql/Literal.php
index 9f1d34eb..3c82cea4 100644
--- a/src/Sql/Literal.php
+++ b/src/Sql/Literal.php
@@ -19,7 +19,7 @@ public function __construct($literal = '')
 
     /**
      * @param string $literal
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setLiteral($literal)
     {
diff --git a/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php
index ccc448f6..b35843fc 100644
--- a/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php
+++ b/src/Sql/Platform/Mysql/Ddl/AlterTableDecorator.php
@@ -37,7 +37,7 @@ class AlterTableDecorator extends AlterTable implements PlatformDecoratorInterfa
 
     /**
      * @param AlterTable $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php b/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
index 2498c0b2..177a544a 100644
--- a/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
+++ b/src/Sql/Platform/Mysql/Ddl/CreateTableDecorator.php
@@ -36,7 +36,7 @@ class CreateTableDecorator extends CreateTable implements PlatformDecoratorInter
 
     /**
      * @param CreateTable $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/src/Sql/Platform/PlatformDecoratorInterface.php b/src/Sql/Platform/PlatformDecoratorInterface.php
index 94c40677..29afe65a 100644
--- a/src/Sql/Platform/PlatformDecoratorInterface.php
+++ b/src/Sql/Platform/PlatformDecoratorInterface.php
@@ -6,7 +6,7 @@ interface PlatformDecoratorInterface
 {
     /**
      * @param null|object $subject
-     * @return self
+     * @return $this
      */
     public function setSubject($subject);
 }
diff --git a/src/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php b/src/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
index a078756c..4af1fd7c 100644
--- a/src/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
+++ b/src/Sql/Platform/SqlServer/Ddl/CreateTableDecorator.php
@@ -15,7 +15,7 @@ class CreateTableDecorator extends CreateTable implements PlatformDecoratorInter
 
     /**
      * @param CreateTable $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/src/Sql/Platform/Sqlite/SelectDecorator.php b/src/Sql/Platform/Sqlite/SelectDecorator.php
index f98bcaa2..9b742e6e 100644
--- a/src/Sql/Platform/Sqlite/SelectDecorator.php
+++ b/src/Sql/Platform/Sqlite/SelectDecorator.php
@@ -17,7 +17,7 @@ class SelectDecorator extends Select implements PlatformDecoratorInterface
      * Set Subject
      *
      * @param Select $select
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($select)
     {
diff --git a/src/Sql/Predicate/Between.php b/src/Sql/Predicate/Between.php
index ad08ca0c..259404b2 100644
--- a/src/Sql/Predicate/Between.php
+++ b/src/Sql/Predicate/Between.php
@@ -42,7 +42,7 @@ public function __construct($identifier = null, $minValue = null, $maxValue = nu
      * Set identifier for comparison
      *
      * @param  string $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIdentifier($identifier)
     {
@@ -64,7 +64,7 @@ public function getIdentifier()
      * Set minimum boundary for comparison
      *
      * @param  int|float|string $minValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setMinValue($minValue)
     {
@@ -86,7 +86,7 @@ public function getMinValue()
      * Set maximum boundary for comparison
      *
      * @param  int|float|string $maxValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setMaxValue($maxValue)
     {
@@ -108,7 +108,7 @@ public function getMaxValue()
      * Set specification string to use in forming SQL predicate
      *
      * @param  string $specification
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSpecification($specification)
     {
diff --git a/src/Sql/Predicate/In.php b/src/Sql/Predicate/In.php
index 670f8c90..b370d61f 100644
--- a/src/Sql/Predicate/In.php
+++ b/src/Sql/Predicate/In.php
@@ -47,7 +47,7 @@ public function __construct($identifier = null, $valueSet = null)
      * Set identifier for comparison
      *
      * @param  string|array $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIdentifier($identifier)
     {
@@ -70,7 +70,7 @@ public function getIdentifier()
      * Set set of values for IN comparison
      *
      * @param  array|Select                       $valueSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setValueSet($valueSet)
diff --git a/src/Sql/Predicate/IsNull.php b/src/Sql/Predicate/IsNull.php
index 0221ee87..77e82189 100644
--- a/src/Sql/Predicate/IsNull.php
+++ b/src/Sql/Predicate/IsNull.php
@@ -28,7 +28,7 @@ public function __construct($identifier = null)
      * Set identifier for comparison
      *
      * @param  string $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIdentifier($identifier)
     {
@@ -50,7 +50,7 @@ public function getIdentifier()
      * Set specification string to use in forming SQL predicate
      *
      * @param  string $specification
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSpecification($specification)
     {
diff --git a/src/Sql/Predicate/Like.php b/src/Sql/Predicate/Like.php
index 0b0976df..a9d5cc48 100644
--- a/src/Sql/Predicate/Like.php
+++ b/src/Sql/Predicate/Like.php
@@ -31,7 +31,7 @@ public function __construct($identifier = null, $like = null)
 
     /**
      * @param  string $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setIdentifier($identifier)
     {
@@ -49,7 +49,7 @@ public function getIdentifier()
 
     /**
      * @param  string $like
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setLike($like)
     {
@@ -67,7 +67,7 @@ public function getLike()
 
     /**
      * @param  string $specification
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSpecification($specification)
     {
diff --git a/src/Sql/Predicate/Operator.php b/src/Sql/Predicate/Operator.php
index c34c38a4..6d64b410 100644
--- a/src/Sql/Predicate/Operator.php
+++ b/src/Sql/Predicate/Operator.php
@@ -93,7 +93,7 @@ public function __construct(
      * Set left side of operator
      *
      * @param  int|float|bool|string $left
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setLeft($left)
     {
@@ -121,7 +121,7 @@ public function getLeft()
      * Set parameter type for left side of operator
      *
      * @param  string $type TYPE_IDENTIFIER or TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setLeftType($type)
@@ -154,7 +154,7 @@ public function getLeftType()
      * Set operator string
      *
      * @param  string $operator
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setOperator($operator)
     {
@@ -177,7 +177,7 @@ public function getOperator()
      * Set right side of operator
      *
      * @param  int|float|bool|string $right
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setRight($right)
     {
@@ -205,7 +205,7 @@ public function getRight()
      * Set parameter type for right side of operator
      *
      * @param  string $type TYPE_IDENTIFIER or TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setRightType($type)
diff --git a/src/Sql/Predicate/Predicate.php b/src/Sql/Predicate/Predicate.php
index 1cad2498..a18d6b43 100644
--- a/src/Sql/Predicate/Predicate.php
+++ b/src/Sql/Predicate/Predicate.php
@@ -74,7 +74,7 @@ public function unnest()
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function equalTo($left, $right, $leftType = self::TYPE_IDENTIFIER, $rightType = self::TYPE_VALUE)
     {
@@ -96,7 +96,7 @@ public function equalTo($left, $right, $leftType = self::TYPE_IDENTIFIER, $right
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function notEqualTo($left, $right, $leftType = self::TYPE_IDENTIFIER, $rightType = self::TYPE_VALUE)
     {
@@ -118,7 +118,7 @@ public function notEqualTo($left, $right, $leftType = self::TYPE_IDENTIFIER, $ri
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function lessThan($left, $right, $leftType = self::TYPE_IDENTIFIER, $rightType = self::TYPE_VALUE)
     {
@@ -140,7 +140,7 @@ public function lessThan($left, $right, $leftType = self::TYPE_IDENTIFIER, $righ
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function greaterThan($left, $right, $leftType = self::TYPE_IDENTIFIER, $rightType = self::TYPE_VALUE)
     {
@@ -162,7 +162,7 @@ public function greaterThan($left, $right, $leftType = self::TYPE_IDENTIFIER, $r
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function lessThanOrEqualTo($left, $right, $leftType = self::TYPE_IDENTIFIER, $rightType = self::TYPE_VALUE)
     {
@@ -184,7 +184,7 @@ public function lessThanOrEqualTo($left, $right, $leftType = self::TYPE_IDENTIFI
      * @param  int|float|bool|string|Expression $right
      * @param  string $leftType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_IDENTIFIER {@see allowedTypes}
      * @param  string $rightType TYPE_IDENTIFIER or TYPE_VALUE by default TYPE_VALUE {@see allowedTypes}
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function greaterThanOrEqualTo(
         $left,
@@ -208,7 +208,7 @@ public function greaterThanOrEqualTo(
      *
      * @param  string|Expression $identifier
      * @param  string $like
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function like($identifier, $like)
     {
@@ -228,7 +228,7 @@ public function like($identifier, $like)
      *
      * @param  string|Expression $identifier
      * @param  string $notLike
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function notLike($identifier, $notLike)
     {
@@ -245,7 +245,7 @@ public function notLike($identifier, $notLike)
      *
      * @param string $expression
      * @param null|array $parameters
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function expression($expression, $parameters = null)
     {
@@ -264,7 +264,7 @@ public function expression($expression, $parameters = null)
      * Literal predicate, for parameters, use expression()
      *
      * @param  string $literal
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function literal($literal)
     {
@@ -294,7 +294,7 @@ public function literal($literal)
      * Utilizes IsNull predicate
      *
      * @param  string|Expression $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function isNull($identifier)
     {
@@ -313,7 +313,7 @@ public function isNull($identifier)
      * Utilizes IsNotNull predicate
      *
      * @param  string|Expression $identifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function isNotNull($identifier)
     {
@@ -333,7 +333,7 @@ public function isNotNull($identifier)
      *
      * @param  string|Expression $identifier
      * @param array|Select $valueSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function in($identifier, $valueSet = null)
     {
@@ -353,7 +353,7 @@ public function in($identifier, $valueSet = null)
      *
      * @param  string|Expression $identifier
      * @param array|Select $valueSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function notIn($identifier, $valueSet = null)
     {
@@ -374,7 +374,7 @@ public function notIn($identifier, $valueSet = null)
      * @param  string|Expression $identifier
      * @param  int|float|string $minValue
      * @param  int|float|string $maxValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function between($identifier, $minValue, $maxValue)
     {
@@ -395,7 +395,7 @@ public function between($identifier, $minValue, $maxValue)
      * @param  string|Expression $identifier
      * @param  int|float|string $minValue
      * @param  int|float|string $maxValue
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function notBetween($identifier, $minValue, $maxValue)
     {
@@ -415,7 +415,7 @@ public function notBetween($identifier, $minValue, $maxValue)
      * AND / OR combination operator, thus allowing generic predicates to be
      * used fluently within where chains as any other concrete predicate.
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     // phpcs:ignore Generic.NamingConventions.ConstructorName.OldStyle
     public function predicate(PredicateInterface $predicate)
@@ -435,7 +435,7 @@ public function predicate(PredicateInterface $predicate)
      * Overloads "or", "and", "nest", and "unnest"
      *
      * @param  string $name
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function __get($name)
     {
diff --git a/src/Sql/Predicate/PredicateSet.php b/src/Sql/Predicate/PredicateSet.php
index b40331a3..61d27185 100644
--- a/src/Sql/Predicate/PredicateSet.php
+++ b/src/Sql/Predicate/PredicateSet.php
@@ -50,7 +50,7 @@ public function __construct(?array $predicates = null, $defaultCombination = sel
      * Add predicate to set
      *
      * @param  string $combination
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addPredicate(PredicateInterface $predicate, $combination = null)
     {
@@ -72,7 +72,7 @@ public function addPredicate(PredicateInterface $predicate, $combination = null)
      *
      * @param PredicateInterface|Closure|string|array $predicates
      * @param string $combination
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function addPredicates($predicates, $combination = self::OP_AND)
@@ -145,7 +145,7 @@ public function getPredicates()
     /**
      * Add predicate using OR operator
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function orPredicate(PredicateInterface $predicate)
     {
@@ -156,7 +156,7 @@ public function orPredicate(PredicateInterface $predicate)
     /**
      * Add predicate using AND operator
      *
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function andPredicate(PredicateInterface $predicate)
     {
diff --git a/src/Sql/Select.php b/src/Sql/Select.php
index 4cc1e248..20524ea7 100644
--- a/src/Sql/Select.php
+++ b/src/Sql/Select.php
@@ -180,7 +180,7 @@ public function __construct($table = null)
      * Create from clause
      *
      * @param  string|array|TableIdentifier $table
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function from($table)
@@ -209,7 +209,7 @@ public function from($table)
 
     /**
      * @param string|Expression $quantifier DISTINCT|ALL
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function quantifier($quantifier)
@@ -240,7 +240,7 @@ public function quantifier($quantifier)
      *
      * @param  array $columns
      * @param  bool  $prefixColumnsWithTable
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function columns(array $columns, $prefixColumnsWithTable = true)
     {
@@ -256,7 +256,7 @@ public function columns(array $columns, $prefixColumnsWithTable = true)
      * @param  string|Predicate\Expression $on
      * @param  string|array $columns
      * @param  string $type one of the JOIN_* constants
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function join($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_INNER)
@@ -271,7 +271,7 @@ public function join($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_I
      *
      * @param Where|Closure|string|array|Predicate\PredicateInterface $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
@@ -286,7 +286,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
 
     /**
      * @param mixed $group
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function group($group)
     {
@@ -305,7 +305,7 @@ public function group($group)
      *
      * @param Where|Closure|string|array $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function having($predicate, $combination = Predicate\PredicateSet::OP_AND)
     {
@@ -319,7 +319,7 @@ public function having($predicate, $combination = Predicate\PredicateSet::OP_AND
 
     /**
      * @param string|array|Expression $order
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function order($order)
     {
@@ -344,7 +344,7 @@ public function order($order)
 
     /**
      * @param int $limit
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function limit($limit)
@@ -363,7 +363,7 @@ public function limit($limit)
 
     /**
      * @param int $offset
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function offset($offset)
@@ -383,7 +383,7 @@ public function offset($offset)
     /**
      * @param string $type
      * @param string $modifier
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function combine(Select $select, $type = self::COMBINE_UNION, $modifier = '')
@@ -403,7 +403,7 @@ public function combine(Select $select, $type = self::COMBINE_UNION, $modifier =
 
     /**
      * @param string $part
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function reset($part)
@@ -454,7 +454,7 @@ public function reset($part)
     /**
      * @param string $index
      * @param string|array<string, array> $specification
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSpecification($index, $specification)
     {
diff --git a/src/Sql/Sql.php b/src/Sql/Sql.php
index f7c4647e..5f5f71f2 100644
--- a/src/Sql/Sql.php
+++ b/src/Sql/Sql.php
@@ -53,7 +53,7 @@ public function hasTable()
 
     /**
      * @param string|array|TableIdentifier $table
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function setTable($table)
diff --git a/src/Sql/Update.php b/src/Sql/Update.php
index 7c8c47d3..43b421fd 100644
--- a/src/Sql/Update.php
+++ b/src/Sql/Update.php
@@ -81,7 +81,7 @@ public function __construct($table = null)
      * Specify table for statement
      *
      * @param  string|TableIdentifier $table
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function table($table)
     {
@@ -94,7 +94,7 @@ public function table($table)
      *
      * @param  array $values Associative array of key values
      * @param  string $flag One of the VALUES_* constants
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function set(array $values, $flag = self::VALUES_SET)
@@ -117,7 +117,7 @@ public function set(array $values, $flag = self::VALUES_SET)
      *
      * @param Where|Closure|string|array $predicate
      * @param  string $combination One of the OP_* constants from Predicate\PredicateSet
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
@@ -136,7 +136,7 @@ public function where($predicate, $combination = Predicate\PredicateSet::OP_AND)
      * @param  string|array $name
      * @param  string $on
      * @param  string $type one of the JOIN_* constants
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      * @throws Exception\InvalidArgumentException
      */
     public function join($name, $on, $type = Join::JOIN_INNER)
diff --git a/src/TableGateway/Feature/FeatureSet.php b/src/TableGateway/Feature/FeatureSet.php
index df3b4b8e..27fdcf32 100644
--- a/src/TableGateway/Feature/FeatureSet.php
+++ b/src/TableGateway/Feature/FeatureSet.php
@@ -29,7 +29,7 @@ public function __construct(array $features = [])
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setTableGateway(AbstractTableGateway $tableGateway)
     {
@@ -58,7 +58,7 @@ public function getFeatureByClassName($featureClassName)
 
     /**
      * @param array $features
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeatures(array $features)
     {
@@ -69,7 +69,7 @@ public function addFeatures(array $features)
     }
 
     /**
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function addFeature(AbstractFeature $feature)
     {
diff --git a/test/unit/TestAsset/DeleteDecorator.php b/test/unit/TestAsset/DeleteDecorator.php
index 99977347..0e19e94b 100644
--- a/test/unit/TestAsset/DeleteDecorator.php
+++ b/test/unit/TestAsset/DeleteDecorator.php
@@ -11,7 +11,7 @@ class DeleteDecorator extends Sql\Delete implements Sql\Platform\PlatformDecorat
 
     /**
      * @param null|object $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/test/unit/TestAsset/InsertDecorator.php b/test/unit/TestAsset/InsertDecorator.php
index b25fff6d..f73b748d 100644
--- a/test/unit/TestAsset/InsertDecorator.php
+++ b/test/unit/TestAsset/InsertDecorator.php
@@ -11,7 +11,7 @@ class InsertDecorator extends Sql\Insert implements Sql\Platform\PlatformDecorat
 
     /**
      * @param null|object $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/test/unit/TestAsset/SelectDecorator.php b/test/unit/TestAsset/SelectDecorator.php
index 8a1cb181..004f0dc3 100644
--- a/test/unit/TestAsset/SelectDecorator.php
+++ b/test/unit/TestAsset/SelectDecorator.php
@@ -11,7 +11,7 @@ class SelectDecorator extends Sql\Select implements Sql\Platform\PlatformDecorat
 
     /**
      * @param null|object $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {
diff --git a/test/unit/TestAsset/UpdateDecorator.php b/test/unit/TestAsset/UpdateDecorator.php
index a4213867..fa1762bc 100644
--- a/test/unit/TestAsset/UpdateDecorator.php
+++ b/test/unit/TestAsset/UpdateDecorator.php
@@ -11,7 +11,7 @@ class UpdateDecorator extends Sql\Update implements Sql\Platform\PlatformDecorat
 
     /**
      * @param null|object $subject
-     * @return self Provides a fluent interface
+     * @return $this Provides a fluent interface
      */
     public function setSubject($subject)
     {