diff --git a/Classes/Utility/DispatcherProxy.php b/Classes/Proxy/DispatcherProxy.php
similarity index 95%
rename from Classes/Utility/DispatcherProxy.php
rename to Classes/Proxy/DispatcherProxy.php
index 7282b5d30..2c8a3d237 100644
--- a/Classes/Utility/DispatcherProxy.php
+++ b/Classes/Proxy/DispatcherProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace FluidTYPO3\Vhs\Utility;
+namespace FluidTYPO3\Vhs\Proxy;
 
 /*
  * This file is part of the FluidTYPO3/Vhs project under GPLv2 or later.
diff --git a/Classes/Utility/DoctrineQueryProxy.php b/Classes/Proxy/DoctrineQueryProxy.php
similarity index 97%
rename from Classes/Utility/DoctrineQueryProxy.php
rename to Classes/Proxy/DoctrineQueryProxy.php
index a9757f965..793a11f99 100644
--- a/Classes/Utility/DoctrineQueryProxy.php
+++ b/Classes/Proxy/DoctrineQueryProxy.php
@@ -1,5 +1,5 @@
 <?php
-namespace FluidTYPO3\Vhs\Utility;
+namespace FluidTYPO3\Vhs\Proxy;
 
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\FetchMode;
diff --git a/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php b/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php
index 37426f8d9..8e177b3be 100644
--- a/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php
+++ b/Classes/ViewHelpers/Condition/Page/IsLanguageViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
index b2264cfb7..04810fb05 100644
--- a/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
+++ b/Classes/ViewHelpers/Content/AbstractContentViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\SlideViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper;
diff --git a/Classes/ViewHelpers/Content/InfoViewHelper.php b/Classes/ViewHelpers/Content/InfoViewHelper.php
index a171aaae8..d322e28cc 100644
--- a/Classes/ViewHelpers/Content/InfoViewHelper.php
+++ b/Classes/ViewHelpers/Content/InfoViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
index c406bdff3..f5788a536 100644
--- a/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
+++ b/Classes/ViewHelpers/Page/LanguageMenuViewHelper.php
@@ -8,11 +8,11 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\ArrayConsumingViewHelperTrait;
 use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
 use FluidTYPO3\Vhs\Utility\CoreUtility;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Context\LanguageAspect;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/Classes/ViewHelpers/Render/RequestViewHelper.php b/Classes/ViewHelpers/Render/RequestViewHelper.php
index 2a60aee5e..bc1e190b0 100644
--- a/Classes/ViewHelpers/Render/RequestViewHelper.php
+++ b/Classes/ViewHelpers/Render/RequestViewHelper.php
@@ -8,8 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DispatcherProxy;
+use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DispatcherProxy;
 use FluidTYPO3\Vhs\Utility\RequestResolver;
 use Psr\Http\Message\ServerRequestInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -22,7 +23,6 @@
 use TYPO3\CMS\Fluid\Core\Rendering\RenderingContext;
 use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
 use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface;
-use FluidTYPO3\Vhs\Traits\CompileWithRenderStatic;
 
 /**
  * ### Render: Request
diff --git a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
index 94c732ce9..491c303e7 100644
--- a/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
+++ b/Classes/ViewHelpers/Resource/AbstractResourceViewHelper.php
@@ -8,8 +8,8 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TagViewHelperCompatibility;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php b/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php
index b3ed8a4c5..81f747999 100644
--- a/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php
+++ b/Classes/ViewHelpers/Resource/Record/AbstractRecordResourceViewHelper.php
@@ -8,9 +8,9 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Traits\TemplateVariableViewHelperTrait;
 use FluidTYPO3\Vhs\Utility\ContentObjectFetcher;
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ErrorUtility;
 use TYPO3\CMS\Core\Context\Context;
 use TYPO3\CMS\Core\Database\Connection;
diff --git a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php
index 26523a514..d9725f8d1 100644
--- a/Classes/ViewHelpers/Resource/Record/FalViewHelper.php
+++ b/Classes/ViewHelpers/Resource/Record/FalViewHelper.php
@@ -8,7 +8,7 @@
  * LICENSE.md file that was distributed with this source code.
  */
 
-use FluidTYPO3\Vhs\Utility\DoctrineQueryProxy;
+use FluidTYPO3\Vhs\Proxy\DoctrineQueryProxy;
 use FluidTYPO3\Vhs\Utility\ResourceUtility;
 use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 8f7f19abd..27a618a75 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -4,6 +4,10 @@ parameters:
             message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|null given\\.$#"
             count: 1
             path: Classes/ViewHelpers/Render/RequestViewHelper.php
+        -
+            message: "#^Parameter \\#2 \\$response of method FluidTYPO3\\\\Vhs\\\\Proxy\\\\DispatcherProxy\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null, \\(TYPO3\\\\CMS\\\\Core\\\\Http\\\\Response\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|\\(TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface\\&TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Web\\\\Response\\)\\|null given\\.$#"
+            count: 1
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
             count: 1
@@ -31,7 +35,7 @@ parameters:
         -
             message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Database\\\\Query\\\\QueryBuilder\\:\\:execute\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#^Access to undefined constant TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:DOKTYPE_RECYCLER\\.$#"
             count: 1
@@ -43,11 +47,11 @@ parameters:
         -
             message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetch\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#Call to an undefined method Doctrine\\\\DBAL\\\\Driver\\\\ResultStatement\\|Doctrine\\\\DBAL\\\\Result\\:\\:fetchAll\\(\\)\\.$#"
             count: 1
-            path: Classes/Utility/DoctrineQueryProxy.php
+            path: Classes/Proxy/DoctrineQueryProxy.php
         -
             message: "#^Access to protected property TYPO3\\\\CMS\\\\Core\\\\Domain\\\\Repository\\\\PageRepository\\:\\:\\$where_groupAccess\\.$#"
             count: 1
@@ -79,7 +83,7 @@ parameters:
         -
             message: "#^Method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
             count: 1
-            path: Classes/Utility/DispatcherProxy.php
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#^Parameter \\#1 \\$controllerClassName of class TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Request constructor expects string, Psr\\\\Http\\\\Message\\\\ServerRequestInterface given\\.$#"
             count: 1
@@ -87,7 +91,7 @@ parameters:
         -
             message: "#^Parameter \\#2 \\$response of method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Dispatcher\\:\\:dispatch\\(\\) expects TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\ResponseInterface, TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\Response\\|null given\\.$#"
             count: 1
-            path: Classes/Utility/DispatcherProxy.php
+            path: Classes/Proxy/DispatcherProxy.php
         -
             message: "#Right side of \\|\\| is always true\\.$#"
             count: 1