diff --git a/components/Attachment/Attachment.php b/components/Attachment/Attachment.php
index 8a4898342f..e7d9b8c07c 100644
--- a/components/Attachment/Attachment.php
+++ b/components/Attachment/Attachment.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\Attachment;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
 use App\Core\Router\RouteLoader;
diff --git a/components/Attachment/Controller/Attachment.php b/components/Attachment/Controller/Attachment.php
index 502dcc53b7..b68744d77e 100644
--- a/components/Attachment/Controller/Attachment.php
+++ b/components/Attachment/Controller/Attachment.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Attachment\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
diff --git a/components/Attachment/Entity/ActorToAttachment.php b/components/Attachment/Entity/ActorToAttachment.php
index 3df8af8179..15e0ad2ff4 100644
--- a/components/Attachment/Entity/ActorToAttachment.php
+++ b/components/Attachment/Entity/ActorToAttachment.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/components/Attachment/Entity/Attachment.php b/components/Attachment/Entity/Attachment.php
index c2cb19d73b..c0b7a6620f 100644
--- a/components/Attachment/Entity/Attachment.php
+++ b/components/Attachment/Entity/Attachment.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Attachment\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
diff --git a/components/Attachment/Entity/AttachmentThumbnail.php b/components/Attachment/Entity/AttachmentThumbnail.php
index 176095b630..13d1638ce9 100644
--- a/components/Attachment/Entity/AttachmentThumbnail.php
+++ b/components/Attachment/Entity/AttachmentThumbnail.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Attachment\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
diff --git a/components/Attachment/Entity/AttachmentToLink.php b/components/Attachment/Entity/AttachmentToLink.php
index cf16582736..ba4fc07573 100644
--- a/components/Attachment/Entity/AttachmentToLink.php
+++ b/components/Attachment/Entity/AttachmentToLink.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/components/Attachment/Entity/AttachmentToNote.php b/components/Attachment/Entity/AttachmentToNote.php
index de2d0274cd..3e019af2b5 100644
--- a/components/Attachment/Entity/AttachmentToNote.php
+++ b/components/Attachment/Entity/AttachmentToNote.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/components/Attachment/tests/Controller/AttachmentTest.php b/components/Attachment/tests/Controller/AttachmentTest.php
index 122d87a82a..64d29e1bbc 100644
--- a/components/Attachment/tests/Controller/AttachmentTest.php
+++ b/components/Attachment/tests/Controller/AttachmentTest.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\tests\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Util\GNUsocialTestCase;
 use Component\Attachment\Entity\Attachment;
 use Component\Attachment\Entity\AttachmentToNote;
diff --git a/components/Attachment/tests/Entity/AttachmentTest.php b/components/Attachment/tests/Entity/AttachmentTest.php
index 2e2c0c5b31..ad8bd2cdc9 100644
--- a/components/Attachment/tests/Entity/AttachmentTest.php
+++ b/components/Attachment/tests/Entity/AttachmentTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\Router\Router;
@@ -107,7 +107,7 @@ class AttachmentTest extends GNUsocialTestCase
         static::assertSame('Untitled attachment', $attachment->getBestTitle());
         $attachment->setFilename($filename);
 
-        $actor = DB::findOneBy('actor', ['nickname' => 'taken_user']);
+        $actor            = DB::findOneBy('actor', ['nickname' => 'taken_user']);
         DB::persist($note = Note::create(['actor_id' => $actor->getId(), 'content' => 'attachment: some content', 'content_type' => 'text/plain', 'is_local' => true]));
         Conversation::assignLocalConversation($note, null);
         DB::persist(AttachmentToNote::create(['attachment_id' => $attachment->getId(), 'note_id' => $note->getId(), 'title' => 'A title']));
diff --git a/components/Attachment/tests/Entity/AttachmentThumbnailTest.php b/components/Attachment/tests/Entity/AttachmentThumbnailTest.php
index 6e49841a49..65a053596a 100644
--- a/components/Attachment/tests/Entity/AttachmentThumbnailTest.php
+++ b/components/Attachment/tests/Entity/AttachmentThumbnailTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Attachment\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Util\Exception\NotStoredLocallyException;
 use App\Util\GNUsocialTestCase;
diff --git a/components/Avatar/Avatar.php b/components/Avatar/Avatar.php
index d193f91eec..1f8bc73c87 100644
--- a/components/Avatar/Avatar.php
+++ b/components/Avatar/Avatar.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\Avatar;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\Modules\Component;
diff --git a/components/Avatar/Controller/Avatar.php b/components/Avatar/Controller/Avatar.php
index 26f3053b28..bc391f2e41 100644
--- a/components/Avatar/Controller/Avatar.php
+++ b/components/Avatar/Controller/Avatar.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Avatar\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use App\Core\GSFile;
diff --git a/components/Avatar/Entity/Avatar.php b/components/Avatar/Entity/Avatar.php
index bbc51b01a6..bcecfcbb69 100644
--- a/components/Avatar/Entity/Avatar.php
+++ b/components/Avatar/Entity/Avatar.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Avatar\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\Router\Router;
diff --git a/components/Circle/Circle.php b/components/Circle/Circle.php
index e065e8a0f1..df5eb89045 100644
--- a/components/Circle/Circle.php
+++ b/components/Circle/Circle.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Circle;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
diff --git a/components/Circle/Controller/Circles.php b/components/Circle/Controller/Circles.php
index 5a1c8ba7eb..903159e8ec 100644
--- a/components/Circle/Controller/Circles.php
+++ b/components/Circle/Controller/Circles.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Circle\Controller;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Router\Router;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
diff --git a/components/Circle/Controller/SelfTagsSettings.php b/components/Circle/Controller/SelfTagsSettings.php
index c8f347ec8e..23b9584f49 100644
--- a/components/Circle/Controller/SelfTagsSettings.php
+++ b/components/Circle/Controller/SelfTagsSettings.php
@@ -6,7 +6,7 @@ namespace Component\Circle\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Entity as E;
 use App\Util\Common;
diff --git a/components/Circle/Entity/ActorCircle.php b/components/Circle/Entity/ActorCircle.php
index 29a807141a..a2735fefb1 100644
--- a/components/Circle/Entity/ActorCircle.php
+++ b/components/Circle/Entity/ActorCircle.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\Circle\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Router\Router;
 use DateTimeInterface;
diff --git a/components/Circle/Entity/ActorTag.php b/components/Circle/Entity/ActorTag.php
index 190958a8d9..7085774633 100644
--- a/components/Circle/Entity/ActorTag.php
+++ b/components/Circle/Entity/ActorTag.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Circle\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Router\Router;
 use App\Entity\Actor;
diff --git a/components/Collection/Collection.php b/components/Collection/Collection.php
index 21aeffe6c3..5c04a1131e 100644
--- a/components/Collection/Collection.php
+++ b/components/Collection/Collection.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 
 namespace Component\Collection;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
 use App\Entity\Actor;
diff --git a/components/Collection/Util/Controller/MetaCollectionController.php b/components/Collection/Util/Controller/MetaCollectionController.php
index 55e187263a..efe53f7c4d 100644
--- a/components/Collection/Util/Controller/MetaCollectionController.php
+++ b/components/Collection/Util/Controller/MetaCollectionController.php
@@ -31,7 +31,7 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Entity\LocalUser;
diff --git a/components/Collection/Util/MetaCollectionTrait.php b/components/Collection/Util/MetaCollectionTrait.php
index 1aec098457..03ec2551a4 100644
--- a/components/Collection/Util/MetaCollectionTrait.php
+++ b/components/Collection/Util/MetaCollectionTrait.php
@@ -31,7 +31,7 @@ declare(strict_types = 1);
 
 namespace Component\Collection\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
@@ -137,7 +137,7 @@ trait MetaCollectionTrait
         if ($add_form->isSubmitted() && $add_form->isValid()) {
             $selected = $add_form->getData()['collections'];
             $removed  = array_filter($already_selected, fn ($x) => !\in_array($x, $selected));
-            $added    = array_filter($selected, fn ($x) => !\in_array($x, $already_selected));
+            $added = array_filter($selected, fn ($x) => !\in_array($x, $already_selected));
             if (\count($removed) > 0) {
                 $this->removeItem($user, $vars, $removed, $collections);
             }
diff --git a/components/Conversation/Controller/Conversation.php b/components/Conversation/Controller/Conversation.php
index b11ca7199d..ae3384ff00 100644
--- a/components/Conversation/Controller/Conversation.php
+++ b/components/Conversation/Controller/Conversation.php
@@ -28,7 +28,7 @@ declare(strict_types = 1);
 namespace Component\Conversation\Controller;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/components/Conversation/Conversation.php b/components/Conversation/Conversation.php
index a7af95c94c..cb8b2506ed 100644
--- a/components/Conversation/Conversation.php
+++ b/components/Conversation/Conversation.php
@@ -28,7 +28,7 @@ declare(strict_types = 1);
 namespace Component\Conversation;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
diff --git a/components/Conversation/Entity/Conversation.php b/components/Conversation/Entity/Conversation.php
index 86c56a4b2d..896b10831f 100644
--- a/components/Conversation/Entity/Conversation.php
+++ b/components/Conversation/Entity/Conversation.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Conversation\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Router\Router;
 
diff --git a/components/Conversation/Entity/ConversationMute.php b/components/Conversation/Entity/ConversationMute.php
index 4011e91304..f38c37df07 100644
--- a/components/Conversation/Entity/ConversationMute.php
+++ b/components/Conversation/Entity/ConversationMute.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Conversation\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Activity;
 use App\Entity\Actor;
diff --git a/components/FreeNetwork/Controller/Feeds.php b/components/FreeNetwork/Controller/Feeds.php
index 04e7169cee..da91bf8e11 100644
--- a/components/FreeNetwork/Controller/Feeds.php
+++ b/components/FreeNetwork/Controller/Feeds.php
@@ -34,7 +34,7 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use Component\Collection\Util\Controller\FeedController;
diff --git a/components/FreeNetwork/Entity/FreeNetworkActorProtocol.php b/components/FreeNetwork/Entity/FreeNetworkActorProtocol.php
index a5ac6e30d4..6c3e700800 100644
--- a/components/FreeNetwork/Entity/FreeNetworkActorProtocol.php
+++ b/components/FreeNetwork/Entity/FreeNetworkActorProtocol.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use Component\FreeNetwork\Util\Discovery;
diff --git a/components/FreeNetwork/FreeNetwork.php b/components/FreeNetwork/FreeNetwork.php
index 11119f33bf..f2c1d5bc75 100644
--- a/components/FreeNetwork/FreeNetwork.php
+++ b/components/FreeNetwork/FreeNetwork.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\FreeNetwork;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
diff --git a/components/Group/Controller/Group.php b/components/Group/Controller/Group.php
index 1929b5313e..7cb0be7a6f 100644
--- a/components/Group/Controller/Group.php
+++ b/components/Group/Controller/Group.php
@@ -26,7 +26,7 @@ namespace Component\Group\Controller;
 use App\Core\ActorLocalRoles;
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/components/Group/Controller/GroupFeed.php b/components/Group/Controller/GroupFeed.php
index 7f7365a520..422dfde4bb 100644
--- a/components/Group/Controller/GroupFeed.php
+++ b/components/Group/Controller/GroupFeed.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Group\Controller;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Router\Router;
diff --git a/components/Group/Entity/LocalGroup.php b/components/Group/Entity/LocalGroup.php
index 710b4f7d7a..b4bd353f9a 100644
--- a/components/Group/Entity/LocalGroup.php
+++ b/components/Group/Entity/LocalGroup.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Group\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use App\Util\Exception\NicknameEmptyException;
diff --git a/components/Group/tests/Entity/GroupTest.php b/components/Group/tests/Entity/GroupTest.php
index ba5d4a27a6..649b9a9ce1 100644
--- a/components/Group/tests/Entity/GroupTest.php
+++ b/components/Group/tests/Entity/GroupTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Group\tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Actor;
 use App\Util\GNUsocialTestCase;
 use Component\Group\Entity\LocalGroup;
diff --git a/components/Language/Controller/Language.php b/components/Language/Controller/Language.php
index 7cb430aca8..4940432b8c 100644
--- a/components/Language/Controller/Language.php
+++ b/components/Language/Controller/Language.php
@@ -25,7 +25,7 @@ namespace Component\Language\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
@@ -70,7 +70,7 @@ class Language extends Controller
                     ['actor_id' => $user->getId()],
                 );
 
-                $new_langs      = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
+                $new_langs = array_udiff($selected_langs, $existing_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
                 $removing_langs = array_udiff($existing_langs, $selected_langs, fn ($l, $r) => $l->getId() <=> $r->getId());
                 foreach ($new_langs as $l) {
                     DB::persist(ActorLanguage::create(['actor_id' => $user->getId(), 'language_id' => $l->getId(), 'ordering' => 0]));
diff --git a/components/Language/Entity/ActorLanguage.php b/components/Language/Entity/ActorLanguage.php
index de452fabdc..6ad172b8fe 100644
--- a/components/Language/Entity/ActorLanguage.php
+++ b/components/Language/Entity/ActorLanguage.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Language\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
diff --git a/components/Language/Entity/Language.php b/components/Language/Entity/Language.php
index 19a5e69aa9..2e98c9a855 100644
--- a/components/Language/Entity/Language.php
+++ b/components/Language/Entity/Language.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Language\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use function App\Core\I18n\_m;
 use App\Entity\Actor;
diff --git a/components/LeftPanel/Controller/EditFeeds.php b/components/LeftPanel/Controller/EditFeeds.php
index 0735e651a6..8ef877b0d8 100644
--- a/components/LeftPanel/Controller/EditFeeds.php
+++ b/components/LeftPanel/Controller/EditFeeds.php
@@ -25,7 +25,7 @@ namespace Component\LeftPanel\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Router\Router;
diff --git a/components/LeftPanel/LeftPanel.php b/components/LeftPanel/LeftPanel.php
index 89026b5cf6..a535af830a 100644
--- a/components/LeftPanel/LeftPanel.php
+++ b/components/LeftPanel/LeftPanel.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\LeftPanel;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
diff --git a/components/Link/Entity/Link.php b/components/Link/Entity/Link.php
index ec304165d3..e543bd3277 100644
--- a/components/Link/Entity/Link.php
+++ b/components/Link/Entity/Link.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Link\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\GSFile;
diff --git a/components/Link/Entity/NoteToLink.php b/components/Link/Entity/NoteToLink.php
index b2f37d5134..d55f62b1cb 100644
--- a/components/Link/Entity/NoteToLink.php
+++ b/components/Link/Entity/NoteToLink.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Link\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use DateTimeInterface;
diff --git a/components/Link/Link.php b/components/Link/Link.php
index 5101947e5d..15632499d5 100644
--- a/components/Link/Link.php
+++ b/components/Link/Link.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Link;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Component;
 use App\Entity\Actor;
diff --git a/components/Notification/Controller/Feed.php b/components/Notification/Controller/Feed.php
index 4ad3b192fc..a0c673c3ee 100644
--- a/components/Notification/Controller/Feed.php
+++ b/components/Notification/Controller/Feed.php
@@ -35,7 +35,7 @@ declare(strict_types = 1);
 namespace Component\Notification\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/components/Notification/Entity/Notification.php b/components/Notification/Entity/Notification.php
index e3fe758383..114b3f83c8 100644
--- a/components/Notification/Entity/Notification.php
+++ b/components/Notification/Entity/Notification.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Notification\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Activity;
 use App\Entity\Actor;
diff --git a/components/Notification/Notification.php b/components/Notification/Notification.php
index eb9f582ba5..cb5b13dbef 100644
--- a/components/Notification/Notification.php
+++ b/components/Notification/Notification.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Component\Notification;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/components/Person/Controller/PersonSettings.php b/components/Person/Controller/PersonSettings.php
index 74e924adcb..09592dc26e 100644
--- a/components/Person/Controller/PersonSettings.php
+++ b/components/Person/Controller/PersonSettings.php
@@ -38,7 +38,7 @@ namespace Component\Person\Controller;
 // {{{ Imports
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/components/Person/tests/Controller/PersonSettingsTest.php b/components/Person/tests/Controller/PersonSettingsTest.php
index a3274c64a9..e2e9b2d801 100644
--- a/components/Person/tests/Controller/PersonSettingsTest.php
+++ b/components/Person/tests/Controller/PersonSettingsTest.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Person\tests\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Router\Router;
 use App\Entity\LocalUser;
 use App\Util\GNUsocialTestCase;
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index 98ef5c8037..8dc8b0bff9 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Posting;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
diff --git a/components/Subscription/Controller/Subscribers.php b/components/Subscription/Controller/Subscribers.php
index cdc19f3130..8c044c2a72 100644
--- a/components/Subscription/Controller/Subscribers.php
+++ b/components/Subscription/Controller/Subscribers.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Component\Subscription\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/components/Subscription/Subscription.php b/components/Subscription/Subscription.php
index 2b9b594d0d..fc1b60c589 100644
--- a/components/Subscription/Subscription.php
+++ b/components/Subscription/Subscription.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Subscription;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
diff --git a/components/Tag/Entity/NoteTag.php b/components/Tag/Entity/NoteTag.php
index 20972c0a2d..6b856aed5b 100644
--- a/components/Tag/Entity/NoteTag.php
+++ b/components/Tag/Entity/NoteTag.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\Tag\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Router\Router;
 use App\Entity\Actor;
diff --git a/components/Tag/Entity/NoteTagBlock.php b/components/Tag/Entity/NoteTagBlock.php
index 7daf15abdf..c356ece251 100644
--- a/components/Tag/Entity/NoteTagBlock.php
+++ b/components/Tag/Entity/NoteTagBlock.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Component\Tag\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use Component\Tag\Tag;
 use DateTimeInterface;
diff --git a/components/Tag/Tag.php b/components/Tag/Tag.php
index c7343cded9..6338316337 100644
--- a/components/Tag/Tag.php
+++ b/components/Tag/Tag.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Component\Tag;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Component;
diff --git a/plugins/ActivityPub/ActivityPub.php b/plugins/ActivityPub/ActivityPub.php
index 3f5e955a17..435e1160f9 100644
--- a/plugins/ActivityPub/ActivityPub.php
+++ b/plugins/ActivityPub/ActivityPub.php
@@ -34,7 +34,7 @@ namespace Plugin\ActivityPub;
 
 use ActivityPhp\Type;
 use ActivityPhp\Type\AbstractObject;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\HTTPClient;
 use function App\Core\I18n\_m;
diff --git a/plugins/ActivityPub/Controller/Inbox.php b/plugins/ActivityPub/Controller/Inbox.php
index 1d3359b27d..5d52c302e0 100644
--- a/plugins/ActivityPub/Controller/Inbox.php
+++ b/plugins/ActivityPub/Controller/Inbox.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Core\Queue\Queue;
diff --git a/plugins/ActivityPub/Entity/ActivitypubActivity.php b/plugins/ActivityPub/Entity/ActivitypubActivity.php
index c4718a5870..977c04df4b 100644
--- a/plugins/ActivityPub/Entity/ActivitypubActivity.php
+++ b/plugins/ActivityPub/Entity/ActivitypubActivity.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ActivityPub\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Activity;
 use DateTimeInterface;
diff --git a/plugins/ActivityPub/Entity/ActivitypubActor.php b/plugins/ActivityPub/Entity/ActivitypubActor.php
index 35cf7baec4..d0dc3127c8 100644
--- a/plugins/ActivityPub/Entity/ActivitypubActor.php
+++ b/plugins/ActivityPub/Entity/ActivitypubActor.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/plugins/ActivityPub/Entity/ActivitypubObject.php b/plugins/ActivityPub/Entity/ActivitypubObject.php
index 5ad0f82e14..1101f6acb9 100644
--- a/plugins/ActivityPub/Entity/ActivitypubObject.php
+++ b/plugins/ActivityPub/Entity/ActivitypubObject.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ActivityPub\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/plugins/ActivityPub/Entity/ActivitypubRsa.php b/plugins/ActivityPub/Entity/ActivitypubRsa.php
index 5214451edf..4b7372bc45 100644
--- a/plugins/ActivityPub/Entity/ActivitypubRsa.php
+++ b/plugins/ActivityPub/Entity/ActivitypubRsa.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ActivityPub\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Log;
 use App\Entity\Actor;
diff --git a/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php b/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php
index 44fbe26887..8666adc6e1 100644
--- a/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php
+++ b/plugins/ActivityPub/Test/Fixtures/ActivityPubFixtures.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ActivityPub\Test\Fixtures;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
 use Plugin\ActivityPub\Util\Model\Activity;
diff --git a/plugins/ActivityPub/Util/Explorer.php b/plugins/ActivityPub/Util/Explorer.php
index 410e43e8c8..06a81fb8cc 100644
--- a/plugins/ActivityPub/Util/Explorer.php
+++ b/plugins/ActivityPub/Util/Explorer.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ActivityPub\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\HTTPClient;
 use App\Core\Log;
 use App\Entity\Actor;
diff --git a/plugins/ActivityPub/Util/Model/Activity.php b/plugins/ActivityPub/Util/Model/Activity.php
index 5076ba23bf..f985a945a9 100644
--- a/plugins/ActivityPub/Util/Model/Activity.php
+++ b/plugins/ActivityPub/Util/Model/Activity.php
@@ -34,7 +34,7 @@ namespace Plugin\ActivityPub\Util\Model;
 
 use ActivityPhp\Type;
 use ActivityPhp\Type\AbstractObject;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Log;
 use App\Core\Router\Router;
diff --git a/plugins/ActivityPub/Util/Model/ActivityCreate.php b/plugins/ActivityPub/Util/Model/ActivityCreate.php
index ddba48ddba..cb7b39e05e 100644
--- a/plugins/ActivityPub/Util/Model/ActivityCreate.php
+++ b/plugins/ActivityPub/Util/Model/ActivityCreate.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\Util\Model;
 
 use ActivityPhp\Type\AbstractObject;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Activity as GSActivity;
 use App\Util\Exception\NotImplementedException;
 use DateTime;
diff --git a/plugins/ActivityPub/Util/Model/ActivityFollow.php b/plugins/ActivityPub/Util/Model/ActivityFollow.php
index f788d417b5..e73822907e 100644
--- a/plugins/ActivityPub/Util/Model/ActivityFollow.php
+++ b/plugins/ActivityPub/Util/Model/ActivityFollow.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 namespace Plugin\ActivityPub\Util\Model;
 
 use ActivityPhp\Type\AbstractObject;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Activity as GSActivity;
 use App\Util\Exception\ClientException;
 use Component\Subscription\Subscription;
diff --git a/plugins/ActivityPub/Util/Model/Actor.php b/plugins/ActivityPub/Util/Model/Actor.php
index fa1a4645ff..4fe4acd09e 100644
--- a/plugins/ActivityPub/Util/Model/Actor.php
+++ b/plugins/ActivityPub/Util/Model/Actor.php
@@ -34,7 +34,7 @@ namespace Plugin\ActivityPub\Util\Model;
 
 use ActivityPhp\Type\AbstractObject;
 use App\Core\ActorLocalRoles;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
diff --git a/plugins/ActivityPub/Util/Model/Note.php b/plugins/ActivityPub/Util/Model/Note.php
index 32b87c18bb..5f0a392d8c 100644
--- a/plugins/ActivityPub/Util/Model/Note.php
+++ b/plugins/ActivityPub/Util/Model/Note.php
@@ -35,7 +35,7 @@ namespace Plugin\ActivityPub\Util\Model;
 use ActivityPhp\Type;
 use ActivityPhp\Type\AbstractObject;
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
diff --git a/plugins/AttachmentCollections/AttachmentCollections.php b/plugins/AttachmentCollections/AttachmentCollections.php
index f3f9fa3db8..09bc3bf8e6 100644
--- a/plugins/AttachmentCollections/AttachmentCollections.php
+++ b/plugins/AttachmentCollections/AttachmentCollections.php
@@ -31,7 +31,7 @@ declare(strict_types = 1);
 
 namespace Plugin\AttachmentCollections;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Plugin;
diff --git a/plugins/AttachmentCollections/Controller/AttachmentCollections.php b/plugins/AttachmentCollections/Controller/AttachmentCollections.php
index 91aa4ac258..dc672db9c9 100644
--- a/plugins/AttachmentCollections/Controller/AttachmentCollections.php
+++ b/plugins/AttachmentCollections/Controller/AttachmentCollections.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\AttachmentCollections\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Router\Router;
 use Component\Collection\Util\Controller\MetaCollectionController;
 use Plugin\AttachmentCollections\Entity\AttachmentCollection;
diff --git a/plugins/AttachmentShowRelated/AttachmentShowRelated.php b/plugins/AttachmentShowRelated/AttachmentShowRelated.php
index e6e769461b..77f3604e21 100644
--- a/plugins/AttachmentShowRelated/AttachmentShowRelated.php
+++ b/plugins/AttachmentShowRelated/AttachmentShowRelated.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\AttachmentShowRelated;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use App\Util\Common;
diff --git a/plugins/Bundles/Bundles.php b/plugins/Bundles/Bundles.php
index b489edfb6f..289d4e043e 100644
--- a/plugins/Bundles/Bundles.php
+++ b/plugins/Bundles/Bundles.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Bundles;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Modules\Plugin;
 use App\Entity\Actor;
 use Component\Collection\Util\MetaCollectionTrait;
diff --git a/plugins/Bundles/Controller/BundleCollections.php b/plugins/Bundles/Controller/BundleCollections.php
index 75934586fc..7c75020acd 100644
--- a/plugins/Bundles/Controller/BundleCollections.php
+++ b/plugins/Bundles/Controller/BundleCollections.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Bundles\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Router\Router;
 use Component\Collection\Util\Controller\MetaCollectionController;
 use Plugin\Bundles\Entity\BundleCollection;
diff --git a/plugins/Cover/Controller/Cover.php b/plugins/Cover/Controller/Cover.php
index 92d284bd85..9cdaa14f58 100644
--- a/plugins/Cover/Controller/Cover.php
+++ b/plugins/Cover/Controller/Cover.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Cover\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use App\Core\GSFile;
 use function App\Core\I18n\_m;
diff --git a/plugins/Cover/Cover.php b/plugins/Cover/Cover.php
index 583668b745..2fc02d20d2 100644
--- a/plugins/Cover/Cover.php
+++ b/plugins/Cover/Cover.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Cover;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use App\Core\Router\RouteLoader;
diff --git a/plugins/Cover/Entity/Cover.php b/plugins/Cover/Entity/Cover.php
index 13350d918a..03da189574 100644
--- a/plugins/Cover/Entity/Cover.php
+++ b/plugins/Cover/Entity/Cover.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Cover\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Util\Common;
 use Component\Attachment\Entity\Attachment;
diff --git a/plugins/DeleteNote/Controller/DeleteNote.php b/plugins/DeleteNote/Controller/DeleteNote.php
index 4f0ab14282..8d74c9e3de 100644
--- a/plugins/DeleteNote/Controller/DeleteNote.php
+++ b/plugins/DeleteNote/Controller/DeleteNote.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\DeleteNote\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Log;
diff --git a/plugins/DeleteNote/DeleteNote.php b/plugins/DeleteNote/DeleteNote.php
index 289839afc4..84d46443ab 100644
--- a/plugins/DeleteNote/DeleteNote.php
+++ b/plugins/DeleteNote/DeleteNote.php
@@ -23,7 +23,7 @@ namespace Plugin\DeleteNote;
 
 use ActivityPhp\Type\AbstractObject;
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\NoteHandlerPlugin;
diff --git a/plugins/Directory/Controller/Directory.php b/plugins/Directory/Controller/Directory.php
index 1271661ffd..de0456e8a2 100644
--- a/plugins/Directory/Controller/Directory.php
+++ b/plugins/Directory/Controller/Directory.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Directory\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Entity\Actor;
 use App\Util\Common;
@@ -110,7 +110,7 @@ class Directory extends CircleController
         // -------- *** --------
 
         // -------- Start setting up the queries --------
-        $actor_query_fn  = fn (int $actor_type) => DB::findBy(Actor::class, ['type' => $actor_type], order_by: $order_by, limit: $limit, offset: $offset);
+        $actor_query_fn = fn (int $actor_type) => DB::findBy(Actor::class, ['type' => $actor_type], order_by: $order_by, limit: $limit, offset: $offset);
         $minmax_query_fn = $general_query_fn_fn(func: $order_by_op === 'ASC' ? 'MAX' : 'MIN', order: $order_by_op);
         $count_query_fn  = $general_query_fn_fn(func: 'COUNT', order: $order_by_op);
         // -------- *** --------
diff --git a/plugins/Embed/Embed.php b/plugins/Embed/Embed.php
index ebb9d04a0f..a85919b32d 100644
--- a/plugins/Embed/Embed.php
+++ b/plugins/Embed/Embed.php
@@ -38,7 +38,7 @@ declare(strict_types = 1);
 namespace Plugin\Embed;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
diff --git a/plugins/Embed/Entity/AttachmentEmbed.php b/plugins/Embed/Entity/AttachmentEmbed.php
index de57c76a89..4e6fa7be41 100644
--- a/plugins/Embed/Entity/AttachmentEmbed.php
+++ b/plugins/Embed/Entity/AttachmentEmbed.php
@@ -34,7 +34,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Embed\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use Component\Attachment\Entity\Attachment;
 use DateTimeInterface;
diff --git a/plugins/Favourite/Controller/Favourite.php b/plugins/Favourite/Controller/Favourite.php
index e1caa6f6d8..eb45523e4f 100644
--- a/plugins/Favourite/Controller/Favourite.php
+++ b/plugins/Favourite/Controller/Favourite.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Favourite\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/plugins/Favourite/Entity/NoteFavourite.php b/plugins/Favourite/Entity/NoteFavourite.php
index d28df12655..71b0d828f6 100644
--- a/plugins/Favourite/Entity/NoteFavourite.php
+++ b/plugins/Favourite/Entity/NoteFavourite.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Plugin\Favourite\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
diff --git a/plugins/Favourite/Favourite.php b/plugins/Favourite/Favourite.php
index 82d9e27177..8fa6a37610 100644
--- a/plugins/Favourite/Favourite.php
+++ b/plugins/Favourite/Favourite.php
@@ -31,7 +31,7 @@ declare(strict_types = 1);
 namespace Plugin\Favourite;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\NoteHandlerPlugin;
diff --git a/plugins/FileQuota/FileQuota.php b/plugins/FileQuota/FileQuota.php
index ba4c4f64eb..22faa35bfc 100644
--- a/plugins/FileQuota/FileQuota.php
+++ b/plugins/FileQuota/FileQuota.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\FileQuota;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Plugin;
diff --git a/plugins/OAuth2/Controller/Client.php b/plugins/OAuth2/Controller/Client.php
index d97bda9f3e..c011377cba 100644
--- a/plugins/OAuth2/Controller/Client.php
+++ b/plugins/OAuth2/Controller/Client.php
@@ -34,7 +34,7 @@ declare(strict_types = 1);
 namespace Plugin\OAuth2\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Core\Log;
 use App\Util\Exception\ClientException;
diff --git a/plugins/OAuth2/Repository/AccessToken.php b/plugins/OAuth2/Repository/AccessToken.php
index 88efa15c99..1a25e1405d 100644
--- a/plugins/OAuth2/Repository/AccessToken.php
+++ b/plugins/OAuth2/Repository/AccessToken.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 
 namespace Plugin\OAuth2\Repository;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use League\OAuth2\Server\Entities\AccessTokenEntityInterface;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
diff --git a/plugins/OAuth2/Repository/AuthCode.php b/plugins/OAuth2/Repository/AuthCode.php
index 4a51d6e81e..114b618905 100644
--- a/plugins/OAuth2/Repository/AuthCode.php
+++ b/plugins/OAuth2/Repository/AuthCode.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 
 namespace Plugin\OAuth2\Repository;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use League\OAuth2\Server\Entities\AuthCodeEntityInterface;
 use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
 use Plugin\OAuth2\Entity;
diff --git a/plugins/OAuth2/Repository/Client.php b/plugins/OAuth2/Repository/Client.php
index dda5fa55c4..0078ed2a46 100644
--- a/plugins/OAuth2/Repository/Client.php
+++ b/plugins/OAuth2/Repository/Client.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 
 namespace Plugin\OAuth2\Repository;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Util\Exception\NotFoundException;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
diff --git a/plugins/OAuth2/Repository/RefreshToken.php b/plugins/OAuth2/Repository/RefreshToken.php
index acb8af4c3d..8b1233efbd 100644
--- a/plugins/OAuth2/Repository/RefreshToken.php
+++ b/plugins/OAuth2/Repository/RefreshToken.php
@@ -33,7 +33,7 @@ declare(strict_types = 1);
 
 namespace Plugin\OAuth2\Repository;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use League\OAuth2\Server\Entities\RefreshTokenEntityInterface;
 use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
 use Plugin\OAuth2\Entity;
diff --git a/plugins/Oomox/Controller/Oomox.php b/plugins/Oomox/Controller/Oomox.php
index bac3b84d63..ac5d925472 100644
--- a/plugins/Oomox/Controller/Oomox.php
+++ b/plugins/Oomox/Controller/Oomox.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\Oomox\Controller;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
diff --git a/plugins/Oomox/Oomox.php b/plugins/Oomox/Oomox.php
index ba14bddc8b..d78047b6bf 100644
--- a/plugins/Oomox/Oomox.php
+++ b/plugins/Oomox/Oomox.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 namespace Plugin\Oomox;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use App\Core\Router\RouteLoader;
diff --git a/plugins/PinnedNotes/Controller/PinnedNotes.php b/plugins/PinnedNotes/Controller/PinnedNotes.php
index 2a3ecd52c1..57f71d9638 100644
--- a/plugins/PinnedNotes/Controller/PinnedNotes.php
+++ b/plugins/PinnedNotes/Controller/PinnedNotes.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\PinnedNotes\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Router\Router;
diff --git a/plugins/PinnedNotes/PinnedNotes.php b/plugins/PinnedNotes/PinnedNotes.php
index 91054aa4db..f408b3357c 100644
--- a/plugins/PinnedNotes/PinnedNotes.php
+++ b/plugins/PinnedNotes/PinnedNotes.php
@@ -31,7 +31,7 @@ declare(strict_types = 1);
 
 namespace Plugin\PinnedNotes;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use App\Core\Router\RouteLoader;
diff --git a/plugins/Poll/Controller/AnswerPoll.php b/plugins/Poll/Controller/AnswerPoll.php
index 65562c3960..cee3b32dad 100644
--- a/plugins/Poll/Controller/AnswerPoll.php
+++ b/plugins/Poll/Controller/AnswerPoll.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Poll\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use App\Util\Common;
 use App\Util\Exception\InvalidFormException;
diff --git a/plugins/Poll/Controller/NewPoll.php b/plugins/Poll/Controller/NewPoll.php
index 2f1ea7f0b2..867dda5958 100644
--- a/plugins/Poll/Controller/NewPoll.php
+++ b/plugins/Poll/Controller/NewPoll.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Poll\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Security;
diff --git a/plugins/Poll/Entity/Poll.php b/plugins/Poll/Entity/Poll.php
index cb073b8577..51b3c631bd 100644
--- a/plugins/Poll/Entity/Poll.php
+++ b/plugins/Poll/Entity/Poll.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Poll\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/plugins/Poll/Entity/PollResponse.php b/plugins/Poll/Entity/PollResponse.php
index 3ea4eb2925..d522ed97d4 100644
--- a/plugins/Poll/Entity/PollResponse.php
+++ b/plugins/Poll/Entity/PollResponse.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Poll\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use DateTimeInterface;
 
diff --git a/plugins/Poll/Poll.php b/plugins/Poll/Poll.php
index c830ac31f2..296ce4b2db 100644
--- a/plugins/Poll/Poll.php
+++ b/plugins/Poll/Poll.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 
 namespace Plugin\Poll;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/plugins/ProfileColor/Controller/ProfileColor.php b/plugins/ProfileColor/Controller/ProfileColor.php
index 3c2b642c58..cc795c8fa7 100644
--- a/plugins/ProfileColor/Controller/ProfileColor.php
+++ b/plugins/ProfileColor/Controller/ProfileColor.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace Plugin\ProfileColor\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
diff --git a/plugins/ProfileColor/ProfileColor.php b/plugins/ProfileColor/ProfileColor.php
index 75d9b6d025..6d346df7a4 100644
--- a/plugins/ProfileColor/ProfileColor.php
+++ b/plugins/ProfileColor/ProfileColor.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 namespace Plugin\ProfileColor;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use App\Core\Router\RouteLoader;
diff --git a/plugins/RelatedTags/RelatedTags.php b/plugins/RelatedTags/RelatedTags.php
index 9913ca6857..bcbd482fea 100644
--- a/plugins/RelatedTags/RelatedTags.php
+++ b/plugins/RelatedTags/RelatedTags.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace Plugin\RelatedTags;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Modules\Plugin;
 use Component\Circle\Entity\ActorTag;
diff --git a/plugins/RepeatNote/Controller/Repeat.php b/plugins/RepeatNote/Controller/Repeat.php
index f57532cd4e..5156d1914f 100644
--- a/plugins/RepeatNote/Controller/Repeat.php
+++ b/plugins/RepeatNote/Controller/Repeat.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\RepeatNote\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/plugins/RepeatNote/Entity/NoteRepeat.php b/plugins/RepeatNote/Entity/NoteRepeat.php
index 6505cc4cc3..7347781589 100644
--- a/plugins/RepeatNote/Entity/NoteRepeat.php
+++ b/plugins/RepeatNote/Entity/NoteRepeat.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\RepeatNote\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
diff --git a/plugins/RepeatNote/RepeatNote.php b/plugins/RepeatNote/RepeatNote.php
index ff4c3d112b..ab12ab1f77 100644
--- a/plugins/RepeatNote/RepeatNote.php
+++ b/plugins/RepeatNote/RepeatNote.php
@@ -29,7 +29,7 @@ declare(strict_types = 1);
 namespace Plugin\RepeatNote;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\NoteHandlerPlugin;
diff --git a/plugins/StoreRemoteMedia/StoreRemoteMedia.php b/plugins/StoreRemoteMedia/StoreRemoteMedia.php
index 670117c844..967d91b2aa 100644
--- a/plugins/StoreRemoteMedia/StoreRemoteMedia.php
+++ b/plugins/StoreRemoteMedia/StoreRemoteMedia.php
@@ -20,7 +20,7 @@ declare(strict_types = 1);
 
 namespace Plugin\StoreRemoteMedia;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\GSFile;
 use App\Core\HTTPClient;
diff --git a/plugins/TagBasedFiltering/Controller/AddBlocked.php b/plugins/TagBasedFiltering/Controller/AddBlocked.php
index d50e8d480d..4d950b29a7 100644
--- a/plugins/TagBasedFiltering/Controller/AddBlocked.php
+++ b/plugins/TagBasedFiltering/Controller/AddBlocked.php
@@ -25,7 +25,7 @@ namespace Plugin\TagBasedFiltering\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Entity\Actor;
diff --git a/plugins/TagBasedFiltering/Controller/EditBlocked.php b/plugins/TagBasedFiltering/Controller/EditBlocked.php
index d0910d57ec..e72b5d8eaf 100644
--- a/plugins/TagBasedFiltering/Controller/EditBlocked.php
+++ b/plugins/TagBasedFiltering/Controller/EditBlocked.php
@@ -25,7 +25,7 @@ namespace Plugin\TagBasedFiltering\Controller;
 
 use App\Core\Cache;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Util\Common;
diff --git a/plugins/TagBasedFiltering/TagBasedFiltering.php b/plugins/TagBasedFiltering/TagBasedFiltering.php
index af609d0677..a2a36f6841 100644
--- a/plugins/TagBasedFiltering/TagBasedFiltering.php
+++ b/plugins/TagBasedFiltering/TagBasedFiltering.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\TagBasedFiltering;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use function App\Core\I18n\_m;
 use App\Core\Modules\Plugin;
diff --git a/plugins/WebHooks/Controller/WebHooks.php b/plugins/WebHooks/Controller/WebHooks.php
index 2a64697342..50465e5e2d 100644
--- a/plugins/WebHooks/Controller/WebHooks.php
+++ b/plugins/WebHooks/Controller/WebHooks.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace Plugin\WebHooks\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Core\Router\Router;
diff --git a/plugins/WebHooks/WebHooks.php b/plugins/WebHooks/WebHooks.php
index b22ae6d47a..5369ee595a 100644
--- a/plugins/WebHooks/WebHooks.php
+++ b/plugins/WebHooks/WebHooks.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace Plugin\WebHooks;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\HTTPClient;
 use App\Core\Log;
diff --git a/plugins/WebMonetization/WebMonetization.php b/plugins/WebMonetization/WebMonetization.php
index bd396b44de..48a92fc4b2 100644
--- a/plugins/WebMonetization/WebMonetization.php
+++ b/plugins/WebMonetization/WebMonetization.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 namespace Plugin\WebMonetization;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/src/Command/PopulateInitialValuesCommand.php b/src/Command/PopulateInitialValuesCommand.php
index 0674886ce1..2ae9c99da6 100644
--- a/src/Command/PopulateInitialValuesCommand.php
+++ b/src/Command/PopulateInitialValuesCommand.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace App\Command;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use Component\Language\Entity\Language;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/src/Controller/Activity.php b/src/Controller/Activity.php
index 88b668826f..f131761052 100644
--- a/src/Controller/Activity.php
+++ b/src/Controller/Activity.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace App\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Exception\ClientException;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Controller/Note.php b/src/Controller/Note.php
index 146fc1287d..8b0cf83a6c 100644
--- a/src/Controller/Note.php
+++ b/src/Controller/Note.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace App\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Entity\Activity;
 use App\Util\Common;
diff --git a/src/Controller/ResetPassword.php b/src/Controller/ResetPassword.php
index aeaa2412ff..6dc5cbb582 100644
--- a/src/Controller/ResetPassword.php
+++ b/src/Controller/ResetPassword.php
@@ -5,7 +5,7 @@ declare(strict_types = 1);
 namespace App\Controller;
 
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use function App\Core\I18n\_m;
 use App\Entity\LocalUser;
diff --git a/src/Controller/Security.php b/src/Controller/Security.php
index f8deb43883..f6495cc7af 100644
--- a/src/Controller/Security.php
+++ b/src/Controller/Security.php
@@ -6,7 +6,7 @@ namespace App\Controller;
 
 use App\Core\ActorLocalRoles;
 use App\Core\Controller;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Form;
 use function App\Core\I18n\_m;
diff --git a/src/Core/Cache.php b/src/Core/Cache.php
index 63a19e7ac9..1267d1c08d 100644
--- a/src/Core/Cache.php
+++ b/src/Core/Cache.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
 use App\Entity\Note;
diff --git a/src/Core/DB/DB.php b/src/Core/DB.php
similarity index 99%
rename from src/Core/DB/DB.php
rename to src/Core/DB.php
index afc8d9f6e8..efd01062ef 100644
--- a/src/Core/DB/DB.php
+++ b/src/Core/DB.php
@@ -28,13 +28,12 @@ declare(strict_types = 1);
  * @category DB
  *
  * @author    Hugo Sales <hugo@hsal.es>
- * @copyright 2020-2021 Free Software Foundation, Inc http://www.fsf.org
+ * @copyright 2020-2022 Free Software Foundation, Inc http://www.fsf.org
  * @license   https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
  */
 
-namespace App\Core\DB;
+namespace App\Core;
 
-use App\Core\Entity;
 use App\Util\Exception\DuplicateFoundException;
 use App\Util\Exception\NotFoundException;
 use Closure;
diff --git a/src/Core/Entity.php b/src/Core/Entity.php
index b736e62983..eaa89c3d2e 100644
--- a/src/Core/Entity.php
+++ b/src/Core/Entity.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Actor;
 use App\Util\Exception\NotFoundException;
 use App\Util\Formatting;
diff --git a/src/Core/Form.php b/src/Core/Form.php
index 8158390af9..8d8ebd6cd3 100644
--- a/src/Core/Form.php
+++ b/src/Core/Form.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace App\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Core\Router\Router;
 use App\Util\Common;
diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php
index 0f20fd5c8e..84f034bd1f 100644
--- a/src/Core/GNUsocial.php
+++ b/src/Core/GNUsocial.php
@@ -44,7 +44,7 @@ declare(strict_types = 1);
 
 namespace App\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\I18n\I18n;
 use App\Core\Queue\Queue;
 use App\Core\Router\Router;
diff --git a/src/Core/GSFile.php b/src/Core/GSFile.php
index 6d8d4759cf..b1c74a69c2 100644
--- a/src/Core/GSFile.php
+++ b/src/Core/GSFile.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use function App\Core\I18n\_m;
 use App\Util\Common;
 use App\Util\Exception\DuplicateFoundException;
diff --git a/src/Entity/Activity.php b/src/Entity/Activity.php
index 654d3bd8ea..9c6a384323 100644
--- a/src/Entity/Activity.php
+++ b/src/Entity/Activity.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use Component\Notification\Entity\Attention;
 use Component\Notification\Entity\Notification;
diff --git a/src/Entity/Actor.php b/src/Entity/Actor.php
index a2897362c9..9d566e7584 100644
--- a/src/Entity/Actor.php
+++ b/src/Entity/Actor.php
@@ -25,7 +25,7 @@ namespace App\Entity;
 
 use App\Core\ActorLocalRoles;
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\Router\Router;
diff --git a/src/Entity/Feed.php b/src/Entity/Feed.php
index b2927a1c2d..73b9e308d5 100644
--- a/src/Entity/Feed.php
+++ b/src/Entity/Feed.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace App\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use function App\Core\I18n\_m;
diff --git a/src/Entity/LocalUser.php b/src/Entity/LocalUser.php
index 7cd27dfd66..07216d7e5e 100644
--- a/src/Entity/LocalUser.php
+++ b/src/Entity/LocalUser.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace App\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\ActorLocalRoles;
 use App\Util\Common;
diff --git a/src/Entity/Note.php b/src/Entity/Note.php
index dc261a96b0..362f8d24f8 100644
--- a/src/Entity/Note.php
+++ b/src/Entity/Note.php
@@ -25,7 +25,7 @@ namespace App\Entity;
 
 use App\Core\ActorLocalRoles;
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Entity;
 use App\Core\Event;
 use App\Core\Log;
diff --git a/src/PHPStan/ClassFromTableNameDynamicStaticMethodReturnTypeExtension.php b/src/PHPStan/ClassFromTableNameDynamicStaticMethodReturnTypeExtension.php
index 5ec17b998c..1e14d939d7 100644
--- a/src/PHPStan/ClassFromTableNameDynamicStaticMethodReturnTypeExtension.php
+++ b/src/PHPStan/ClassFromTableNameDynamicStaticMethodReturnTypeExtension.php
@@ -4,7 +4,7 @@ declare(strict_types = 1);
 
 namespace App\PHPStan;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
 use PhpParser\Node\Scalar\String_;
@@ -22,7 +22,7 @@ class ClassFromTableNameDynamicStaticMethodReturnTypeExtension implements Dynami
 
     public function getClass(): string
     {
-        return \App\Core\DB\DB::class;
+        return \App\Core\DB::class;
     }
 
     public function isStaticMethodSupported(MethodReflection $methodReflection): bool
diff --git a/src/Util/Formatting.php b/src/Util/Formatting.php
index 813033e108..54f5068f19 100644
--- a/src/Util/Formatting.php
+++ b/src/Util/Formatting.php
@@ -32,7 +32,7 @@ declare(strict_types = 1);
 
 namespace App\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Event;
 use App\Core\Log;
 use App\Entity\Actor;
diff --git a/src/Util/Nickname.php b/src/Util/Nickname.php
index f234458799..95bc85735a 100644
--- a/src/Util/Nickname.php
+++ b/src/Util/Nickname.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\LocalUser;
 use App\Util\Exception\BugFoundException;
 use App\Util\Exception\DuplicateFoundException;
diff --git a/tests/Controller/AdminTest.php b/tests/Controller/AdminTest.php
index 5f8a6570bb..f72dedaf8b 100644
--- a/tests/Controller/AdminTest.php
+++ b/tests/Controller/AdminTest.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Test\Controller;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\LocalUser;
 use App\Util\Common;
 use App\Util\Formatting;
diff --git a/tests/Core/DB/DBTest.php b/tests/Core/DB/DBTest.php
index 7b50455927..1513ac28f1 100644
--- a/tests/Core/DB/DBTest.php
+++ b/tests/Core/DB/DBTest.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace App\Test\Core\DB;
 
 use App\Core\ActorLocalRoles;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
 use App\Util\Exception\DuplicateFoundException;
diff --git a/tests/Core/DB/UpdateListenerTest.php b/tests/Core/DB/UpdateListenerTest.php
index 0aadd2b0c9..9be111aca1 100644
--- a/tests/Core/DB/UpdateListenerTest.php
+++ b/tests/Core/DB/UpdateListenerTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace App\Test\Core\DB;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\DB\UpdateListener;
 use App\Entity\Actor;
 use App\Util\GNUsocialTestCase;
diff --git a/tests/Core/EntityTest.php b/tests/Core/EntityTest.php
index bbdefa7bcd..5f9c88a6e5 100644
--- a/tests/Core/EntityTest.php
+++ b/tests/Core/EntityTest.php
@@ -23,7 +23,7 @@ declare(strict_types = 1);
 
 namespace App\Test\Core;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\LocalUser;
 use App\Util\GNUsocialTestCase;
 use BadMethodCallException;
diff --git a/tests/Core/FormTest.php b/tests/Core/FormTest.php
index bc4cc2e99e..a3a36f9770 100644
--- a/tests/Core/FormTest.php
+++ b/tests/Core/FormTest.php
@@ -24,7 +24,7 @@ declare(strict_types = 1);
 namespace App\Test\Core;
 
 use App\Core\ActorLocalRoles;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Form;
 use App\Entity\Actor;
 use App\Util\Exception\ServerException;
diff --git a/tests/Entity/ActorTest.php b/tests/Entity/ActorTest.php
index 30ab80e4fb..f8fe19e523 100644
--- a/tests/Entity/ActorTest.php
+++ b/tests/Entity/ActorTest.php
@@ -22,7 +22,7 @@ declare(strict_types = 1);
 namespace App\Tests\Entity;
 
 use App\Core\Cache;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Entity\Actor;
 use App\Util\GNUsocialTestCase;
 use Component\Circle\Entity\ActorTag;
diff --git a/tests/Entity/NoteTest.php b/tests/Entity/NoteTest.php
index 17558014d0..73f0513c6b 100644
--- a/tests/Entity/NoteTest.php
+++ b/tests/Entity/NoteTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace App\Tests\Entity;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\VisibilityScope;
 use App\Entity\Actor;
 use App\Entity\Note;
diff --git a/tests/Util/CommonTest.php b/tests/Util/CommonTest.php
index 44cf956b36..97c67cf891 100644
--- a/tests/Util/CommonTest.php
+++ b/tests/Util/CommonTest.php
@@ -21,7 +21,7 @@ declare(strict_types = 1);
 
 namespace App\Tests\Util;
 
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\Security;
 use App\Entity\Actor;
 use App\Entity\LocalUser;
diff --git a/tests/fixtures/MediaFixtures.php b/tests/fixtures/MediaFixtures.php
index fcf7e383f2..fdabe03d87 100644
--- a/tests/fixtures/MediaFixtures.php
+++ b/tests/fixtures/MediaFixtures.php
@@ -5,7 +5,7 @@ declare(strict_types = 1);
 namespace App\Test\Fixtures;
 
 use App\Core\ActorLocalRoles;
-use App\Core\DB\DB;
+use App\Core\DB;
 use App\Core\GSFile;
 use App\Entity\Activity;
 use App\Entity\Actor;