diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 25d59fb7d7..bff38c0c8d 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -245,7 +245,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param mixed $value The parameter value.
 	 * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function setParameter($key, $value, $type = null) {
 		$this->queryBuilder->setParameter($key, $value, $type);
@@ -270,7 +270,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param array $params The query parameters to set.
 	 * @param array $types The query parameters types to set.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function setParameters(array $params, array $types = array()) {
 		$this->queryBuilder->setParameters($params, $types);
@@ -323,7 +323,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param integer $firstResult The first result to return.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function setFirstResult($firstResult) {
 		$this->queryBuilder->setFirstResult($firstResult);
@@ -350,7 +350,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param integer $maxResults The maximum number of results to retrieve.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function setMaxResults($maxResults) {
 		$this->queryBuilder->setMaxResults($maxResults);
@@ -381,7 +381,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$selects The selection expressions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * '@return $this This QueryBuilder instance.
 	 */
 	public function select(...$selects) {
 		if (count($selects) === 1 && is_array($selects[0])) {
@@ -408,7 +408,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param mixed $select The selection expressions.
 	 * @param string $alias The column alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function selectAlias($select, $alias) {
 
@@ -430,7 +430,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed $select The selection expressions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function selectDistinct($select) {
 
@@ -454,7 +454,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$selects The selection expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function addSelect(...$selects) {
 		if (count($selects) === 1 && is_array($selects[0])) {
@@ -482,7 +482,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $delete The table whose rows are subject to the deletion.
 	 * @param string $alias The table alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function delete($delete = null, $alias = null) {
 		$this->queryBuilder->delete(
@@ -507,7 +507,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $update The table whose rows are subject to the update.
 	 * @param string $alias The table alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function update($update = null, $alias = null) {
 		$this->queryBuilder->update(
@@ -535,7 +535,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param string $insert The table into which the rows should be inserted.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function insert($insert = null) {
 		$this->queryBuilder->insert(
@@ -560,7 +560,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $from The table.
 	 * @param string|null $alias The alias of the table.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function from($from, $alias = null) {
 		$this->queryBuilder->from(
@@ -586,7 +586,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function join($fromAlias, $join, $alias, $condition = null) {
 		$this->queryBuilder->join(
@@ -614,7 +614,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function innerJoin($fromAlias, $join, $alias, $condition = null) {
 		$this->queryBuilder->innerJoin(
@@ -642,7 +642,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function leftJoin($fromAlias, $join, $alias, $condition = null) {
 		$this->queryBuilder->leftJoin(
@@ -670,7 +670,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function rightJoin($fromAlias, $join, $alias, $condition = null) {
 		$this->queryBuilder->rightJoin(
@@ -696,7 +696,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $key The column to set.
 	 * @param string $value The value, expression, placeholder, etc.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function set($key, $value) {
 		$this->queryBuilder->set(
@@ -731,7 +731,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$predicates The restriction predicates.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function where(...$predicates) {
 		call_user_func_array(
@@ -756,7 +756,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$where The query restrictions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 */
@@ -783,7 +783,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$where The WHERE statement.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 */
@@ -809,7 +809,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$groupBys The grouping expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function groupBy(...$groupBys) {
 		if (count($groupBys) === 1 && is_array($groupBys[0])) {
@@ -837,7 +837,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$groupBy The grouping expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function addGroupBy(...$groupBys) {
 		if (count($groupBys) === 1 && is_array($groupBys[0])) {
@@ -869,7 +869,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $column The column into which the value should be inserted.
 	 * @param string $value The value that should be inserted into the column.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function setValue($column, $value) {
 		$this->queryBuilder->setValue(
@@ -897,7 +897,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param array $values The values to specify for the insert query indexed by column names.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function values(array $values) {
 		$quotedValues = [];
@@ -916,7 +916,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction over the groups.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function having(...$having) {
 		call_user_func_array(
@@ -933,7 +933,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction to append.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function andHaving(...$having) {
 		call_user_func_array(
@@ -950,7 +950,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction to add.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function orHaving(...$having) {
 		call_user_func_array(
@@ -968,7 +968,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $sort The ordering expression.
 	 * @param string $order The ordering direction.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function orderBy($sort, $order = null) {
 		$this->queryBuilder->orderBy(
@@ -985,7 +985,7 @@ class QueryBuilder implements IQueryBuilder {
 	 * @param string $sort The ordering expression.
 	 * @param string $order The ordering direction.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function addOrderBy($sort, $order = null) {
 		$this->queryBuilder->addOrderBy(
@@ -1021,7 +1021,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param array|null $queryPartNames
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function resetQueryParts($queryPartNames = null) {
 		$this->queryBuilder->resetQueryParts($queryPartNames);
@@ -1034,7 +1034,7 @@ class QueryBuilder implements IQueryBuilder {
 	 *
 	 * @param string $queryPartName
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 */
 	public function resetQueryPart($queryPartName) {
 		$this->queryBuilder->resetQueryPart($queryPartName);
diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
index 7fea31f468..fe5182f21b 100644
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -180,7 +180,7 @@ interface IQueryBuilder {
 	 * @param mixed $value The parameter value.
 	 * @param string|null|int $type One of the IQueryBuilder::PARAM_* constants.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function setParameter($key, $value, $type = null);
@@ -202,7 +202,7 @@ interface IQueryBuilder {
 	 * @param array $params The query parameters to set.
 	 * @param array $types The query parameters types to set.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function setParameters(array $params, array $types = array());
@@ -248,7 +248,7 @@ interface IQueryBuilder {
 	 *
 	 * @param integer $firstResult The first result to return.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function setFirstResult($firstResult);
@@ -267,7 +267,7 @@ interface IQueryBuilder {
 	 *
 	 * @param integer $maxResults The maximum number of results to retrieve.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function setMaxResults($maxResults);
@@ -294,7 +294,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$selects The selection expressions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function select(...$selects);
@@ -312,7 +312,7 @@ interface IQueryBuilder {
 	 * @param mixed $select The selection expressions.
 	 * @param string $alias The column alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.1
 	 */
 	public function selectAlias($select, $alias);
@@ -328,7 +328,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed $select The selection expressions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 9.0.0
 	 */
 	public function selectDistinct($select);
@@ -346,7 +346,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$select The selection expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function addSelect(...$select);
@@ -365,7 +365,7 @@ interface IQueryBuilder {
 	 * @param string $delete The table whose rows are subject to the deletion.
 	 * @param string $alias The table alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function delete($delete = null, $alias = null);
@@ -384,7 +384,7 @@ interface IQueryBuilder {
 	 * @param string $update The table whose rows are subject to the update.
 	 * @param string $alias The table alias used in the constructed query.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function update($update = null, $alias = null);
@@ -406,7 +406,7 @@ interface IQueryBuilder {
 	 *
 	 * @param string $insert The table into which the rows should be inserted.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function insert($insert = null);
@@ -424,7 +424,7 @@ interface IQueryBuilder {
 	 * @param string $from The table.
 	 * @param string|null $alias The alias of the table.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function from($from, $alias = null);
@@ -444,7 +444,7 @@ interface IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function join($fromAlias, $join, $alias, $condition = null);
@@ -464,7 +464,7 @@ interface IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function innerJoin($fromAlias, $join, $alias, $condition = null);
@@ -484,7 +484,7 @@ interface IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function leftJoin($fromAlias, $join, $alias, $condition = null);
@@ -504,7 +504,7 @@ interface IQueryBuilder {
 	 * @param string $alias The alias of the join table.
 	 * @param string $condition The condition for the join.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function rightJoin($fromAlias, $join, $alias, $condition = null);
@@ -522,7 +522,7 @@ interface IQueryBuilder {
 	 * @param string $key The column to set.
 	 * @param string $value The value, expression, placeholder, etc.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function set($key, $value);
@@ -551,7 +551,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed $predicates The restriction predicates.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function where(...$predicates);
@@ -570,7 +570,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$where The query restrictions.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 * @since 8.2.0
@@ -591,7 +591,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$where The WHERE statement.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 *
 	 * @see where()
 	 * @since 8.2.0
@@ -611,7 +611,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$groupBys The grouping expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function groupBy(...$groupBys);
@@ -629,7 +629,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$groupBy The grouping expression.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function addGroupBy(...$groupBy);
@@ -651,7 +651,7 @@ interface IQueryBuilder {
 	 * @param string $column The column into which the value should be inserted.
 	 * @param string $value The value that should be inserted into the column.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function setValue($column, $value);
@@ -673,7 +673,7 @@ interface IQueryBuilder {
 	 *
 	 * @param array $values The values to specify for the insert query indexed by column names.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function values(array $values);
@@ -684,7 +684,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction over the groups.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function having(...$having);
@@ -695,7 +695,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction to append.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function andHaving(...$having);
@@ -706,7 +706,7 @@ interface IQueryBuilder {
 	 *
 	 * @param mixed ...$having The restriction to add.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function orHaving(...$having);
@@ -718,7 +718,7 @@ interface IQueryBuilder {
 	 * @param string $sort The ordering expression.
 	 * @param string $order The ordering direction.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function orderBy($sort, $order = null);
@@ -729,7 +729,7 @@ interface IQueryBuilder {
 	 * @param string $sort The ordering expression.
 	 * @param string $order The ordering direction.
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function addOrderBy($sort, $order = null);
@@ -757,7 +757,7 @@ interface IQueryBuilder {
 	 *
 	 * @param array|null $queryPartNames
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function resetQueryParts($queryPartNames = null);
@@ -767,7 +767,7 @@ interface IQueryBuilder {
 	 *
 	 * @param string $queryPartName
 	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+	 * @return $this This QueryBuilder instance.
 	 * @since 8.2.0
 	 */
 	public function resetQueryPart($queryPartName);