diff --git a/lib/public/db/querybuilder/icompositeexpression.php b/lib/public/DB/QueryBuilder/ICompositeExpression.php
similarity index 94%
rename from lib/public/db/querybuilder/icompositeexpression.php
rename to lib/public/DB/QueryBuilder/ICompositeExpression.php
index c47ba1deb1e..1a5366c6ce4 100644
--- a/lib/public/db/querybuilder/icompositeexpression.php
+++ b/lib/public/DB/QueryBuilder/ICompositeExpression.php
@@ -31,7 +31,7 @@ interface ICompositeExpression {
 	 *
 	 * @param array $parts
 	 *
-	 * @return \OCP\DB\ICompositeExpression
+	 * @return ICompositeExpression
 	 * @since 8.2.0
 	 */
 	public function addMultiple(array $parts = array());
@@ -41,7 +41,7 @@ interface ICompositeExpression {
 	 *
 	 * @param mixed $part
 	 *
-	 * @return \OCP\DB\ICompositeExpression
+	 * @return ICompositeExpression
 	 * @since 8.2.0
 	 */
 	public function add($part);
diff --git a/lib/public/db/querybuilder/iexpressionbuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php
similarity index 100%
rename from lib/public/db/querybuilder/iexpressionbuilder.php
rename to lib/public/DB/QueryBuilder/IExpressionBuilder.php
diff --git a/lib/public/db/querybuilder/iliteral.php b/lib/public/DB/QueryBuilder/ILiteral.php
similarity index 100%
rename from lib/public/db/querybuilder/iliteral.php
rename to lib/public/DB/QueryBuilder/ILiteral.php
diff --git a/lib/public/db/querybuilder/iparameter.php b/lib/public/DB/QueryBuilder/IParameter.php
similarity index 100%
rename from lib/public/db/querybuilder/iparameter.php
rename to lib/public/DB/QueryBuilder/IParameter.php
diff --git a/lib/public/db/querybuilder/iquerybuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
similarity index 100%
rename from lib/public/db/querybuilder/iquerybuilder.php
rename to lib/public/DB/QueryBuilder/IQueryBuilder.php
diff --git a/lib/public/db/querybuilder/iqueryfunction.php b/lib/public/DB/QueryBuilder/IQueryFunction.php
similarity index 100%
rename from lib/public/db/querybuilder/iqueryfunction.php
rename to lib/public/DB/QueryBuilder/IQueryFunction.php