diff --git a/.phpcs.xml b/.phpcs.xml
index 34df120ec..299768918 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -25,12 +25,10 @@
         <exclude name="PSR1.Files.SideEffects" />
         <exclude name="PSR1.Methods.CamelCapsMethodName" />
 
-        <exclude name="PSR2.Classes.ClassDeclaration" />
-        <exclude name="PSR2.Classes.PropertyDeclaration" />
+        <exclude name="PSR2.Classes.ClassDeclaration.OpenBraceNewLine" />
+        <exclude name="PSR2.Classes.PropertyDeclaration.SpacingAfterType" />
         <exclude name="PSR2.Methods.FunctionCallSignature" />
-        <exclude name="PSR2.Methods.FunctionClosingBrace" />
 
-        <exclude name="PSR12.Classes.ClassInstantiation" />
         <exclude name="PSR12.Classes.ClosingBrace" />
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing" />
         <exclude name="PSR12.Files.FileHeader" />
diff --git a/app/API/GenerateInvite.php b/app/API/GenerateInvite.php
index b87265ef0..4879a7683 100644
--- a/app/API/GenerateInvite.php
+++ b/app/API/GenerateInvite.php
@@ -6,7 +6,7 @@
 
 class GenerateInvite extends AbstractAPI {
     public function run() {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $interviewer = null;
         if (isset($_GET['interviewer_id'])) {
             $interviewer = $userMan->findById((int)$_GET['interviewer_id']);
@@ -39,7 +39,7 @@ public function run() {
             $interviewer->id(), $key, $email, "Passed Interview"
         );
         if (!empty($_GET['email'])) {
-            (new Mail)->send($email, 'New account confirmation at ' . SITE_NAME,
+            (new Mail())->send($email, 'New account confirmation at ' . SITE_NAME,
                 self::$twig->render('email/invite-interviewer.twig', [
                     'inviter_name' => $interviewer->username(),
                     'inviter_key' => $key,
diff --git a/app/API/Request.php b/app/API/Request.php
index bb40f5cad..70fc1aa10 100644
--- a/app/API/Request.php
+++ b/app/API/Request.php
@@ -4,7 +4,7 @@
 
 class Request extends AbstractAPI {
     public function run() {
-        $request = (new \Gazelle\Manager\Request)->findById((int)($_GET['request_id'] ?? 0));
+        $request = (new \Gazelle\Manager\Request())->findById((int)($_GET['request_id'] ?? 0));
         if (is_null($request)) {
             json_error('Missing request id');
         }
diff --git a/app/API/Torrent.php b/app/API/Torrent.php
index 8b0305854..76edeb83b 100644
--- a/app/API/Torrent.php
+++ b/app/API/Torrent.php
@@ -14,7 +14,7 @@ public function run() {
     }
 
     protected function torrent(int $id): array {
-        $torrent = (new \Gazelle\Manager\Torrent)->findById($id);
+        $torrent = (new \Gazelle\Manager\Torrent())->findById($id);
         if (is_null($torrent)) {
             json_error('Torrent not found');
         }
@@ -45,7 +45,7 @@ protected function torrent(int $id): array {
     }
 
     protected function tgroup(int $id): array {
-        $tgroup = (new \Gazelle\Manager\TGroup)->findById($id);
+        $tgroup = (new \Gazelle\Manager\TGroup())->findById($id);
         if (is_null($tgroup)) {
             json_error('Group not found');
         }
diff --git a/app/Applicant.php b/app/Applicant.php
index c9fc5ecc6..17ffab00e 100644
--- a/app/Applicant.php
+++ b/app/Applicant.php
@@ -8,7 +8,7 @@ class Applicant extends BaseObject {
     final public const ENTRIES_PER_PAGE = 1000; // TODO: change to 50 and implement pagination
 
     public function flush(): static {
-        (new Manager\Applicant)->flush();
+        (new Manager\Applicant())->flush();
         if (isset($this->info)) {
             self::$cache->delete_value("user_applicant_{$this->userId()}");
         }
diff --git a/app/ApplicantRole.php b/app/ApplicantRole.php
index 3ad73ffec..6e475a4d1 100644
--- a/app/ApplicantRole.php
+++ b/app/ApplicantRole.php
@@ -91,14 +91,14 @@ public function apply(User $user, string $body): Applicant {
             ", $this->id, $user->id(), $body,
                 (new Manager\Thread())->createThread('staff-role')->id()
         );
-        (new Manager\Applicant)->flush();
-        (new Manager\ApplicantRole)->flush();
+        (new Manager\Applicant())->flush();
+        (new Manager\ApplicantRole())->flush();
         return new \Gazelle\Applicant(self::$db->inserted_id());
     }
 
     public function modify(): bool {
         $modified = false;
-        $userMan  = new Manager\User;
+        $userMan  = new Manager\User();
         $list = preg_split('/\s+/', $this->clearField('viewer_list'));
         $viewerList = empty($list)
             ? []
@@ -141,8 +141,8 @@ public function remove(): int {
             ", $this->id
         );
         $affected = self::$db->affected_rows();
-        (new Manager\Applicant)->flush();
-        (new Manager\ApplicantRole)->flush();
+        (new Manager\Applicant())->flush();
+        (new Manager\ApplicantRole())->flush();
         $this->flush();
         return $affected;
     }
diff --git a/app/Artist.php b/app/Artist.php
index eaa844403..d3351bdc8 100644
--- a/app/Artist.php
+++ b/app/Artist.php
@@ -485,7 +485,7 @@ public function aliasInfo(): array {
         }
 
         // go through the list and tie the alias to its non-redirecting ancestor
-        $userMan = new Manager\User;
+        $userMan = new Manager\User();
         $alias = [];
         foreach ($result as $aliasId => $info) {
             if ($info['redirectId']) {
@@ -494,7 +494,7 @@ public function aliasInfo(): array {
                     'alias_id' => $aliasId,
                     'name'     => $info['aliasName'],
                     'user'     => $userMan->findById($info['userId']),
-               ];
+                ];
             } else {
                 $alias[$aliasId] = [
                     'alias'    => [],
@@ -796,7 +796,7 @@ public function rename(int $aliasId, string $name, Manager\Request $reqMan, User
             UPDATE IGNORE torrents_artists SET AliasID = ?  WHERE AliasID = ?
             ", $newId, $aliasId
         );
-        $tgMan = new Manager\TGroup;
+        $tgMan = new Manager\TGroup();
         foreach ($groups as $groupId) {
             $tgMan->findById($groupId)?->refresh();
         }
@@ -984,7 +984,7 @@ public function remove(User $user, Log $logger): int {
         self::$db->prepared_query("DELETE FROM artists_tags WHERE ArtistID = ?", $id);
         self::$db->prepared_query("DELETE FROM wiki_artists WHERE PageID = ?", $id);
 
-        (new \Gazelle\Manager\Comment)->remove('artist', $id);
+        (new \Gazelle\Manager\Comment())->remove('artist', $id);
         $logger->general("Artist $id ($name) was deleted by " . $user->username());
         self::$db->commit();
 
diff --git a/app/Cache.php b/app/Cache.php
index f21e8ce74..450d16dae 100644
--- a/app/Cache.php
+++ b/app/Cache.php
@@ -87,7 +87,7 @@ public function get_value(string $key): mixed {
         $begin = microtime(true);
         if (empty($key)) {
             $value = false;
-         } else {
+        } else {
             $value = $this->get($key);
             if (!isset($this->hit[$key])) {
                 $this->hit[$key] = 0;
diff --git a/app/Collage/AbstractCollage.php b/app/Collage/AbstractCollage.php
index dc9a9ab14..3177b8eb2 100644
--- a/app/Collage/AbstractCollage.php
+++ b/app/Collage/AbstractCollage.php
@@ -145,7 +145,7 @@ public function addEntry(int $entryId, \Gazelle\User $user): int {
     /**
      * Remove an entry from a collage
      */
-   public function removeEntry(int $entryId): int {
+    public function removeEntry(int $entryId): int {
         self::$db->begin_transaction();
         self::$db->prepared_query("
             DELETE FROM {$this->entryTable()}
@@ -204,7 +204,7 @@ public function updateSequenceEntry(int $entryId, int $sequence): int {
         return $affected;
     }
 
-   public function remove(): int {
+    public function remove(): int {
         self::$db->prepared_query("
             UPDATE collages SET
                 Deleted = '1'
diff --git a/app/Collage/TGroup.php b/app/Collage/TGroup.php
index f862945f9..dec7d1429 100644
--- a/app/Collage/TGroup.php
+++ b/app/Collage/TGroup.php
@@ -54,7 +54,7 @@ public function load(): int {
         $this->groupIds     = [];
         $this->contributors = [];
         $this->created      = [];
-        $tgMan              = new \Gazelle\Manager\TGroup;
+        $tgMan              = new \Gazelle\Manager\TGroup();
         foreach ($groupIds as $groupId) {
             $tgroup = $tgMan->findById($groupId);
             if (is_null($tgroup)) {
@@ -135,7 +135,7 @@ public function remove(): int {
         if (!$this->holder->isPersonal()) {
             $rows = parent::remove();
         } else {
-            (new \Gazelle\Manager\Comment)->remove('collages', $this->id);
+            (new \Gazelle\Manager\Comment())->remove('collages', $this->id);
             self::$db->prepared_query("
                 DELETE FROM collages_torrents WHERE CollageID = ?
                 ", $this->id
diff --git a/app/Collector/Artist.php b/app/Collector/Artist.php
index d3a351e8b..1865e5e25 100644
--- a/app/Collector/Artist.php
+++ b/app/Collector/Artist.php
@@ -39,7 +39,7 @@ public function prepare(array $list): bool {
     }
 
     public function fillZip(\ZipStream\ZipStream $zip): void {
-        $releaseMan = new \Gazelle\ReleaseType;
+        $releaseMan = new \Gazelle\ReleaseType();
         while (($downloadList = $this->process('GroupID')) != null) {
             foreach ($downloadList as $download) {
                 $torrent = $this->torMan->findById($download['TorrentID']);
diff --git a/app/Comment/AbstractComment.php b/app/Comment/AbstractComment.php
index 6fcfe47b6..1c241c97e 100644
--- a/app/Comment/AbstractComment.php
+++ b/app/Comment/AbstractComment.php
@@ -295,7 +295,7 @@ public function remove(): bool {
         );
         self::$db->commit();
 
-        (new \Gazelle\Manager\Subscription)->flushPage($page, $this->pageId);
+        (new \Gazelle\Manager\Subscription())->flushPage($page, $this->pageId);
 
         self::$cache->delete_multi([
             "edit_{$page}_" . $this->id,
diff --git a/app/Contest/AbstractContest.php b/app/Contest/AbstractContest.php
index 1139135ec..694dc17f7 100644
--- a/app/Contest/AbstractContest.php
+++ b/app/Contest/AbstractContest.php
@@ -29,7 +29,7 @@ public function leaderboard(int $limit, int $offset): array {
             );
             $leaderboard = self::$db->to_array(false, MYSQLI_ASSOC, false);
 
-            $torMan = new \Gazelle\Manager\Torrent;
+            $torMan = new \Gazelle\Manager\Torrent();
             for ($i = 0, $leaderboardCount = count($leaderboard); $i < $leaderboardCount; $i++) {
                 $torrent = $torMan->findById($leaderboard[$i]['last_entry_id']);
                 $leaderboard[$i]['last_entry_link']
diff --git a/app/DB/Mysql.php b/app/DB/Mysql.php
index 688b39d04..40ad383af 100644
--- a/app/DB/Mysql.php
+++ b/app/DB/Mysql.php
@@ -136,7 +136,7 @@ public function enableQueryLog(): void {
 
     private function halt(string $Msg): void {
         if ($this->Errno == 1062) {
-            throw new MysqlDuplicateKeyException;
+            throw new MysqlDuplicateKeyException();
         }
         global $Debug;
         $Debug->saveCase("MySQL: error({$this->Errno}) {$this->Error} query=[$this->PreparedQuery]");
@@ -235,7 +235,7 @@ public function execute(mixed ...$Parameters): \mysqli_result|bool {
                 return $Statement->get_result();
             } catch (\mysqli_sql_exception) {
                 if ($this->LinkID && mysqli_error($this->LinkID) == 1062) {
-                    throw new MysqlDuplicateKeyException;
+                    throw new MysqlDuplicateKeyException();
                 }
             }
         };
diff --git a/app/Debug.php b/app/Debug.php
index b98793d1b..d6505be5e 100644
--- a/app/Debug.php
+++ b/app/Debug.php
@@ -97,7 +97,7 @@ public function saveCase(string $message): int {
             $userId = (int)$Viewer?->id();
         }
 
-        $id = (new \Gazelle\Manager\ErrorLog)->create(
+        $id = (new \Gazelle\Manager\ErrorLog())->create(
            uri:       $uri,
            userId:    $userId,
            duration:  $duration,
@@ -121,7 +121,7 @@ public function saveCase(string $message): int {
                 'includes' => $this->get_includes(),
                 'vars'     => $this->get_logged_vars(),
                 'perf'     => $this->get_perf(),
-                'ocelot'        => (new \Gazelle\Tracker)->requestList(),
+                'ocelot'        => (new \Gazelle\Tracker())->requestList(),
                 'searches'      => class_exists('Sphinxql') ? \Sphinxql::$Queries : [],
                 'searches_time' => class_exists('Sphinxql') ? \Sphinxql::$Time : 0.0,
                 'queries'       => $this->get_queries(),
diff --git a/app/Donate/Bitcoin.php b/app/Donate/Bitcoin.php
index f19c8a0dd..f29a8857f 100644
--- a/app/Donate/Bitcoin.php
+++ b/app/Donate/Bitcoin.php
@@ -45,7 +45,7 @@ public function __construct(
             'zpub' => $slip132->p2wpkh($btcPrefixes),
             default => throw new DonationException("invalid xyzpub key $xyzpub"),
         };
-        $network = new \BitWasp\Bitcoin\Network\Networks\Bitcoin;
+        $network = new \BitWasp\Bitcoin\Network\Networks\Bitcoin();
         $config = new GlobalPrefixConfig([
             new NetworkConfig($network, [$prefix])
         ]);
diff --git a/app/Download.php b/app/Download.php
index f42140d69..6db8810e1 100644
--- a/app/Download.php
+++ b/app/Download.php
@@ -99,7 +99,7 @@ public function authorize(): DownloadStatus {
                     self::$db->rollback();
                     return DownloadStatus::no_tokens;
                 }
-                if (!(new \Gazelle\Tracker)->addToken($this->torrent, $user)) {
+                if (!(new \Gazelle\Tracker())->addToken($this->torrent, $user)) {
                     self::$db->rollback();
                     return DownloadStatus::tracker;
                 }
diff --git a/app/Forum.php b/app/Forum.php
index f00697992..09851d4c9 100644
--- a/app/Forum.php
+++ b/app/Forum.php
@@ -23,7 +23,7 @@ public function link(): string {
 
     public function flush(): static {
         $this->info = [];
-        (new Manager\Forum)->flushToc();
+        (new Manager\Forum())->flushToc();
         self::$cache->delete_multi([
             sprintf(self::CACHE_FORUM, $this->id),
             sprintf(self::CACHE_TOC_FORUM, $this->id),
diff --git a/app/ForumPost.php b/app/ForumPost.php
index 35de92262..78121327c 100644
--- a/app/ForumPost.php
+++ b/app/ForumPost.php
@@ -142,7 +142,7 @@ public function pin(User $user, bool $set): int {
      */
     public function remove(): bool {
         self::$db->begin_transaction();
-        $db = new DB;
+        $db = new DB();
         $db->relaxConstraints(true);
         self::$db->prepared_query("
             DELETE fp, unq
@@ -190,7 +190,7 @@ public function remove(): bool {
         self::$db->commit();
 
         $this->thread()->forum()->adjust();
-        (new \Gazelle\Manager\Subscription)->flushPage('forums', $threadId);
+        (new \Gazelle\Manager\Subscription())->flushPage('forums', $threadId);
 
         $thread->flush();
         $pageOffset = $this->page() - 1;
diff --git a/app/ForumThread.php b/app/ForumThread.php
index b62130bf3..cb035ad4f 100644
--- a/app/ForumThread.php
+++ b/app/ForumThread.php
@@ -10,7 +10,7 @@ class ForumThread extends BaseObject {
     public function flush(): static {
         self::$cache->delete_value(sprintf(self::CACHE_KEY, $this->id));
         self::$cache->delete_value("edit_forums_{$this->id}");
-        (new Manager\Forum)->flushToc();
+        (new Manager\Forum())->flushToc();
         $last = $this->lastPage();
         $this->flushCatalog($last, $last);
         return $this;
@@ -195,7 +195,7 @@ public function slice(int $page, int $perPage): array {
     }
 
     public function addPost(User $user, string $body): ForumPost {
-        $post = (new Manager\ForumPost)->create($this, $user, $body);
+        $post = (new Manager\ForumPost())->create($this, $user, $body);
         $this->info();
         $this->info['post_total_summary']++;
         $this->info['last_post_id']        = $post->id();
@@ -281,7 +281,7 @@ public function editThread(Forum $forum, bool $pinned, int $rank, bool $locked,
     public function remove(): int {
         // LastPostID is a chicken and egg situation when removing a thread,
         // so foreign key constraints need to be igored temporarily.
-        $db = new \Gazelle\DB;
+        $db = new \Gazelle\DB();
         $db->relaxConstraints(true);
         self::$db->prepared_query("
             DELETE ft, fp, unq
@@ -295,7 +295,7 @@ public function remove(): int {
         $db->relaxConstraints(false);
         $this->forum()->adjust();
 
-        (new Manager\Subscription)->move('forums', $this->id, null);
+        (new Manager\Subscription())->move('forums', $this->id, null);
 
         $previousPost = self::$db->rowAssoc("
             SELECT AuthorID AS user_id,
@@ -348,7 +348,7 @@ protected function updateThread(User $user, int $postId): int {
         $affected = self::$db->affected_rows();
         if ($affected) {
             $this->updateRoot($user->id(), $postId);
-            (new Manager\Forum)->flushToc();
+            (new Manager\Forum())->flushToc();
             $this->forum()->flush();
             $this->flush();
         }
diff --git a/app/Json/News.php b/app/Json/News.php
index f2b2698bb..c090a76fe 100644
--- a/app/Json/News.php
+++ b/app/Json/News.php
@@ -20,7 +20,7 @@ public function payload(): array {
                     $r['created'],
                     time_diff($r['created'], 2, false),
                 ],
-                (new \Gazelle\Manager\News)->list($this->limit, $this->offset)
+                (new \Gazelle\Manager\News())->list($this->limit, $this->offset)
             )
         ];
     }
diff --git a/app/Json/PM.php b/app/Json/PM.php
index d495f2a1e..10efe8572 100644
--- a/app/Json/PM.php
+++ b/app/Json/PM.php
@@ -2,7 +2,7 @@
 
 namespace Gazelle\Json;
 
-class PM  extends \Gazelle\Json {
+class PM extends \Gazelle\Json {
     public function __construct(
         protected \Gazelle\PM $pm,
         protected \Gazelle\Manager\User $userMan,
diff --git a/app/Json/RipLog.php b/app/Json/RipLog.php
index 2f6262566..4b12f7fe9 100644
--- a/app/Json/RipLog.php
+++ b/app/Json/RipLog.php
@@ -9,7 +9,7 @@ public function __construct(
     ) {}
 
     public function payload(): array {
-        $filer = new \Gazelle\File\RipLog;
+        $filer = new \Gazelle\File\RipLog();
         if (!$filer->exists([$this->torrentId, $this->logId])) {
             return [
                 'id'                => $this->torrentId,
diff --git a/app/Login.php b/app/Login.php
index f6c9f4071..14ad9602c 100644
--- a/app/Login.php
+++ b/app/Login.php
@@ -88,7 +88,7 @@ public function login(
                 }
                 self::$cache->increment($key);
             } elseif ($this->watch->nrBans() > 3) {
-                (new Manager\IPv4)->createBan(
+                (new Manager\IPv4())->createBan(
                     $this->userId, $this->ipaddr, $this->ipaddr, 'Automated ban, too many failed login attempts'
                 );
             }
@@ -105,7 +105,7 @@ public function login(
      */
     protected function attemptLogin(): ?User {
         // we have all we need to go forward
-        $userMan = new Manager\User;
+        $userMan = new Manager\User();
         if (!preg_match(USERNAME_REGEXP, $this->username)) {
             $this->error = self::ERR_CREDENTIALS;
             return null;
@@ -128,11 +128,11 @@ protected function attemptLogin(): ?User {
             return null;
         }
         if ($TFAKey) {
-            $tfa = new \RobThree\Auth\TwoFactorAuth;
+            $tfa = new \RobThree\Auth\TwoFactorAuth();
             if (!$tfa->verifyCode($TFAKey, $this->twofa, 2)) {
                 // They have 2FA but the device key did not match
                 // Fallback to considering it as a recovery key.
-                $userToken = (new Manager\UserToken)->findByToken($this->twofa);
+                $userToken = (new Manager\UserToken())->findByToken($this->twofa);
                 if ($userToken) {
                     $userToken->consume();
                 }
@@ -149,8 +149,8 @@ protected function attemptLogin(): ?User {
         }
 
         // Did they come in over Tor?
-        if (BLOCK_TOR && !$user->permitted('can_use_tor') && (new Manager\Tor)->isExitNode($this->ipaddr)) {
-            $userMan->disableUserList(new Tracker, [$user->id()], "Logged in via Tor ({$this->ipaddr})", Manager\User::DISABLE_TOR);
+        if (BLOCK_TOR && !$user->permitted('can_use_tor') && (new Manager\Tor())->isExitNode($this->ipaddr)) {
+            $userMan->disableUserList(new Tracker(), [$user->id()], "Logged in via Tor ({$this->ipaddr})", Manager\User::DISABLE_TOR);
             // return a newly disabled instance
             return $userMan->findById($user->id());
         }
diff --git a/app/Manager/Artist.php b/app/Manager/Artist.php
index ac839713f..24d8de9ea 100644
--- a/app/Manager/Artist.php
+++ b/app/Manager/Artist.php
@@ -181,7 +181,7 @@ public function setUserId(int $userId): static {
     }
 
     public function sectionName(int $sectionId): ?string {
-        return (new \Gazelle\ReleaseType)->findExtendedNameById($sectionId);
+        return (new \Gazelle\ReleaseType())->findExtendedNameById($sectionId);
     }
 
     public function sectionLabel(int $sectionId): string {
@@ -189,6 +189,6 @@ public function sectionLabel(int $sectionId): string {
     }
 
     public function sectionTitle(int $sectionId): string {
-        return (new \Gazelle\ReleaseType)->sectionTitle($sectionId);
+        return (new \Gazelle\ReleaseType())->sectionTitle($sectionId);
     }
 }
diff --git a/app/Manager/Bonus.php b/app/Manager/Bonus.php
index a80844557..c23aa5a62 100644
--- a/app/Manager/Bonus.php
+++ b/app/Manager/Bonus.php
@@ -14,7 +14,7 @@ class Bonus extends \Gazelle\Base {
      * @return int Discount rate (0: normal price, 100: everything is free :)
      */
     public function discount(): int {
-        return (int)(new \Gazelle\Manager\SiteOption)->findValueByName('bonus-discount');
+        return (int)(new \Gazelle\Manager\SiteOption())->findValueByName('bonus-discount');
     }
 
     public function itemList(): array {
diff --git a/app/Manager/Collage.php b/app/Manager/Collage.php
index 812d40e5c..67aa983da 100644
--- a/app/Manager/Collage.php
+++ b/app/Manager/Collage.php
@@ -46,7 +46,7 @@ public function create(
         );
         $id = self::$db->inserted_id();
         $user->stats()->increment('collage_total');
-        (new \Gazelle\Stats\Collage)->increment();
+        (new \Gazelle\Stats\Collage())->increment();
         $logger->general("Collage $id ($name) was created by {$user->username()}");
         return new \Gazelle\Collage($id);
     }
diff --git a/app/Manager/Comment.php b/app/Manager/Comment.php
index 00c397a31..9432281ef 100644
--- a/app/Manager/Comment.php
+++ b/app/Manager/Comment.php
@@ -45,8 +45,8 @@ public function create(
             self::$cache->delete_value("{$page}_comments_recent_{$pageId}");
         }
         (new \Gazelle\User\Notification\Quote($user))
-            ->create(new \Gazelle\Manager\User, $body, $postId, $page, $pageId);
-        (new Subscription)->flushPage($page, $pageId);
+            ->create(new \Gazelle\Manager\User(), $body, $postId, $page, $pageId);
+        (new Subscription())->flushPage($page, $pageId);
 
         $className = $this->className($page);
         return new $className($pageId, 0, $postId); /** @phpstan-ignore-line */
@@ -100,7 +100,7 @@ public function merge(string $page, int $pageId, int $targetPageId): int {
         );
 
         // comment subscriptions
-        $subscription = new \Gazelle\Manager\Subscription;
+        $subscription = new \Gazelle\Manager\Subscription();
         $subscription->move($page, $pageId, $targetPageId);
 
         for ($i = 0; $i <= $last; ++$i) {
@@ -137,7 +137,7 @@ public function remove(string $page, int $pageId): int {
         $affected = self::$db->affected_rows();
 
         // literally, move the comment thread to nowhere i.e. delete
-        (new \Gazelle\Manager\Subscription)->move($page, $pageId, null);
+        (new \Gazelle\Manager\Subscription())->move($page, $pageId, null);
 
         self::$db->prepared_query("
             DELETE FROM users_notify_quoted WHERE Page = ? AND PageID = ?
diff --git a/app/Manager/DNU.php b/app/Manager/DNU.php
index cd8d0149e..00b22eec1 100644
--- a/app/Manager/DNU.php
+++ b/app/Manager/DNU.php
@@ -13,9 +13,9 @@ public function create(
                    (Name, Comment, UserID, Sequence)
             VALUES (?,    ?,       ?,      9999)
             ", $name, $comment, $user->id()
-       );
-       return self::$db->inserted_id();
-   }
+        );
+        return self::$db->inserted_id();
+    }
 
     public function modify(
         int           $id,
diff --git a/app/Manager/ForumThread.php b/app/Manager/ForumThread.php
index 580b45ea7..761d655ed 100644
--- a/app/Manager/ForumThread.php
+++ b/app/Manager/ForumThread.php
@@ -9,7 +9,7 @@ class ForumThread extends \Gazelle\BaseManager {
      * Create a forum thread
      */
     public function create(\Gazelle\Forum $forum, \Gazelle\User $user, string $title, string $body): \Gazelle\ForumThread {
-        $db = new \Gazelle\DB;
+        $db = new \Gazelle\DB();
         $db->relaxConstraints(true);
         self::$db->prepared_query("
             INSERT INTO forums_topics
diff --git a/app/Manager/Invite.php b/app/Manager/Invite.php
index 92f7d209d..c4400f0bd 100644
--- a/app/Manager/Invite.php
+++ b/app/Manager/Invite.php
@@ -19,7 +19,7 @@ public function create(\Gazelle\User $user, string $email, string $notes, string
         );
         $invite = new \Gazelle\Invite($inviteKey);
         if (preg_match('/^s-(\d+)$/', $source, $match)) {
-            (new \Gazelle\Manager\InviteSource)->createPendingInviteSource((int)$match[1], $inviteKey);
+            (new \Gazelle\Manager\InviteSource())->createPendingInviteSource((int)$match[1], $inviteKey);
         }
         self::$db->commit();
         return $invite;
diff --git a/app/Manager/Payment.php b/app/Manager/Payment.php
index 7fb111442..986058e80 100644
--- a/app/Manager/Payment.php
+++ b/app/Manager/Payment.php
@@ -64,7 +64,7 @@ public function list(): array {
         }
 
         // update with latest forex rates
-        $XBT = new XBT;
+        $XBT = new XBT();
         foreach ($list as &$l) {
             $l['Active'] = (bool)$l['Active'];
             if ($l['cc'] == 'XBT') {
diff --git a/app/Manager/Recovery.php b/app/Manager/Recovery.php
index c515e7e21..156030d7d 100644
--- a/app/Manager/Recovery.php
+++ b/app/Manager/Recovery.php
@@ -274,7 +274,7 @@ public function accept(int $id, int $admin_id, string $admin_username): bool {
              VALUES              (?,         ?,         ?,      ?,      now() + interval 1 week)
              ",                   $admin_id, $key,      $email, "Account recovery id={$id} key={$key}"
         );
-        (new Mail)->send($email, 'Account recovery confirmation at ' . SITE_NAME,
+        (new Mail())->send($email, 'Account recovery confirmation at ' . SITE_NAME,
             self::$twig->render('email/recovery.twig', [
                 'invite_key' => $key,
             ])
@@ -417,7 +417,7 @@ public function mapToPrevious(int $siteUserId, int $prevUserId, string $admin_us
     }
 
     public function boostUpload(): void {
-        $userMan = new User;
+        $userMan = new User();
         $sql = sprintf("
             SELECT HIST.Username, HIST.mapped_id, HIST.UserID, HIST.Uploaded, HIST.Downloaded, HIST.Bounty, HIST.nr_torrents, HIST.userclass,
                 round(
@@ -545,7 +545,7 @@ public function boostUpload(): void {
 --OPS Staff
 END_MSG;
                 } else {
-                $Body = <<<END_MSG
+                    $Body = <<<END_MSG
 Dear {$username},
 
 $reclaimMsg
diff --git a/app/Manager/Referral.php b/app/Manager/Referral.php
index 533688947..8d4a8eb51 100644
--- a/app/Manager/Referral.php
+++ b/app/Manager/Referral.php
@@ -551,7 +551,7 @@ public function generateInvite(array $acc, string $username, string $email): arr
         );
 
         if (REFERRAL_SEND_EMAIL) {
-            (new Mail)->send($email, 'You have been invited to ' . SITE_NAME,
+            (new Mail())->send($email, 'You have been invited to ' . SITE_NAME,
                 self::$twig->render('email/referral.twig', [
                     'email' => $email,
                     'inviter_key' => $inviteKey,
diff --git a/app/Manager/Subscription.php b/app/Manager/Subscription.php
index 6b933df55..b53bc753f 100644
--- a/app/Manager/Subscription.php
+++ b/app/Manager/Subscription.php
@@ -35,7 +35,7 @@ public function flushPage(string $Page, int $PageID): int {
         );
         $list = self::$db->collect('UserID', false);
 
-        new User;
+        new User();
         foreach ($list as $userId) {
             (new \Gazelle\User\Quote(new \Gazelle\User($userId)))->flush();
         }
diff --git a/app/Manager/TGroup.php b/app/Manager/TGroup.php
index 73fda5dd5..523f64062 100644
--- a/app/Manager/TGroup.php
+++ b/app/Manager/TGroup.php
@@ -73,7 +73,7 @@ public function createFromTorrent(
         } else {
             $bookmarkMan->merge($old, $new);
             $commentMan->merge('torrents', $oldId, $newId);
-            $voteMan->merge($old, $new, new \Gazelle\Manager\User);
+            $voteMan->merge($old, $new, new \Gazelle\Manager\User());
             $logger->merge($old, $new);
             $old->remove($user);
         }
@@ -195,8 +195,8 @@ public function merge(
             ", $new->id(), $old->id()
         );
 
-        (new \Gazelle\Manager\Bookmark)->merge($old, $new);
-        (new \Gazelle\Manager\Comment)->merge('torrents', $old->id(), $new->id());
+        (new \Gazelle\Manager\Bookmark())->merge($old, $new);
+        (new \Gazelle\Manager\Comment())->merge('torrents', $old->id(), $new->id());
         $voteManager->merge($old, $new, $userManager);
 
         // Collages
@@ -364,7 +364,7 @@ public function changeCategory(
         if ($old->categoryId() === $categoryId) {
             return null;
         }
-        switch ((new Category)->findNameById($categoryId)) {
+        switch ((new Category())->findNameById($categoryId)) {
             case 'Music':
                 if (empty($artistName) || !$year || !$releaseType) {
                     return null;
@@ -410,9 +410,9 @@ public function changeCategory(
         if (self::$db->scalar('SELECT ID FROM torrents WHERE GroupID = ?', $old->id())) {
             $old->flush()->refresh();
         } else {
-            (new \Gazelle\Manager\Bookmark)->merge($old, $new);
-            (new \Gazelle\Manager\Comment)->merge('torrents', $old->id(), $new->id());
-            (new \Gazelle\Manager\Vote)->merge($old, $new, new \Gazelle\Manager\User);
+            (new \Gazelle\Manager\Bookmark())->merge($old, $new);
+            (new \Gazelle\Manager\Comment())->merge('torrents', $old->id(), $new->id());
+            (new \Gazelle\Manager\Vote())->merge($old, $new, new \Gazelle\Manager\User());
             $logger->merge($old, $new);
             $old->remove($user);
         }
diff --git a/app/Manager/Torrent.php b/app/Manager/Torrent.php
index 1251ef1a2..a0f06c4b3 100644
--- a/app/Manager/Torrent.php
+++ b/app/Manager/Torrent.php
@@ -372,7 +372,7 @@ public function setListFreeleech(
         $affected = self::$db->affected_rows();
 
         $refresh = [];
-        $log     = new \Gazelle\Log;
+        $log     = new \Gazelle\Log();
         foreach ($idList as $torrentId) {
             $torrent = $this->findById($torrentId)->flush();
             $tracker->modifyTorrent($torrent, $leechType);
@@ -587,7 +587,7 @@ public function latestUploads(int $limit): array {
      */
 
     public static function renderPL(int $id, array $attr): ?string {
-        $torrent = (new self)->findById($id);
+        $torrent = (new self())->findById($id);
         $meta = '';
         $wantMeta = !(in_array('nometa', $attr) || in_array('title', $attr));
 
@@ -610,7 +610,7 @@ public static function renderPL(int $id, array $attr): ?string {
             if (is_null($deleted)) {
                 return null;
             }
-            $tgroup = (new \Gazelle\Manager\TGroup)->findById((int)$deleted['GroupID']);
+            $tgroup = (new \Gazelle\Manager\TGroup())->findById((int)$deleted['GroupID']);
             if (is_null($tgroup)) {
                 return null;
             }
diff --git a/app/Manager/User.php b/app/Manager/User.php
index bdc767124..d20b0babc 100644
--- a/app/Manager/User.php
+++ b/app/Manager/User.php
@@ -516,7 +516,7 @@ protected function deliverPM(int $toId, int $fromId, string $subject, string $bo
             SELECT Username FROM users_main WHERE ID = ?
             ", $fromId
         );
-        (new Notification)->push([$toId],
+        (new Notification())->push([$toId],
             "Message from $senderName, Subject: $subject", $body, SITE_URL . '/inbox.php', Notification::INBOX
         );
     }
@@ -553,7 +553,7 @@ public function sendSnatchPm(\Gazelle\User $viewer, \Gazelle\Torrent  $torrent,
             }
         }
         $total = count($snatchers);
-        (new \Gazelle\Log)->general($viewer->username() . " sent a mass PM to $total snatcher" . plural($total)
+        (new \Gazelle\Log())->general($viewer->username() . " sent a mass PM to $total snatcher" . plural($total)
             . " of torrent " . $torrent->id() . " (" . $torrent->group()->text() . ")"
         );
         return $total;
diff --git a/app/Manager/UserToken.php b/app/Manager/UserToken.php
index 164e15291..3fc168b58 100644
--- a/app/Manager/UserToken.php
+++ b/app/Manager/UserToken.php
@@ -39,7 +39,7 @@ public function createPasswordResetToken(\Gazelle\User $user): \Gazelle\User\Tok
             ", $user->id(), UserTokenType::password->value
         );
         $userToken = $this->create(UserTokenType::password, $user);
-        (new \Gazelle\Util\Mail)->send($user->email(), 'Password reset information for ' . SITE_NAME,
+        (new \Gazelle\Util\Mail())->send($user->email(), 'Password reset information for ' . SITE_NAME,
             self::$twig->render('email/password-reset.twig', [
                 'ipaddr'    => $_SERVER['REMOTE_ADDR'],
                 'reset_key' => $userToken->value(),
diff --git a/app/Manager/XBT.php b/app/Manager/XBT.php
index 884b2fe1c..171ef8ba9 100644
--- a/app/Manager/XBT.php
+++ b/app/Manager/XBT.php
@@ -16,7 +16,7 @@ class XBT extends \Gazelle\Base {
      * @return float current rate, or null if API endpoint cannot be reached or is in error.
      */
     public function fetchRate(string $CC): ?float {
-        $curl = new \Gazelle\Util\Curl;
+        $curl = new \Gazelle\Util\Curl();
         if ($curl->fetch(sprintf(self::FX_QUOTE_URL, $CC))) {
             // {"data":{"base":"BTC","currency":"USD","amount":"8165.93"}}
             $payload = json_decode($curl->result());
diff --git a/app/Notification/Upload.php b/app/Notification/Upload.php
index eeb947adc..545253999 100644
--- a/app/Notification/Upload.php
+++ b/app/Notification/Upload.php
@@ -260,7 +260,7 @@ public function sendRssNotification(): int {
         }
         $this->rss[] = 'torrents_all';
 
-        $feed = new \Gazelle\Feed;
+        $feed = new \Gazelle\Feed();
         $item = $feed->item(
             title:       $torrent->fullName(),
             description: \Text::strip_bbcode($tgroup->description()),
diff --git a/app/PM.php b/app/PM.php
index ad181d796..f212a1240 100644
--- a/app/PM.php
+++ b/app/PM.php
@@ -79,7 +79,7 @@ public function info(): array {
         }
         $this->info = $info;
 
-        $manager = new Manager\User;
+        $manager = new Manager\User();
         $this->info['forwarded_to'] = $manager->findById($this->info['forwarded_to'] ?? 0);
 
         $this->info['sender'] = [];
diff --git a/app/Request.php b/app/Request.php
index f4c0f3d91..384089eac 100644
--- a/app/Request.php
+++ b/app/Request.php
@@ -88,7 +88,7 @@ public function artistRole(): ?ArtistRole\Request {
         if ($this->categoryName() !== 'Music') {
             return null;
         }
-        return new ArtistRole\Request($this->id, new Manager\Artist);
+        return new ArtistRole\Request($this->id, new Manager\Artist());
     }
 
     public function hasArtistRole(): bool {
@@ -556,7 +556,7 @@ public function vote(User $user, int $amount): bool {
         $user->flush();
 
         return true;
-   }
+    }
 
     public function fill(User $user, Torrent $torrent): int {
         $bounty = $this->bountyTotal();
@@ -591,7 +591,7 @@ public function fill(User $user, Torrent $torrent): int {
             (new User($userId))->inbox()->createSystem("The request \"$name\" has been filled", $message);
         }
 
-        (new Log)->general(
+        (new Log())->general(
             "Request {$this->id} ($name) was filled by user {$user->label()} with the torrent {$torrent->id()} for a "
             . byte_format($bounty) . ' bounty.'
         );
@@ -643,7 +643,7 @@ public function unfill(User $admin, string $reason, Manager\Torrent $torMan): in
             );
         }
 
-        (new Log)->general("Request {$this->id} ({$this->title()}), with a " . byte_format($bounty)
+        (new Log())->general("Request {$this->id} ({$this->title()}), with a " . byte_format($bounty)
             . " bounty, was unfilled by user {$admin->label()} for the reason: $reason"
         );
 
@@ -842,7 +842,7 @@ public function updateBookmarkStats(): int {
             // and live with the <= 1 minute delay if we have more than 100 bookmarkers
             $this->updateSphinx();
         } else {
-            (new \SphinxqlQuery)->raw_query(
+            (new \SphinxqlQuery())->raw_query(
                 "UPDATE requests, requests_delta SET bookmarker = ("
                 . implode(',', self::$db->collect('UserID'))
                 . ") WHERE id = {$this->id}"
@@ -869,7 +869,7 @@ public function remove(): bool {
             REPLACE INTO sphinx_requests_delta (ID) VALUES (?)
             ", $this->id
         );
-        (new \Gazelle\Manager\Comment)->remove('requests', $this->id);
+        (new \Gazelle\Manager\Comment())->remove('requests', $this->id);
         self::$db->commit();
 
         foreach ($artisIds as $artistId) {
diff --git a/app/Search/Collage.php b/app/Search/Collage.php
index 51a3bd1eb..91eec1b70 100644
--- a/app/Search/Collage.php
+++ b/app/Search/Collage.php
@@ -15,13 +15,13 @@ class Collage extends \Gazelle\Base {
 
     protected array $category = [];
     protected array $taglist  = [];
-    protected array $join     = [];
-    protected array $where    = ["c.Deleted = '0'"];
+    protected array $joinList = [];
+    protected array $whereList= ["c.Deleted = '0'"];
     protected array $args     = [];
 
     /* the collapsed version of the above */
-    protected string $_join;
-    protected string $_where;
+    protected string $join;
+    protected string $where;
 
     protected \Gazelle\Util\SortableTableHeader $header;
 
@@ -30,7 +30,7 @@ public function header(): \Gazelle\Util\SortableTableHeader {
     }
 
     public function isFilteredView(): bool {
-        return count($this->where) > 1;
+        return count($this->whereList) > 1;
     }
 
     public function isBookmarkView(): bool {
@@ -60,8 +60,8 @@ public function userLink(): string {
     public function setBookmarkView(\Gazelle\User $user): static {
         $this->bookmarkView = true;
         $this->userLink = $user->link();
-        $this->join[]  = "INNER JOIN bookmarks_collages AS bc ON (c.ID = bc.CollageID)";
-        $this->where[] = "bc.UserID = ?";
+        $this->joinList[]  = "INNER JOIN bookmarks_collages AS bc ON (c.ID = bc.CollageID)";
+        $this->whereList[] = "bc.UserID = ?";
         $this->args[]  = $user->id();
         return $this;
     }
@@ -74,7 +74,7 @@ public function setCategory(array $category): static {
     public function setContributor(\Gazelle\User $user): static {
         $this->contributor = true;
         $this->userLink = $user->link();
-        $this->where[] = "c.ID IN (SELECT DISTINCT CollageID FROM collages_torrents WHERE UserID = ?)";
+        $this->whereList[] = "c.ID IN (SELECT DISTINCT CollageID FROM collages_torrents WHERE UserID = ?)";
         $this->args[] = $user->id();
         return $this;
     }
@@ -88,7 +88,7 @@ public function setLookup(string $lookup): static {
     }
 
     public function setPersonal(): static {
-        $this->where[] = 'c.CategoryID = 0';
+        $this->whereList[] = 'c.CategoryID = 0';
         return $this;
     }
 
@@ -104,14 +104,14 @@ public function setTaglist(array $taglist): static {
 
     public function setUser(\Gazelle\User $user): static {
         $this->userLink = $user->link();
-        $this->where[] = 'c.UserID = ?';
+        $this->whereList[] = 'c.UserID = ?';
         $this->args[]  = $user->id();
         return $this;
     }
 
     public function setWordlist(string $wordlist): static {
         if (preg_match_all('/(\S+)/', $wordlist, $match)) {
-            array_push($this->where, ...array_fill(0, count($match[0]), "c." . $this->lookup . " LIKE concat('%', ?, '%')"));
+            array_push($this->whereList, ...array_fill(0, count($match[0]), "c." . $this->lookup . " LIKE concat('%', ?, '%')"));
             array_push($this->args, ...$match[0]);
         }
         return $this;
@@ -128,18 +128,18 @@ public function configure(): void {
         if ($this->category) {
             sort($this->category);
             if (implode(' ', $this->category) !== implode(' ', array_keys(COLLAGE))) {
-                $this->where[] = "c.CategoryID IN (" . placeholders($this->category) . ')';
+                $this->whereList[] = "c.CategoryID IN (" . placeholders($this->category) . ')';
                 array_push($this->args, ...$this->category);
             }
         }
         if ($this->taglist) {
-            $this->where[] = '(' . implode($this->tagAll ? ' AND ' : ' OR ',
+            $this->whereList[] = '(' . implode($this->tagAll ? ' AND ' : ' OR ',
                     array_fill(0, count($this->taglist), "c.TagList LIKE concat('%', ?, '%')"))
                 . ')';
             array_push($this->args, ...$this->taglist);
         }
-        $this->_join = implode(' ', $this->join);
-        $this->_where = implode(' AND ', $this->where);
+        $this->join = implode(' ', $this->joinList);
+        $this->where = implode(' AND ', $this->whereList);
         $this->configured = true;
     }
 
@@ -149,8 +149,8 @@ public function total(): int {
         }
         return (int)self::$db->scalar("
             SELECT count(*)
-            FROM collages AS c {$this->_join}
-            WHERE {$this->_where}
+            FROM collages AS c {$this->join}
+            WHERE {$this->where}
             ", ...$this->args
         );
     }
@@ -170,8 +170,8 @@ public function page(int $limit, int $offset): array {
                 c.UserID       AS user_id,
                 c.Subscribers  AS subscriber_total,
                 c.Updated      AS updated
-            FROM collages AS c {$this->_join}
-            WHERE {$this->_where}
+            FROM collages AS c {$this->join}
+            WHERE {$this->where}
             ORDER BY $orderBy $orderDir
             LIMIT ? OFFSET ?
             ", ...[...$this->args, $limit, $offset]
diff --git a/app/Search/Donation.php b/app/Search/Donation.php
index efea50815..c01002ae9 100644
--- a/app/Search/Donation.php
+++ b/app/Search/Donation.php
@@ -3,15 +3,15 @@
 namespace Gazelle\Search;
 
 class Donation extends \Gazelle\Base {
-    protected array $join = [];
+    protected array $joinList = [];
     protected array $cond = [];
     protected array $args = [];
 
-    protected string $_join;
-    protected string $_where;
+    protected string $join;
+    protected string $where;
 
     public function setUsername(string $username): static {
-        $this->join[] = "INNER JOIN users_main AS m ON (m.ID = d.UserID)";
+        $this->joinList[] = "INNER JOIN users_main AS m ON (m.ID = d.UserID)";
         $this->cond[] = "m.Username LIKE concat('%', ?, '%')";
         $this->args[] = trim($username);
         return $this;
@@ -24,9 +24,9 @@ public function setInterval(string $after, string $before): static {
     }
 
     protected function configure(): void {
-        if (!isset($this->_where)) {
-            $this->_where = empty($this->cond) ? '' : ('WHERE ' . implode(' AND ', $this->cond));
-            $this->_join = implode(' ', $this->join);
+        if (!isset($this->where)) {
+            $this->where = empty($this->cond) ? '' : ('WHERE ' . implode(' AND ', $this->cond));
+            $this->join = implode(' ', $this->joinList);
         }
     }
 
@@ -35,7 +35,7 @@ public function total(): int {
         return (int)self::$db->scalar("
             SELECT count(*)
             FROM donations AS d
-            {$this->_join} {$this->_where}
+            {$this->join} {$this->where}
             ", ...$this->args
         );
     }
@@ -52,7 +52,7 @@ public function page(int $limit, int $offset): array {
                 d.AddedBy,
                 d.Reason
             FROM donations AS d
-            {$this->_join} {$this->_where}
+            {$this->join} {$this->where}
             ORDER BY d.Time DESC
             LIMIT ? OFFSET ?
             ", ...[...$this->args, $limit, $offset]
diff --git a/app/Search/Request.php b/app/Search/Request.php
index 0dbc2942b..2acb838b0 100644
--- a/app/Search/Request.php
+++ b/app/Search/Request.php
@@ -19,7 +19,7 @@ class Request extends \Gazelle\Base {
     public function __construct(
         protected \Gazelle\Manager\Request $manager,
     ) {
-        $this->sphinxq = new \SphinxqlQuery;
+        $this->sphinxq = new \SphinxqlQuery();
     }
 
     public function isBookmarkView(): bool {
@@ -168,7 +168,7 @@ public function setTag(string $tagList, string $tagMode): static {
                 $this->negate = true;
             }
         }
-        $filter = (new \Gazelle\Manager\Tag)->sphinxFilter(['include' => $include, 'exclude' => $exclude], $this->negate, $tagMode === 'all');
+        $filter = (new \Gazelle\Manager\Tag())->sphinxFilter(['include' => $include, 'exclude' => $exclude], $this->negate, $tagMode === 'all');
         $this->tagList = $filter['input'];
         if ($filter['predicate']) {
             $this->sphinxq->where_match($filter['predicate'], 'taglist', false);
diff --git a/app/Search/Torrent.php b/app/Search/Torrent.php
index b49c95023..fd4c6a528 100644
--- a/app/Search/Torrent.php
+++ b/app/Search/Torrent.php
@@ -429,7 +429,7 @@ private function process_attribute(string $Attribute, array|int|string $Value):
 
             case 'releasetype':
                 $id = (int)$Value;
-                if (!is_null((new \Gazelle\ReleaseType)->findNameById($id))) {
+                if (!is_null((new \Gazelle\ReleaseType())->findNameById($id))) {
                     $this->SphQL->where('ReleaseType', $id);
                 }
                 break;
@@ -481,7 +481,7 @@ private function process_field(string $Field, string $Term): void {
     private function post_process_fields(): void {
         if (isset($this->Terms['taglist'])) {
             // Replace bad tags with tag aliases
-            $this->Terms['taglist'] = (new \Gazelle\Manager\Tag)->replaceAliasList($this->Terms['taglist']);
+            $this->Terms['taglist'] = (new \Gazelle\Manager\Tag())->replaceAliasList($this->Terms['taglist']);
             if (isset($this->RawTerms['tags_type']) && (int)$this->RawTerms['tags_type'] === self::TAGS_ANY) {
                 $this->Terms['taglist']['operator'] = self::SPH_BOOL_OR;
             }
diff --git a/app/SiteInfo.php b/app/SiteInfo.php
index da65537da..e4ece6d48 100644
--- a/app/SiteInfo.php
+++ b/app/SiteInfo.php
@@ -37,7 +37,7 @@ public function uptime(): array {
         $in = fopen('/proc/cpuinfo', 'r');
         if ($in !== false) {
             while (($line = fgets($in)) !== false) {
-               if (preg_match('/^processor\s+:\s+\d+/', $line)) {
+                if (preg_match('/^processor\s+:\s+\d+/', $line)) {
                     ++$ncpu;
                 }
             }
diff --git a/app/Staff.php b/app/Staff.php
index f2aec0f5e..e4fa6f6a9 100644
--- a/app/Staff.php
+++ b/app/Staff.php
@@ -40,7 +40,7 @@ public function pmCount(): int {
         ];
         $effectiveClass = $this->user->privilege()->effectiveClassLevel();
         $args = [$this->user->id(), $effectiveClass];
-        $classes = (new Manager\User)->classList();
+        $classes = (new Manager\User())->classList();
         if ($effectiveClass >= $classes[MOD]['Level']) {
             $cond[] = 'Level >= ?';
             $args[] = $classes[MOD]['Level'];
diff --git a/app/StaffGroup.php b/app/StaffGroup.php
index 77125add7..f31b84673 100644
--- a/app/StaffGroup.php
+++ b/app/StaffGroup.php
@@ -6,7 +6,7 @@ class StaffGroup extends BaseObject {
     final public const tableName = 'staff_groups';
 
     public function flush(): static {
-        (new Manager\Privilege)->flush();
+        (new Manager\Privilege())->flush();
         self::$cache->delete_value(Manager\StaffGroup::LIST_KEY);
         unset($this->info);
         return $this;
diff --git a/app/TGroup.php b/app/TGroup.php
index 5e0890b43..1b3d31c92 100644
--- a/app/TGroup.php
+++ b/app/TGroup.php
@@ -304,7 +304,7 @@ public function artistRole(): ?ArtistRole\TGroup {
             return null;
         }
         if (!isset($this->artistRole)) {
-            $this->artistRole = new ArtistRole\TGroup($this->id, new Manager\Artist);
+            $this->artistRole = new ArtistRole\TGroup($this->id, new Manager\Artist());
         }
         return $this->artistRole;
     }
@@ -399,7 +399,7 @@ public function releaseType(): ?int {
     public function releaseTypeName(): ?string {
         static $releaseTypes;
         if (is_null($releaseTypes)) {
-            $releaseTypes = (new \Gazelle\ReleaseType)->list();
+            $releaseTypes = (new \Gazelle\ReleaseType())->list();
         }
         return $this->info()['ReleaseType'] == 0 ? null : $releaseTypes[$this->releaseType()];
     }
@@ -1001,9 +1001,9 @@ public function absorb(Torrent $torrent, User $user, Log $logger): int {
             $old->flush();
             $old->refresh();
         } else {
-            (new \Gazelle\Manager\Bookmark)->merge($old, $this);
-            (new \Gazelle\Manager\Comment)->merge('torrents', $oldId, $this->id);
-            (new \Gazelle\Manager\Vote)->merge($old, $this, new Manager\User);
+            (new \Gazelle\Manager\Bookmark())->merge($old, $this);
+            (new \Gazelle\Manager\Comment())->merge('torrents', $oldId, $this->id);
+            (new \Gazelle\Manager\Vote())->merge($old, $this, new Manager\User());
             $logger->merge($old, $this);
 
             $old->remove($user);
@@ -1032,8 +1032,8 @@ public function remove(User $user): bool {
             DELETE FROM torrents_artists WHERE GroupID = ?
             ", $this->id
         );
-        $logger    = new Log;
-        $artistMan = new Manager\Artist;
+        $logger    = new Log();
+        $artistMan = new Manager\Artist();
         foreach ($artistList as $artistId) {
             $artist = $artistMan->findById($artistId);
             if ($artist) {
@@ -1074,7 +1074,7 @@ public function remove(User $user): bool {
             self::$cache->delete_value("torrent_collages_" . $this->id);
         }
 
-        (new \Gazelle\Manager\Comment)->remove('torrents', $this->id);
+        (new \Gazelle\Manager\Comment())->remove('torrents', $this->id);
 
         // Requests
         self::$db->prepared_query("
@@ -1109,7 +1109,7 @@ public function remove(User $user): bool {
             ", $this->id
         );
 
-        $manager = new \Gazelle\DB;
+        $manager = new \Gazelle\DB();
         [$ok, $message] = $manager->softDelete(SQLDB, 'torrents_group', [['ID', $this->id]]);
         if (!$ok) {
             return false;
diff --git a/app/Task/ArtistUsage.php b/app/Task/ArtistUsage.php
index fae585d14..c2ba33cb6 100644
--- a/app/Task/ArtistUsage.php
+++ b/app/Task/ArtistUsage.php
@@ -4,6 +4,6 @@
 
 class ArtistUsage extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Stats\Artists)->updateUsage();
+        $this->processed = (new \Gazelle\Stats\Artists())->updateUsage();
     }
 }
diff --git a/app/Task/BetterTranscode.php b/app/Task/BetterTranscode.php
index 00aaac8ee..88c90db7e 100644
--- a/app/Task/BetterTranscode.php
+++ b/app/Task/BetterTranscode.php
@@ -4,6 +4,6 @@
 
 class BetterTranscode extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\TGroup)->refreshBetterTranscode();
+        $this->processed = (new \Gazelle\Manager\TGroup())->refreshBetterTranscode();
     }
 }
diff --git a/app/Task/CalculateContestLeaderboard.php b/app/Task/CalculateContestLeaderboard.php
index 423f34aae..6f13b7f0c 100644
--- a/app/Task/CalculateContestLeaderboard.php
+++ b/app/Task/CalculateContestLeaderboard.php
@@ -4,8 +4,8 @@
 
 class CalculateContestLeaderboard extends \Gazelle\Task {
     public function run(): void {
-        $contestMan = new \Gazelle\Manager\Contest;
+        $contestMan = new \Gazelle\Manager\Contest();
         $this->processed = $contestMan->calculateAllLeaderboards();
-        $this->processed += $contestMan->schedulePayout(new \Gazelle\Manager\User);
+        $this->processed += $contestMan->schedulePayout(new \Gazelle\Manager\User());
     }
 }
diff --git a/app/Task/CommunityStats.php b/app/Task/CommunityStats.php
index faa9ba449..df8605248 100644
--- a/app/Task/CommunityStats.php
+++ b/app/Task/CommunityStats.php
@@ -4,7 +4,7 @@
 
 class CommunityStats extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Stats\Users)->refresh()
-            + (new \Gazelle\Stats\TGroups)->refresh();
+        $this->processed = (new \Gazelle\Stats\Users())->refresh()
+            + (new \Gazelle\Stats\TGroups())->refresh();
     }
 }
diff --git a/app/Task/CycleAuthKeys.php b/app/Task/CycleAuthKeys.php
index b2c915082..dbcf15126 100644
--- a/app/Task/CycleAuthKeys.php
+++ b/app/Task/CycleAuthKeys.php
@@ -4,6 +4,6 @@
 
 class CycleAuthKeys extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\User)->cycleAuthKeys();
+        $this->processed += (new \Gazelle\Manager\User())->cycleAuthKeys();
     }
 }
diff --git a/app/Task/DemoteUsersRatio.php b/app/Task/DemoteUsersRatio.php
index c776712f3..2119b1484 100644
--- a/app/Task/DemoteUsersRatio.php
+++ b/app/Task/DemoteUsersRatio.php
@@ -4,7 +4,7 @@
 
 class DemoteUsersRatio extends \Gazelle\Task {
     public function run(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         foreach ($userMan->demotionCriteria() as $criteria) {
             $this->demote($criteria['To'], $criteria['Ratio'], $criteria['Upload'], $criteria['From'], $userMan);
         }
diff --git a/app/Task/DisableDownloadingRatioWatch.php b/app/Task/DisableDownloadingRatioWatch.php
index c22ba5459..8a40dfe4d 100644
--- a/app/Task/DisableDownloadingRatioWatch.php
+++ b/app/Task/DisableDownloadingRatioWatch.php
@@ -4,6 +4,6 @@
 
 class DisableDownloadingRatioWatch extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\User)->ratioWatchEngage(new \Gazelle\Tracker, $this);
+        $this->processed += (new \Gazelle\Manager\User())->ratioWatchEngage(new \Gazelle\Tracker(), $this);
     }
 }
diff --git a/app/Task/DisableLeechingRatioWatch.php b/app/Task/DisableLeechingRatioWatch.php
index 3ee04feb1..cc68ef6c2 100644
--- a/app/Task/DisableLeechingRatioWatch.php
+++ b/app/Task/DisableLeechingRatioWatch.php
@@ -4,6 +4,6 @@
 
 class DisableLeechingRatioWatch extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\User)->ratioWatchBlock(new \Gazelle\Tracker, $this);
+        $this->processed += (new \Gazelle\Manager\User())->ratioWatchBlock(new \Gazelle\Tracker(), $this);
     }
 }
diff --git a/app/Task/DisableUnconfirmedUsers.php b/app/Task/DisableUnconfirmedUsers.php
index bcd2cf654..25831b9d2 100644
--- a/app/Task/DisableUnconfirmedUsers.php
+++ b/app/Task/DisableUnconfirmedUsers.php
@@ -4,6 +4,6 @@
 
 class DisableUnconfirmedUsers extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\User)->disableUnconfirmedUsers();
+        $this->processed = (new \Gazelle\Manager\User())->disableUnconfirmedUsers();
     }
 }
diff --git a/app/Task/Donations.php b/app/Task/Donations.php
index 9cb5fd81d..bf2f3cdc3 100644
--- a/app/Task/Donations.php
+++ b/app/Task/Donations.php
@@ -4,7 +4,7 @@
 
 class Donations extends \Gazelle\Task {
     public function run(): void {
-        $donorMan = new \Gazelle\Manager\Donation;
+        $donorMan = new \Gazelle\Manager\Donation();
         $this->processed = $donorMan->expireRanks();
     }
 }
diff --git a/app/Task/ExpireFlTokens.php b/app/Task/ExpireFlTokens.php
index 071ca8217..edd8a2969 100644
--- a/app/Task/ExpireFlTokens.php
+++ b/app/Task/ExpireFlTokens.php
@@ -4,7 +4,7 @@
 
 class ExpireFlTokens extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\User)
-            ->expireFreeleechTokens(new \Gazelle\Manager\Torrent, new \Gazelle\Tracker);
+        $this->processed = (new \Gazelle\Manager\User())
+            ->expireFreeleechTokens(new \Gazelle\Manager\Torrent(), new \Gazelle\Tracker());
     }
 }
diff --git a/app/Task/ExpireInvites.php b/app/Task/ExpireInvites.php
index 64943a306..8eb0fbadc 100644
--- a/app/Task/ExpireInvites.php
+++ b/app/Task/ExpireInvites.php
@@ -4,6 +4,6 @@
 
 class ExpireInvites extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\Invite)->expire($this);
+        $this->processed = (new \Gazelle\Manager\Invite())->expire($this);
     }
 }
diff --git a/app/Task/InactiveUserDeactivate.php b/app/Task/InactiveUserDeactivate.php
index fb6b110e3..3aa32a85b 100644
--- a/app/Task/InactiveUserDeactivate.php
+++ b/app/Task/InactiveUserDeactivate.php
@@ -4,6 +4,6 @@
 
 class InactiveUserDeactivate extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\User)->inactiveUserDeactivate(new \Gazelle\Tracker);
+        $this->processed = (new \Gazelle\Manager\User())->inactiveUserDeactivate(new \Gazelle\Tracker());
     }
 }
diff --git a/app/Task/InactiveUserWarn.php b/app/Task/InactiveUserWarn.php
index a490668a5..acaf66279 100644
--- a/app/Task/InactiveUserWarn.php
+++ b/app/Task/InactiveUserWarn.php
@@ -4,6 +4,6 @@
 
 class InactiveUserWarn extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\User)->inactiveUserWarn(new \Gazelle\Util\Mail);
+        $this->processed = (new \Gazelle\Manager\User())->inactiveUserWarn(new \Gazelle\Util\Mail());
     }
 }
diff --git a/app/Task/LockOldThreads.php b/app/Task/LockOldThreads.php
index 129596c25..4cd447109 100644
--- a/app/Task/LockOldThreads.php
+++ b/app/Task/LockOldThreads.php
@@ -4,6 +4,6 @@
 
 class LockOldThreads extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\ForumThread)->lockOldThreads();
+        $this->processed = (new \Gazelle\Manager\ForumThread())->lockOldThreads();
     }
 }
diff --git a/app/Task/Peerupdate.php b/app/Task/Peerupdate.php
index 0891cb36c..73eb45906 100644
--- a/app/Task/Peerupdate.php
+++ b/app/Task/Peerupdate.php
@@ -4,7 +4,7 @@
 
 class Peerupdate extends \Gazelle\Task {
     public function run(): void {
-        [$updated, $skipped] = (new \Gazelle\Manager\Torrent)->updatePeerlists();
+        [$updated, $skipped] = (new \Gazelle\Manager\Torrent())->updatePeerlists();
         $this->processed += $updated;
     }
 }
diff --git a/app/Task/PromoteUsers.php b/app/Task/PromoteUsers.php
index cf4faf929..177c2b1af 100644
--- a/app/Task/PromoteUsers.php
+++ b/app/Task/PromoteUsers.php
@@ -4,7 +4,7 @@
 
 class PromoteUsers extends \Gazelle\Task {
     public function run(): void {
-        $manager = new \Gazelle\Manager\User;
+        $manager = new \Gazelle\Manager\User();
         $this->processed += $manager->demote($this);
         $this->processed += $manager->promote($this);
     }
diff --git a/app/Task/RatioRequirements.php b/app/Task/RatioRequirements.php
index 4b64c6e7c..f097ff861 100644
--- a/app/Task/RatioRequirements.php
+++ b/app/Task/RatioRequirements.php
@@ -4,6 +4,6 @@
 
 class RatioRequirements extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\User)->updateRatioRequirements();
+        $this->processed = (new \Gazelle\Manager\User())->updateRatioRequirements();
     }
 }
diff --git a/app/Task/RatioWatch.php b/app/Task/RatioWatch.php
index 15c8e1ace..e36d6e28c 100644
--- a/app/Task/RatioWatch.php
+++ b/app/Task/RatioWatch.php
@@ -4,6 +4,6 @@
 
 class RatioWatch extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\User)->ratioWatchAudit(new \Gazelle\Tracker, $this);
+        $this->processed += (new \Gazelle\Manager\User())->ratioWatchAudit(new \Gazelle\Tracker(), $this);
     }
 }
diff --git a/app/Task/Reaper.php b/app/Task/Reaper.php
index b51ede5a4..f40223705 100644
--- a/app/Task/Reaper.php
+++ b/app/Task/Reaper.php
@@ -4,7 +4,7 @@
 
 class Reaper extends \Gazelle\Task {
     public function run(): void {
-        $reaper = new \Gazelle\Torrent\Reaper(new \Gazelle\Manager\Torrent, new \Gazelle\Manager\User);
+        $reaper = new \Gazelle\Torrent\Reaper(new \Gazelle\Manager\Torrent(), new \Gazelle\Manager\User());
         $this->processed = 0;
         if (REAPER_TASK_CLAIM) {
             $reaper->claim();
diff --git a/app/Task/Recovery.php b/app/Task/Recovery.php
index 7e5bade5e..28e5ccfdf 100644
--- a/app/Task/Recovery.php
+++ b/app/Task/Recovery.php
@@ -5,7 +5,7 @@
 class Recovery extends \Gazelle\Task {
     public function run(): void {
         if (RECOVERY) {
-            $recovery = new \Gazelle\Manager\Recovery;
+            $recovery = new \Gazelle\Manager\Recovery();
             if (RECOVERY_AUTOVALIDATE) {
                 $recovery->validatePending();
             }
diff --git a/app/Task/RemoveDeadSessions.php b/app/Task/RemoveDeadSessions.php
index 808d46fd0..c67dc369a 100644
--- a/app/Task/RemoveDeadSessions.php
+++ b/app/Task/RemoveDeadSessions.php
@@ -4,6 +4,6 @@
 
 class RemoveDeadSessions extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\Session)->purge();
+        $this->processed += (new \Gazelle\Manager\Session())->purge();
     }
 }
diff --git a/app/Task/ResetReseedRequest.php b/app/Task/ResetReseedRequest.php
index a4e16142f..4ffb11aa4 100644
--- a/app/Task/ResetReseedRequest.php
+++ b/app/Task/ResetReseedRequest.php
@@ -4,6 +4,6 @@
 
 class ResetReseedRequest extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\Torrent)->resetReseededRequest();
+        $this->processed += (new \Gazelle\Manager\Torrent())->resetReseededRequest();
     }
 }
diff --git a/app/Task/SSLCertificate.php b/app/Task/SSLCertificate.php
index 74f6cddf7..c74e291fb 100644
--- a/app/Task/SSLCertificate.php
+++ b/app/Task/SSLCertificate.php
@@ -4,6 +4,6 @@
 
 class SSLCertificate extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\SSLHost)->schedule();
+        $this->processed += (new \Gazelle\Manager\SSLHost())->schedule();
     }
 }
diff --git a/app/Task/TorrentHistory.php b/app/Task/TorrentHistory.php
index 2c75fc418..c79769d77 100644
--- a/app/Task/TorrentHistory.php
+++ b/app/Task/TorrentHistory.php
@@ -4,6 +4,6 @@
 
 class TorrentHistory extends \Gazelle\Task {
     public function run(): void {
-        (new \Gazelle\Manager\Torrent)->updateSeedingHistory();
+        (new \Gazelle\Manager\Torrent())->updateSeedingHistory();
     }
 }
diff --git a/app/Task/UpdateDailyTop10.php b/app/Task/UpdateDailyTop10.php
index 75c8a4dc1..a8e7a7afd 100644
--- a/app/Task/UpdateDailyTop10.php
+++ b/app/Task/UpdateDailyTop10.php
@@ -4,6 +4,6 @@
 
 class UpdateDailyTop10 extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\Torrent)->storeTop10('Daily', 'day', 1);
+        $this->processed = (new \Gazelle\Manager\Torrent())->storeTop10('Daily', 'day', 1);
     }
 }
diff --git a/app/Task/UpdateUserBonusPoints.php b/app/Task/UpdateUserBonusPoints.php
index bcdc47903..deb031add 100644
--- a/app/Task/UpdateUserBonusPoints.php
+++ b/app/Task/UpdateUserBonusPoints.php
@@ -4,6 +4,6 @@
 
 class UpdateUserBonusPoints extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\Bonus)->givePoints($this);
+        $this->processed = (new \Gazelle\Manager\Bonus())->givePoints($this);
     }
 }
diff --git a/app/Task/UpdateWeeklyTop10.php b/app/Task/UpdateWeeklyTop10.php
index 0501759e5..83ab42997 100644
--- a/app/Task/UpdateWeeklyTop10.php
+++ b/app/Task/UpdateWeeklyTop10.php
@@ -4,6 +4,6 @@
 
 class UpdateWeeklyTop10 extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\Torrent)->storeTop10('Weekly', 'week', 7);
+        $this->processed = (new \Gazelle\Manager\Torrent())->storeTop10('Weekly', 'week', 7);
     }
 }
diff --git a/app/Task/UploadNotifier.php b/app/Task/UploadNotifier.php
index d8555c2e9..1b15b9a5d 100644
--- a/app/Task/UploadNotifier.php
+++ b/app/Task/UploadNotifier.php
@@ -4,10 +4,10 @@
 
 class UploadNotifier extends \Gazelle\Task {
     public function run(): void {
-        $this->processed = (new \Gazelle\Manager\Notification)
+        $this->processed = (new \Gazelle\Manager\Notification())
             ->processBacklog(
-                new \Gazelle\Manager\NotificationTicket,
-                new \Gazelle\Manager\Torrent,
+                new \Gazelle\Manager\NotificationTicket(),
+                new \Gazelle\Manager\Torrent(),
             );
     }
 }
diff --git a/app/Task/UserLastAccess.php b/app/Task/UserLastAccess.php
index f3637fa35..566235c67 100644
--- a/app/Task/UserLastAccess.php
+++ b/app/Task/UserLastAccess.php
@@ -4,6 +4,6 @@
 
 class UserLastAccess extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Manager\User)->updateLastAccess();
+        $this->processed += (new \Gazelle\Manager\User())->updateLastAccess();
     }
 }
diff --git a/app/Task/UserStatsDaily.php b/app/Task/UserStatsDaily.php
index d4c99aecb..398a2216a 100644
--- a/app/Task/UserStatsDaily.php
+++ b/app/Task/UserStatsDaily.php
@@ -4,7 +4,7 @@
 
 class UserStatsDaily extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Stats\Users)
+        $this->processed += (new \Gazelle\Stats\Users())
             ->registerActivity('users_stats_daily', DELETE_USER_STATS_DAILY_DAY);
     }
 }
diff --git a/app/Task/UserStatsMonthly.php b/app/Task/UserStatsMonthly.php
index 2356d1420..9a3f92514 100644
--- a/app/Task/UserStatsMonthly.php
+++ b/app/Task/UserStatsMonthly.php
@@ -4,7 +4,7 @@
 
 class UserStatsMonthly extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Stats\Users)
+        $this->processed += (new \Gazelle\Stats\Users())
             ->registerActivity('users_stats_monthly', DELETE_USER_STATS_MONTHLY_DAY);
     }
 }
diff --git a/app/Task/UserStatsYearly.php b/app/Task/UserStatsYearly.php
index 641c17c4d..0c35fce8e 100644
--- a/app/Task/UserStatsYearly.php
+++ b/app/Task/UserStatsYearly.php
@@ -4,7 +4,7 @@
 
 class UserStatsYearly extends \Gazelle\Task {
     public function run(): void {
-        $this->processed += (new \Gazelle\Stats\Users)
+        $this->processed += (new \Gazelle\Stats\Users())
             ->registerActivity('users_stats_yearly', 0);
     }
 }
diff --git a/app/Torrent.php b/app/Torrent.php
index f7f6b300f..9ad669185 100644
--- a/app/Torrent.php
+++ b/app/Torrent.php
@@ -98,12 +98,12 @@ public function torrentFilename(bool $asText, int $maxLength): string {
      * Convert a stored torrent into a binary file that can be loaded in a torrent client
      */
     public function torrentBody(string $announceUrl): string {
-        $filer = new \Gazelle\File\Torrent;
+        $filer = new \Gazelle\File\Torrent();
         $contents = $filer->get($this->id);
         if ($contents == false) {
             return '';
         }
-        $tor = new \OrpheusNET\BencodeTorrent\BencodeTorrent;
+        $tor = new \OrpheusNET\BencodeTorrent\BencodeTorrent();
         try {
             $tor->decodeString($contents);
         } catch (\RuntimeException) {
@@ -346,13 +346,13 @@ public function remove(?User $user, string $reason, int $trackerReason = -1): ar
         $infohash = $this->infohash();
         $sizeMB   = number_format($this->size() / (1024 * 1024), 2) . ' MiB';
         $name     = $this->name();
-        (new \Gazelle\Tracker)->update_tracker('delete_torrent', [
+        (new \Gazelle\Tracker())->update_tracker('delete_torrent', [
             'id'        => $this->id,
             'info_hash' => $this->infohashEncoded(),
             'reason'    => $trackerReason,
         ]);
 
-        $manager = new \Gazelle\DB;
+        $manager = new \Gazelle\DB();
         $manager->relaxConstraints(true);
         [$ok, $message] = $manager->softDelete(SQLDB, 'torrents_leech_stats', [['TorrentID', $this->id]], false);
         if (!$ok) {
@@ -433,7 +433,7 @@ public function remove(?User $user, string $reason, int $trackerReason = -1): ar
         }
 
         $userInfo = $user ? " by " . $user->username() : '';
-        (new Log)->general(
+        (new Log())->general(
             "Torrent {$this->id} ($name) [$edition] ($sizeMB $infohash) was deleted$userInfo for reason: $reason")
             ->torrent($this, $user, "deleted torrent ($sizeMB $infohash) for reason: $reason");
         self::$db->commit();
@@ -465,7 +465,7 @@ public function expireToken(User $user): int {
         );
         $affected = self::$db->affected_rows();
         self::$cache->delete_value("users_tokens_{$user->id()}");
-        (new \Gazelle\Tracker)->removeToken($this, $user);
+        (new \Gazelle\Tracker())->removeToken($this, $user);
         return $affected;
     }
 
diff --git a/app/Torrent/Log.php b/app/Torrent/Log.php
index 7feb9228a..9c5ce45cf 100644
--- a/app/Torrent/Log.php
+++ b/app/Torrent/Log.php
@@ -37,7 +37,7 @@ public function logDetails(): array {
         );
         $logs = self::$db->to_array('LogID', MYSQLI_ASSOC, false);
         $details = [];
-        $htmlFiler = new \Gazelle\File\RipLogHTML;
+        $htmlFiler = new \Gazelle\File\RipLogHTML();
         foreach ($logs as $log) {
             $details[$log['LogID']] = [
                 'adjustment' => !$log['is_adjusted']
diff --git a/app/Torrent/Report.php b/app/Torrent/Report.php
index 11040464d..5a390ba38 100644
--- a/app/Torrent/Report.php
+++ b/app/Torrent/Report.php
@@ -95,7 +95,7 @@ public function reporterId(): int {
     }
 
     public function reportType(): \Gazelle\Torrent\ReportType {
-        return (new \Gazelle\Manager\Torrent\ReportType)->findByType($this->type());
+        return (new \Gazelle\Manager\Torrent\ReportType())->findByType($this->type());
     }
 
     public function resolverId(): int {
diff --git a/app/TorrentAbstract.php b/app/TorrentAbstract.php
index 5d7c9287c..1d721804f 100644
--- a/app/TorrentAbstract.php
+++ b/app/TorrentAbstract.php
@@ -311,7 +311,7 @@ public function hasLogDb(): bool {
      * This method can be used to verify that group() can be called.
      */
     public function hasTGroup(): bool {
-        return (new Manager\TGroup)->findById($this->groupId()) instanceof TGroup;
+        return (new Manager\TGroup())->findById($this->groupId()) instanceof TGroup;
     }
 
     /**
diff --git a/app/Upload.php b/app/Upload.php
index d71e19603..b41cae97b 100644
--- a/app/Upload.php
+++ b/app/Upload.php
@@ -72,7 +72,7 @@ public function head(): string {
     }
 
     public function foot(bool $showFooter): string {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         return self::$twig->render('upload/footer.twig', [
             'is_upload'    => $this->Torrent === false || isset($this->Torrent['add-format']),
             'info'         => $this->Torrent,
@@ -116,7 +116,7 @@ public function music_form(array $GenreTags, \Gazelle\Manager\TGroup $manager):
             $LossymasterApproved = $Torrent['LossymasterApproved'] ?? false;
             $LossywebApproved    = $Torrent['LossywebApproved'] ?? false;
         }
-        $releaseTypes = (new \Gazelle\ReleaseType)->list();
+        $releaseTypes = (new \Gazelle\ReleaseType())->list();
 
         ob_start();
 ?>
diff --git a/app/User.php b/app/User.php
index 7b99a4889..70db8b0ff 100644
--- a/app/User.php
+++ b/app/User.php
@@ -891,7 +891,7 @@ public function recordPasswordChange(string $ipaddr): int {
             ", $this->id, $ipaddr, $_SERVER['HTTP_USER_AGENT']
         );
         Irc::sendMessage($this->username(), "Security alert: Your password was changed via $ipaddr with {$_SERVER['HTTP_USER_AGENT']}. Not you? Contact staff ASAP.");
-        (new Mail)->send($this->email(), 'Password changed information for ' . SITE_NAME,
+        (new Mail())->send($this->email(), 'Password changed information for ' . SITE_NAME,
             self::$twig->render('email/password-change.twig', [
                 'ipaddr'     => $ipaddr,
                 'now'        => date('Y-m-d H:i:s'),
@@ -987,7 +987,7 @@ public function warnPost(
         \Gazelle\User $staffer,
         string $staffReason,
         string $userMessage
-): void {
+    ): void {
         if (!$weekDuration) {  // verbal warning
             $warned  = "Verbally warned";
             $this->inbox()->createSystem(
@@ -1261,7 +1261,7 @@ public function supportCount(int $newClassId, int $levelClassId): int {
     }
 
     public function updateCatchup(): bool {
-        return (new WitnessTable\UserReadForum)->witness($this);
+        return (new WitnessTable\UserReadForum())->witness($this);
     }
 
     public function addClasses(array $classes): int {
@@ -1809,7 +1809,7 @@ public function addBounty(int $bounty): int {
 
     public function buffer(): array {
         $class = $this->primaryClass();
-        $demotion = array_filter((new Manager\User)->demotionCriteria(), fn($v) => in_array($class, $v['From']));
+        $demotion = array_filter((new Manager\User())->demotionCriteria(), fn($v) => in_array($class, $v['From']));
         $criteria = end($demotion);
 
         $effectiveUpload = $this->uploadedSize() + $this->stats()->requestBountySize();
diff --git a/app/User/Activity.php b/app/User/Activity.php
index 1efa3f28d..3cc3dd4e5 100644
--- a/app/User/Activity.php
+++ b/app/User/Activity.php
@@ -156,7 +156,7 @@ public function setStaff(\Gazelle\Staff $staff): static {
             $this->setAlert('<a class="nobr" href="staffblog.php">New staff blog post!</a>');
         }
         if (FEATURE_EMAIL_REENABLE) {
-            $total = (new \Gazelle\Manager\AutoEnable)->openTotal();
+            $total = (new \Gazelle\Manager\AutoEnable())->openTotal();
             if ($total > 0) {
                 $this->setAction('<a class="nobr" href="tools.php?action=enable_requests">' . $total . " Enable request" . plural($total) . "</a>");
             }
diff --git a/app/User/AutoEnable.php b/app/User/AutoEnable.php
index fad8a5a42..aa2adc17d 100644
--- a/app/User/AutoEnable.php
+++ b/app/User/AutoEnable.php
@@ -158,7 +158,7 @@ public function resolve(\Gazelle\User $viewer, int $status, string $comment): in
                     ", $token, $this->id
                 );
             }
-            (new Mail)->send($this->email(), $subject, self::$twig->render($template, ['token' => $token]));
+            (new Mail())->send($this->email(), $subject, self::$twig->render($template, ['token' => $token]));
             $this->user->addStaffNote(
                 "Enable request {$this->id} " . strtolower($this->outcomeLabel())
                     . ' by [user]' . $viewer->username() . '[/user]' . (!empty($comment) ? "\nReason: $comment" : "")
@@ -203,7 +203,7 @@ public function processToken(): bool {
                 WHERE um.ID = ?
                 ", $userId
             );
-            (new \Gazelle\Tracker)->addUser($this->user);
+            (new \Gazelle\Tracker())->addUser($this->user);
             self::$cache->delete_value(self::CACHE_TOTAL_OPEN);
             $success = true;
         }
diff --git a/app/User/Bonus.php b/app/User/Bonus.php
index ec12bb1bd..03cd91041 100644
--- a/app/User/Bonus.php
+++ b/app/User/Bonus.php
@@ -26,7 +26,7 @@ public function pointsSpent(): int {
     }
 
     protected function items(): array {
-        return (new \Gazelle\Manager\Bonus)->itemList();
+        return (new \Gazelle\Manager\Bonus())->itemList();
     }
 
     public function itemList(): array {
diff --git a/app/User/Bookmark.php b/app/User/Bookmark.php
index 171b9d188..2e231b164 100644
--- a/app/User/Bookmark.php
+++ b/app/User/Bookmark.php
@@ -55,12 +55,12 @@ public function create(string $type, int $id): bool {
                 );
                 self::$cache->delete_multi(["u_book_t_" . $this->user->id(), "bookmarks_{$type}_" . $this->user->id(), "bookmarks_group_ids_" . $this->user->id()]);
 
-                $torMan = (new \Gazelle\Manager\Torrent)->setViewer($this->user);
-                $tgroup = (new \Gazelle\Manager\TGroup)->findById($id);
+                $torMan = (new \Gazelle\Manager\Torrent())->setViewer($this->user);
+                $tgroup = (new \Gazelle\Manager\TGroup())->findById($id);
                 $tgroup->stats()->increment('bookmark_total');
 
                 // RSS feed stuff
-                $Feed = new \Gazelle\Feed;
+                $Feed = new \Gazelle\Feed();
                 foreach ($tgroup->torrentIdList() as $id) {
                     $torrent = $torMan->findById($id);
                     if (is_null($torrent)) {
diff --git a/app/User/Donor.php b/app/User/Donor.php
index 5c21af2dc..463ebfac0 100644
--- a/app/User/Donor.php
+++ b/app/User/Donor.php
@@ -470,7 +470,7 @@ public function donate(
                 $fiatAmount = $amount;
                 break;
             default:
-                $xbtAmount  = (new \Gazelle\Manager\XBT)->fiat2xbt($amount, $currency);
+                $xbtAmount  = (new \Gazelle\Manager\XBT())->fiat2xbt($amount, $currency);
                 $fiatAmount = $xbtAmount * $xbtRate;
                 break;
         }
diff --git a/app/User/Inbox.php b/app/User/Inbox.php
index 0528f8b85..fbf758c25 100644
--- a/app/User/Inbox.php
+++ b/app/User/Inbox.php
@@ -68,7 +68,7 @@ public function create(?\Gazelle\User $from, string $subject, string $body): ?\G
         self::$db->set_query_id($qid);
 
         $senderName = $from?->username() ?? 'System';
-        (new \Gazelle\Manager\Notification)->push(
+        (new \Gazelle\Manager\Notification())->push(
             [$this->id()],
             "Message from $senderName, Subject: $subject", $body, SITE_URL . '/inbox.php', \Gazelle\Manager\Notification::INBOX,
         );
diff --git a/app/User/Notification/Blog.php b/app/User/Notification/Blog.php
index 71800d3b3..9604ae4c2 100644
--- a/app/User/Notification/Blog.php
+++ b/app/User/Notification/Blog.php
@@ -8,16 +8,16 @@ public function className(): string {
     }
 
     public function clear(): int {
-        return (int)(new \Gazelle\WitnessTable\UserReadBlog)->witness($this->user);
+        return (int)(new \Gazelle\WitnessTable\UserReadBlog())->witness($this->user);
     }
 
     public function load(): bool {
-        $blogMan = new \Gazelle\Manager\Blog;
+        $blogMan = new \Gazelle\Manager\Blog();
         $latest = $blogMan->latest();
         if (is_null($latest)) {
             return false;
         }
-        $lastRead = (new \Gazelle\WitnessTable\UserReadBlog)->lastRead($this->user);
+        $lastRead = (new \Gazelle\WitnessTable\UserReadBlog())->lastRead($this->user);
 
         // You must be new around here.
         $newJoiner = is_null($lastRead) && $latest->createdEpoch() > strtotime($this->user->created());
diff --git a/app/User/Notification/GlobalNotification.php b/app/User/Notification/GlobalNotification.php
index 10fbea06c..6d28f4eb3 100644
--- a/app/User/Notification/GlobalNotification.php
+++ b/app/User/Notification/GlobalNotification.php
@@ -17,13 +17,13 @@ public function clear(): int {
         self::$cache->cache_value(
             sprintf(self::CLEARED, $this->user->id()),
             true,
-            (new \Gazelle\Notification\GlobalNotification)->remaining()
+            (new \Gazelle\Notification\GlobalNotification())->remaining()
         );
         return 1;
     }
 
     public function load(): bool {
-        $alert = (new \Gazelle\Notification\GlobalNotification)->alert();
+        $alert = (new \Gazelle\Notification\GlobalNotification())->alert();
         if ($alert && self::$cache->get_value(sprintf(self::CLEARED, $this->user->id())) === false) {
             $this->title     = $alert['title'];
             $this->url       = $alert['url'];
diff --git a/app/User/Notification/News.php b/app/User/Notification/News.php
index 849033840..155cdac09 100644
--- a/app/User/Notification/News.php
+++ b/app/User/Notification/News.php
@@ -8,19 +8,19 @@ public function className(): string {
     }
 
     public function clear(): int {
-        if ((new \Gazelle\WitnessTable\UserReadNews)->witness($this->user)) {
+        if ((new \Gazelle\WitnessTable\UserReadNews())->witness($this->user)) {
             $this->user->flush();
         }
-        return (new \Gazelle\Manager\News)->latestId();
+        return (new \Gazelle\Manager\News())->latestId();
     }
 
     public function load(): bool {
-        $newsMan = new \Gazelle\Manager\News;
+        $newsMan = new \Gazelle\Manager\News();
         ["id" => $newsId, "title" => $title] = $newsMan->latest();
         if ($newsId === -1) {
             return false;
         }
-        $lastRead = (new \Gazelle\WitnessTable\UserReadNews)->lastRead($this->user);
+        $lastRead = (new \Gazelle\WitnessTable\UserReadNews())->lastRead($this->user);
 
         // You must be new around here.
         $newJoiner = is_null($lastRead)
diff --git a/app/User/Quote.php b/app/User/Quote.php
index 08e55f18a..76065a3f7 100644
--- a/app/User/Quote.php
+++ b/app/User/Quote.php
@@ -173,9 +173,9 @@ public function page(int $limit, int $offset): array {
         $quoteList = self::$db->to_array(false, MYSQLI_ASSOC, false);
 
         $page    = [];
-        $postMan = new \Gazelle\Manager\ForumPost;
-        $reqMan  = new \Gazelle\Manager\Request;
-        $tgMan   = new \Gazelle\Manager\TGroup;
+        $postMan = new \Gazelle\Manager\ForumPost();
+        $reqMan  = new \Gazelle\Manager\Request();
+        $tgMan   = new \Gazelle\Manager\TGroup();
 
         foreach ($quoteList as $q) {
             $context = [];
@@ -246,7 +246,7 @@ public function unreadTotal(): int {
         $key = sprintf(self::UNREAD_QUOTE_KEY, $this->user->id());
         $total = self::$cache->get_value($key);
         if ($total === false) {
-            $forMan = new \Gazelle\Manager\Forum;
+            $forMan = new \Gazelle\Manager\Forum();
             [$cond, $args] = $forMan->configureForUser(new \Gazelle\User($this->user->id()));
             $args[] = $this->user->id(); // for q.UserID
             $total = (int)self::$db->scalar("
diff --git a/app/User/Subscription.php b/app/User/Subscription.php
index 75f3d4b79..d74d03081 100644
--- a/app/User/Subscription.php
+++ b/app/User/Subscription.php
@@ -133,7 +133,7 @@ public function commentSubscriptions(): array {
     public function unread(): int {
         $unread = self::$cache->get_value('subscriptions_user_new_' . $this->user->id());
         if ($unread === false) {
-            $unread = (new \Gazelle\Manager\Forum)->unreadSubscribedForumTotal($this->user) + $this->unreadCommentTotal();
+            $unread = (new \Gazelle\Manager\Forum())->unreadSubscribedForumTotal($this->user) + $this->unreadCommentTotal();
             self::$cache->cache_value('subscriptions_user_new_' . $this->user->id(), $unread, 0);
         }
         return $unread;
@@ -238,7 +238,7 @@ public function catchupSubscriptions(): int {
     }
 
     public function latestSubscriptionList(bool $showUnread, int $limit, int $offset): array {
-        $forMan = new \Gazelle\Manager\Forum;
+        $forMan = new \Gazelle\Manager\Forum();
         [$cond, $args] = $forMan->configureForUser($this->user);
         if ($showUnread) {
             $cond[] = "p.ID > if(t.IsLocked = '1' AND t.IsSticky = '0', p.ID, coalesce(lr.PostID, 0))";
diff --git a/app/User/Vote.php b/app/User/Vote.php
index 627e6c526..1cc68ad90 100644
--- a/app/User/Vote.php
+++ b/app/User/Vote.php
@@ -91,11 +91,11 @@ public function setTopYearInterval(int $lower, int $higher): static {
                 $this->topWhere[] = 'tg.Year >= ?';
                 $this->topArgs[] = $lower;
             }
-         } elseif ($higher > 0) {
+        } elseif ($higher > 0) {
             $this->topJoin['torrents_group'] = 'INNER JOIN torrents_group tg ON (tg.ID = v.GroupID)';
             $this->topWhere[] = 'tg.Year <= ?';
             $this->topArgs[] = $higher;
-         }
+        }
          return $this;
     }
 
diff --git a/app/UserCreator.php b/app/UserCreator.php
index 4aa502a52..52a5040d5 100644
--- a/app/UserCreator.php
+++ b/app/UserCreator.php
@@ -43,7 +43,7 @@ public function create(): User {
         } else {
             $this->permissionId = USER;
         }
-        $manager = new Manager\User;
+        $manager = new Manager\User();
         if (!isset($this->inviteKey)) {
             $inviter = null;
         } else {
@@ -76,7 +76,7 @@ public function create(): User {
             // neither setEmail() nor setInviteKey() produced anything useful
             throw new UserCreatorException('email');
         }
-        $domainManager = new \Gazelle\Manager\EmailBlacklist;
+        $domainManager = new \Gazelle\Manager\EmailBlacklist();
         foreach ($this->email as $email) {
             if ($domainManager->exists($email)) {
                 throw new UserCreatorException('email');
@@ -120,7 +120,7 @@ public function create(): User {
         );
 
         if ($inviter) {
-            (new Manager\InviteSource)->resolveInviteSource($this->inviteKey, $user);
+            (new Manager\InviteSource())->resolveInviteSource($this->inviteKey, $user);
             (new User\InviteTree($inviter, $manager))->add($user);
             $inviter->stats()->increment('invited_total');
             $user->externalProfile()->modifyProfile($inviterReason);
@@ -181,7 +181,7 @@ public function create(): User {
         );
         self::$db->commit();
 
-        (new Tracker)->addUser($user);
+        (new Tracker())->addUser($user);
 
         $this->reset(); // So we can create another user
         return $user;
diff --git a/app/UserRank/Configuration.php b/app/UserRank/Configuration.php
index 3036bb3c6..427062bba 100644
--- a/app/UserRank/Configuration.php
+++ b/app/UserRank/Configuration.php
@@ -13,7 +13,7 @@ public function definition(): array {
 
     public function instance(string $dimension): \Gazelle\UserRank\AbstractUserRank {
         $className = "\\Gazelle\\UserRank\\Dimension\\" . $this->config[$dimension][1];
-        return new $className; /** @phpstan-ignore-line */
+        return new $className(); /** @phpstan-ignore-line */
     }
 
     public function weight(string $dimension): int {
diff --git a/app/Util/Irc.php b/app/Util/Irc.php
index 8ae74e24c..e526b9665 100644
--- a/app/Util/Irc.php
+++ b/app/Util/Irc.php
@@ -14,7 +14,7 @@ public static function sendMessage(string $target, string $message): bool {
         if (DISABLE_IRC) {
             return true;
         }
-        $curl = new Curl;
+        $curl = new Curl();
         $curl->setUseProxy(false)
             ->setMethod(CurlMethod::POST)
             ->setOption(CURLOPT_POSTFIELDS, $message)
diff --git a/app/Util/IrcText.php b/app/Util/IrcText.php
index 51d3d4be6..b8f842531 100644
--- a/app/Util/IrcText.php
+++ b/app/Util/IrcText.php
@@ -106,5 +106,4 @@ enum IrcText: string {
     case Mauve              = "\x0385";
     case Violet             = "\x0386";
     case LavenderRose       = "\x0387";
-
 }
diff --git a/app/Util/LastFM.php b/app/Util/LastFM.php
index e60055e58..dec58c6ba 100644
--- a/app/Util/LastFM.php
+++ b/app/Util/LastFM.php
@@ -210,7 +210,7 @@ protected function fetch(string $method, array $args): array|false {
         foreach ($args as $Key => $Value) {
             $url .= "&$Key=" . urlencode($Value);
         }
-        $curl = new Curl;
+        $curl = new Curl();
         if ($curl->fetch($url . "&format=json&api_key=" . LASTFM_API_KEY)) {
             return json_decode($curl->result(), true);
         }
diff --git a/app/Util/Twig.php b/app/Util/Twig.php
index fef807970..30c78fb66 100644
--- a/app/Util/Twig.php
+++ b/app/Util/Twig.php
@@ -16,7 +16,7 @@ public static function factory(): \Twig\Environment {
             new \Twig\Loader\FilesystemLoader(__DIR__ . '/../../templates'), [
                 'debug' => DEBUG_MODE,
                 'cache' => __DIR__ . '/../../cache/twig'
-        ]);
+            ]);
 
         $twig->addFilter(new \Twig\TwigFilter(
             'article',
@@ -302,7 +302,7 @@ function ($userId, $viewer): string {
 
         $twig->addTest(new \Twig\TwigTest('request_fill', fn($contest) => $contest instanceof \Gazelle\Contest\RequestFill));
 
-        $twig->addGlobal('dom', new \Gazelle\Util\Dominator);
+        $twig->addGlobal('dom', new \Gazelle\Util\Dominator());
 
         return $twig;
     }
diff --git a/bin/fix-leech-status.php b/bin/fix-leech-status.php
index 5efe933f3..267488554 100644
--- a/bin/fix-leech-status.php
+++ b/bin/fix-leech-status.php
@@ -6,8 +6,8 @@
 
 ini_set('max_execution_time', -1);
 
-$tracker = new Gazelle\Tracker;
-$userMan = new Gazelle\Manager\User;
+$tracker = new Gazelle\Tracker();
+$userMan = new Gazelle\Manager\User();
 
 $db = Gazelle\DB::DB();
 $db->prepared_query('
diff --git a/bin/migrate-logs.php b/bin/migrate-logs.php
index e23cd85a6..5c1ab320c 100644
--- a/bin/migrate-logs.php
+++ b/bin/migrate-logs.php
@@ -22,8 +22,8 @@
 $errHtml   = 0;
 
 $db        = Gazelle\DB::DB();
-$logFiler  = new Gazelle\File\RipLog;
-$htmlFiler = new Gazelle\File\RipLogHTML;
+$logFiler  = new Gazelle\File\RipLog();
+$htmlFiler = new Gazelle\File\RipLogHTML();
 
 while (true) {
     $db->prepared_query('
diff --git a/bin/migrate-torrent-files.php b/bin/migrate-torrent-files.php
index 11ec96562..e0bdcc901 100644
--- a/bin/migrate-torrent-files.php
+++ b/bin/migrate-torrent-files.php
@@ -11,7 +11,7 @@
 $processed = 0;
 $new       = 0;
 
-$filer = new Gazelle\File\Torrent;
+$filer = new Gazelle\File\Torrent();
 
 while (true) {
     $db->prepared_query('
diff --git a/bin/rebuild-invite-trees.php b/bin/rebuild-invite-trees.php
index 47abe31ac..472857352 100644
--- a/bin/rebuild-invite-trees.php
+++ b/bin/rebuild-invite-trees.php
@@ -16,7 +16,7 @@
 while ([$invitee, $inviter] = $db->next_record()) {
     $save = $db->get_query_id();
     if (!isset($inv[$inviter])) {
-        $inv[$inviter] = new Gazelle\User\InviteTree(new Gazelle\User($inviter), new Gazelle\Manager\User);
+        $inv[$inviter] = new Gazelle\User\InviteTree(new Gazelle\User($inviter), new Gazelle\Manager\User());
     }
     $inv[$inviter]->add($invitee);
     $db->set_query_id($save);
diff --git a/bin/recheck-file-storage.php b/bin/recheck-file-storage.php
index 848efa04d..f1f62ebd0 100644
--- a/bin/recheck-file-storage.php
+++ b/bin/recheck-file-storage.php
@@ -21,7 +21,7 @@
 $allConfig = [
     '-html' => [
         'CHECK' => 'SELECT Log FROM torrents_logs WHERE TorrentID = ? AND LogID = ?',
-        'FILER' => new Gazelle\File\RipLogHTML,
+        'FILER' => new Gazelle\File\RipLogHTML(),
         'MD5'   => 'SELECT Log AS digest FROM torrents_logs WHERE TorrentID = ? AND LogID = ?',
         'PIPE'  => '/usr/bin/find ' . STORAGE_PATH_RIPLOGHTML . ' -type f',
         'MATCH' => '~/(\d+)_(\d+)\.html$~',
@@ -29,7 +29,7 @@
     ],
     '-log' => [
         'CHECK' => 'SELECT 1 FROM torrents_logs WHERE TorrentID = ? AND LogID = ?',
-        'FILER' => new Gazelle\File\RipLog,
+        'FILER' => new Gazelle\File\RipLog(),
         'MD5'   => null,
         'PIPE'  => '/usr/bin/find ' . STORAGE_PATH_RIPLOG . ' -type f',
         'MATCH' => '~/(\d+)_(\d+)\.log$~',
@@ -37,7 +37,7 @@
     ],
     '-torrent' => [
         'CHECK' => 'SELECT 1 FROM torrents WHERE ID = ?',
-        'FILER' => new Gazelle\File\Torrent,
+        'FILER' => new Gazelle\File\Torrent(),
         'MD5'   => 'SELECT File AS digest FROM torrents_files WHERE TorrentID = ?',
         'PIPE'  => '/usr/bin/find ' . STORAGE_PATH_TORRENT . ' -type f',
         'MATCH' => '~/(\d+)\.torrent$~',
diff --git a/bin/regen-filelists.php b/bin/regen-filelists.php
index 8cb815455..71e84d35b 100644
--- a/bin/regen-filelists.php
+++ b/bin/regen-filelists.php
@@ -3,9 +3,9 @@
 require_once(__DIR__ . '/../lib/bootstrap.php');
 $Cache->disableLocalCache();
 
-$torMan  = new Gazelle\Manager\Torrent;
-$filer   = new Gazelle\File\Torrent;
-$encoder = new OrpheusNET\BencodeTorrent\BencodeTorrent;
+$torMan  = new Gazelle\Manager\Torrent();
+$filer   = new Gazelle\File\Torrent();
+$encoder = new OrpheusNET\BencodeTorrent\BencodeTorrent();
 $db      = Gazelle\DB::DB();
 $max     = $db->scalar("SELECT max(ID) FROM torrents");
 $id      = $argv[1] ?? 0;
diff --git a/ci-coverage.php b/ci-coverage.php
index 26d28fb07..99fb414b7 100644
--- a/ci-coverage.php
+++ b/ci-coverage.php
@@ -17,14 +17,14 @@ class CoverageHelper {
     private CodeCoverage $coverage;
 
     public function __construct() {
-        $filter = new Filter;
+        $filter = new Filter();
         $filter->includeDirectory(__DIR__ . '/app');
         $filter->includeDirectory(__DIR__ . '/classes');
         $filter->includeDirectory(__DIR__ . '/lib');
         $filter->includeDirectory(__DIR__ . '/public');
         $filter->includeDirectory(__DIR__ . '/sections');
         $this->coverage = new CodeCoverage(
-            (new Selector)->forLineCoverage($filter),
+            (new Selector())->forLineCoverage($filter),
             $filter
         );
         $this->coverage->cacheStaticAnalysis('/tmp/coverage-cache');
@@ -36,7 +36,7 @@ public function __destruct() {
         Filesystem::createDirectory($this::TARGET_DIR);
         $outfile = tempnam($this::TARGET_DIR, 'phpcov');
         if ($outfile !== false) {
-            (new PhpReport)->process($this->coverage, $outfile);
+            (new PhpReport())->process($this->coverage, $outfile);
             rename($outfile, $outfile . ".cov");
         }
     }
diff --git a/classes/text.class.php b/classes/text.class.php
index 7399902ad..88e04a623 100644
--- a/classes/text.class.php
+++ b/classes/text.class.php
@@ -372,9 +372,9 @@ public static function resolve_url(string $url): ?string {
 
             case '/torrents.php':
                 if (isset($args['torrentid'])) {
-                    return (new \Gazelle\Manager\Torrent)->findById((int)$args['torrentid'])?->link();
+                    return (new \Gazelle\Manager\Torrent())->findById((int)$args['torrentid'])?->link();
                 } elseif (isset($args['id'])) {
-                    return (new \Gazelle\Manager\TGroup)->findById((int)$args['id'])?->link();
+                    return (new \Gazelle\Manager\TGroup())->findById((int)$args['id'])?->link();
                 }
                 return null;
 
@@ -877,7 +877,7 @@ private static function to_html(array $Array, bool $Rules, bool $cache, CacheBuc
                     } elseif ((int)$Block['Val']) {
                         $GroupID = $Block['Val'];
                     }
-                    $tgroup = (new Gazelle\Manager\TGroup)->findById((int)$GroupID);
+                    $tgroup = (new Gazelle\Manager\TGroup())->findById((int)$GroupID);
                     if (is_null($tgroup)) {
                         $Str .= '[torrent]' . str_replace('[inlineurl]', '', $Block['Val']) . '[/torrent]';
                     } else {
@@ -1175,7 +1175,7 @@ function ($match) {
                 $username = $match['username'];
                 static $cache;
                 if (!isset($cache[$username])) {
-                    $userMan = new \Gazelle\Manager\User;
+                    $userMan = new \Gazelle\Manager\User();
                     $user = $userMan->findByUsername($username);
                     if (is_null($user) && preg_match('/^(.*)[.?]+$/', $username, $match)) {
                         // strip off trailing dots to see if we can match @Spine...
@@ -1415,7 +1415,7 @@ protected static function bbcodeForumUrl(int $val): string {
     }
 
     protected static function bbcodeCommentUrl(int $postId): ?string {
-        $post = (new Gazelle\Manager\Comment)->findById($postId);
+        $post = (new Gazelle\Manager\Comment())->findById($postId);
         if (is_null($post)) {
             return null;
         }
@@ -1425,7 +1425,7 @@ protected static function bbcodeCommentUrl(int $postId): ?string {
     }
 
     protected static function bbcodePostUrl(int $postId): ?string {
-        $post = (new \Gazelle\Manager\ForumPost)->findById($postId);
+        $post = (new \Gazelle\Manager\ForumPost())->findById($postId);
         if (is_null($post)) {
             return null;
         }
@@ -1442,7 +1442,7 @@ protected static function bbcodeThreadUrl(int|string $thread, int $postId = null
             return "[thread]{$thread}[/thread]";
         }
 
-        $thread = (new \Gazelle\Manager\ForumThread)->findById($threadId);
+        $thread = (new \Gazelle\Manager\ForumThread())->findById($threadId);
         if (is_null($thread)) {
             return $postId ? "[thread]{$threadId}:{$postId}[/thread]" : "[thread]{$threadId}[/thread]";
         }
diff --git a/classes/users.class.php b/classes/users.class.php
index a01a98e77..c6c671b4b 100644
--- a/classes/users.class.php
+++ b/classes/users.class.php
@@ -16,7 +16,7 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
         if ($UserID == 0) {
             return 'System';
         }
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $user = $userMan->findById($UserID);
         if (is_null($user)) {
             return "Unknown [$UserID]";
diff --git a/classes/view.class.php b/classes/view.class.php
index f59374df7..55508bd31 100644
--- a/classes/view.class.php
+++ b/classes/view.class.php
@@ -60,7 +60,7 @@ public static function header(string $pageTitle, array $option = []): string {
 
         $activity = new Gazelle\User\Activity($Viewer);
         $activity->configure()
-            ->setStaffPM(new Gazelle\Manager\StaffPM);
+            ->setStaffPM(new Gazelle\Manager\StaffPM());
 
         $notifier = new Gazelle\User\Notification($Viewer);
         $alertList = $notifier->setDocument($Document, $_REQUEST['action'] ?? '')->alertList();
@@ -73,25 +73,25 @@ public static function header(string $pageTitle, array $option = []): string {
             array_push($js, 'noty/noty', 'noty/layouts/bottomRight', 'noty/themes/default', 'user_notifications');
         }
 
-        $payMan = new Gazelle\Manager\Payment;
+        $payMan = new Gazelle\Manager\Payment();
         if ($Viewer->permitted('users_mod')) {
             $activity->setStaff(new Gazelle\Staff($Viewer))
-                ->setReport(new Gazelle\Stats\Report)
+                ->setReport(new Gazelle\Stats\Report())
                 ->setPayment($payMan)
-                ->setApplicant(new Gazelle\Manager\Applicant)
-                ->setDb(new Gazelle\DB)
-                ->setScheduler(new Gazelle\TaskScheduler)
-                ->setSSLHost(new Gazelle\Manager\SSLHost)
+                ->setApplicant(new Gazelle\Manager\Applicant())
+                ->setDb(new Gazelle\DB())
+                ->setScheduler(new Gazelle\TaskScheduler())
+                ->setSSLHost(new Gazelle\Manager\SSLHost())
                 ;
 
             if (OPEN_EXTERNAL_REFERRALS) {
-                $activity->setReferral(new Gazelle\Manager\Referral);
+                $activity->setReferral(new Gazelle\Manager\Referral());
             }
         }
 
         $PageID = [$Document, $_REQUEST['action'] ?? false, $_REQUEST['type'] ?? false];
         $navLinks = [];
-        foreach ((new Gazelle\Manager\UserNavigation)->userControlList($Viewer) as $n) {
+        foreach ((new Gazelle\Manager\UserNavigation())->userControlList($Viewer) as $n) {
             [$ID, $Key, $Title, $Target, $Tests, $TestUser, $Mandatory] = array_values($n);
             if (str_contains($Tests, ':')) {
                 $testList = [];
@@ -147,7 +147,7 @@ public static function header(string $pageTitle, array $option = []): string {
             'alert_list'  => $activity->alertList(),
             'bonus'       => new Gazelle\User\Bonus($Viewer),
             'document'    => $Document,
-            'dono_target' => $payMan->monthlyPercent(new Gazelle\Manager\Donation),
+            'dono_target' => $payMan->monthlyPercent(new Gazelle\Manager\Donation()),
             'nav_links'   => $navLinks,
             'user'        => $Viewer,
         ]);
diff --git a/gazelle.php b/gazelle.php
index 6920f7a28..31af3ce7e 100644
--- a/gazelle.php
+++ b/gazelle.php
@@ -44,8 +44,8 @@
 
 $SessionID = false;
 $Viewer    = null;
-$ipv4Man   = new Gazelle\Manager\IPv4;
-$userMan   = new Gazelle\Manager\User;
+$ipv4Man   = new Gazelle\Manager\IPv4();
+$userMan   = new Gazelle\Manager\User();
 Gazelle\Util\Twig::setUserMan($userMan);
 
 // Authorization header only makes sense for the ajax endpoint
diff --git a/lib/bootstrap.php b/lib/bootstrap.php
index 3789c616c..18ea87239 100644
--- a/lib/bootstrap.php
+++ b/lib/bootstrap.php
@@ -12,7 +12,7 @@
 
 global $Cache, $Debug, $Twig;
 
-$Cache = new Gazelle\Cache;
+$Cache = new Gazelle\Cache();
 $Twig  = Gazelle\Util\Twig::factory();
 Gazelle\Base::initialize($Cache, Gazelle\DB::DB(), $Twig);
 
diff --git a/misc/phinx/migrations/20200905163947_user_delete.php b/misc/phinx/migrations/20200905163947_user_delete.php
index e120f68b0..1ee1868de 100644
--- a/misc/phinx/migrations/20200905163947_user_delete.php
+++ b/misc/phinx/migrations/20200905163947_user_delete.php
@@ -13,9 +13,9 @@ public function up(): void {
         $this->execute('ALTER TABLE users_leech_stats DROP FOREIGN KEY users_leech_stats_ibfk_1');
         $this->execute('ALTER TABLE users_leech_stats ADD FOREIGN KEY (UserID) REFERENCES users_main (ID) ON UPDATE CASCADE ON DELETE CASCADE');
         $this->execute('ALTER TABLE users_info ADD FOREIGN KEY (UserID) REFERENCES users_main (ID) ON UPDATE CASCADE ON DELETE CASCADE');
-     }
+    }
 
-     public function down(): void {
+    public function down(): void {
         $this->execute('ALTER TABLE user_bonus DROP FOREIGN KEY user_bonus_ibfk_1');
         $this->execute('ALTER TABLE user_bonus ADD FOREIGN KEY (user_id) REFERENCES users_main (ID)');
         $this->execute('ALTER TABLE user_flt DROP FOREIGN KEY user_flt_ibfk_1');
@@ -23,5 +23,5 @@ public function down(): void {
         $this->execute('ALTER TABLE users_leech_stats DROP FOREIGN KEY users_leech_stats_ibfk_1');
         $this->execute('ALTER TABLE users_leech_stats ADD FOREIGN KEY (UserID) REFERENCES users_main (ID)');
         $this->execute('ALTER TABLE users_info DROP FOREIGN KEY users_info_ibfk_1');
-     }
+    }
 }
diff --git a/misc/phinx/migrations/20220118231832_add_disable_user_attrs.php b/misc/phinx/migrations/20220118231832_add_disable_user_attrs.php
index 694aaac50..6e88e4098 100644
--- a/misc/phinx/migrations/20220118231832_add_disable_user_attrs.php
+++ b/misc/phinx/migrations/20220118231832_add_disable_user_attrs.php
@@ -22,7 +22,7 @@ public function up(): void
             ['Name' => 'disable-leech', 'Description' => 'This user has leeching privileges disabled']
          ];
          $this->table('user_attr')->insert($rows)->save();
-      }
+    }
 
     public function down(): void
     {
diff --git a/public/feeds.php b/public/feeds.php
index 89c6a2f23..c3c6590a6 100644
--- a/public/feeds.php
+++ b/public/feeds.php
@@ -7,8 +7,8 @@
 
 require_once(__DIR__ . '/../lib/bootstrap.php');
 
-$feed = new Gazelle\Feed;
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['user'] ?? 0));
+$feed = new Gazelle\Feed();
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['user'] ?? 0));
 if (!$user?->isEnabled()
     || empty($_GET['feed'])
     || md5($user->id() . RSS_HASH . ($_GET['passkey'] ?? 'NOTPASS')) !== ($_GET['auth'] ?? 'NOTAUTH')
@@ -34,13 +34,13 @@
         echo $feed->byFeedName($user, $_GET['feed']);
         break;
     case 'feed_news':
-        echo $feed->news(new Gazelle\Manager\News);
+        echo $feed->news(new Gazelle\Manager\News());
         break;
     case 'feed_blog':
-        echo $feed->blog(new Gazelle\Manager\Blog, new Gazelle\Manager\ForumThread);
+        echo $feed->blog(new Gazelle\Manager\Blog(), new Gazelle\Manager\ForumThread());
         break;
     case 'feed_changelog':
-        echo $feed->changelog(new Gazelle\Manager\Changelog);
+        echo $feed->changelog(new Gazelle\Manager\Changelog());
         break;
     default:
         echo match (true) {
diff --git a/sections/ajax/add_log.php b/sections/ajax/add_log.php
index e23324107..0867f84f8 100644
--- a/sections/ajax/add_log.php
+++ b/sections/ajax/add_log.php
@@ -1,6 +1,6 @@
 <?php
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_GET['id'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_GET['id'] ?? 0));
 if (is_null($torrent)) {
     json_error('bad parameters');
 }
@@ -14,7 +14,7 @@
 echo (new Gazelle\Json\AddLog(
     $torrent,
     $Viewer,
-    new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog, new Gazelle\File\RipLogHTML),
+    new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog(), new Gazelle\File\RipLogHTML()),
     new Gazelle\LogfileSummary($_FILES['logfiles']),
 ))
     ->setVersion(1)
diff --git a/sections/ajax/announcements.php b/sections/ajax/announcements.php
index 72807e62b..620a35afd 100644
--- a/sections/ajax/announcements.php
+++ b/sections/ajax/announcements.php
@@ -1,7 +1,7 @@
 <?php
 
-$newsMan = new Gazelle\Manager\News;
-$newsReader = new \Gazelle\WitnessTable\UserReadNews;
+$newsMan = new Gazelle\Manager\News();
+$newsReader = new \Gazelle\WitnessTable\UserReadNews();
 if ($newsMan->latestId() < $newsReader->lastRead($Viewer)) {
     $newsReader->witness($Viewer);
 }
@@ -22,7 +22,7 @@
     ];
 }
 
-$headlines = (new Gazelle\Manager\Blog)->headlines();
+$headlines = (new Gazelle\Manager\Blog())->headlines();
 $blog = [];
 foreach ($headlines as $item) {
     $blog[] = [
diff --git a/sections/ajax/artist.php b/sections/ajax/artist.php
index b5ee962f1..d74e89226 100644
--- a/sections/ajax/artist.php
+++ b/sections/ajax/artist.php
@@ -1,6 +1,6 @@
 <?php
 
-$artistMan  = new Gazelle\Manager\Artist;
+$artistMan  = new Gazelle\Manager\Artist();
 $revisionId = isset($_GET['revisionid']) ? (int)$_GET['revisionid'] : null;
 $artistId   = (int)($_GET['id'] ?? 0);
 
@@ -40,9 +40,9 @@
     $artist,
     $Viewer,
     new Gazelle\User\Bookmark($Viewer),
-    new Gazelle\Manager\Request,
-    new Gazelle\Manager\TGroup,
-    new Gazelle\Manager\Torrent,
+    new Gazelle\Manager\Request(),
+    new Gazelle\Manager\TGroup(),
+    new Gazelle\Manager\Torrent(),
 ))
     ->setReleasesOnly(!empty($_GET['artistreleases']))
     ->setVersion(2)
diff --git a/sections/ajax/better/single.php b/sections/ajax/better/single.php
index c2bacb9d2..9558b6c7b 100644
--- a/sections/ajax/better/single.php
+++ b/sections/ajax/better/single.php
@@ -2,7 +2,7 @@
 
 echo (new Gazelle\Json\Better\SingleSeeded(
     $Viewer,
-    new Gazelle\Better\SingleSeeded($Viewer, 'all', new Gazelle\Manager\Torrent)
+    new Gazelle\Better\SingleSeeded($Viewer, 'all', new Gazelle\Manager\Torrent())
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/better/transcode.php b/sections/ajax/better/transcode.php
index ac412e7c7..e778eb2bf 100644
--- a/sections/ajax/better/transcode.php
+++ b/sections/ajax/better/transcode.php
@@ -4,7 +4,7 @@
     error(0);
 }
 
-$search = new Gazelle\Search\Transcode($Viewer, (new Gazelle\Manager\Torrent)->setViewer($Viewer));
+$search = new Gazelle\Search\Transcode($Viewer, (new Gazelle\Manager\Torrent())->setViewer($Viewer));
 if (isset($_GET['search'])) {
     $search->setSearch($_GET['search']);
 }
diff --git a/sections/ajax/bookmarks/artists.php b/sections/ajax/bookmarks/artists.php
index b6a31ade5..9c3f98d74 100644
--- a/sections/ajax/bookmarks/artists.php
+++ b/sections/ajax/bookmarks/artists.php
@@ -6,7 +6,7 @@
     if (!$Viewer->permitted('users_override_paranoia')) {
         json_die('failure');
     }
-    $user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+    $user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
     if (is_null($user)) {
         json_die('failure');
     }
diff --git a/sections/ajax/bookmarks/torrents.php b/sections/ajax/bookmarks/torrents.php
index 0e7d50d88..1e6cdbece 100644
--- a/sections/ajax/bookmarks/torrents.php
+++ b/sections/ajax/bookmarks/torrents.php
@@ -8,7 +8,7 @@
     if (!$Viewer->permitted('users_override_paranoia')) {
         json_error('bad parameters');
     }
-    $user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+    $user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
     if (is_null($user)) {
         json_error('bad parameters');
     }
@@ -16,8 +16,8 @@
 
 echo (new Gazelle\Json\Bookmark\TGroup(
     new Gazelle\User\Bookmark($user),
-    new Gazelle\Manager\TGroup,
-    new Gazelle\Manager\Torrent)
+    new Gazelle\Manager\TGroup(),
+    new Gazelle\Manager\Torrent())
 )
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/browse.php b/sections/ajax/browse.php
index 0d8c1d6f4..5afc52490 100644
--- a/sections/ajax/browse.php
+++ b/sections/ajax/browse.php
@@ -10,8 +10,8 @@
 $Page = (int)($_GET['page'] ?? 1);
 
 $Search = new Gazelle\Search\Torrent(
-    new Gazelle\Manager\TGroup,
-    new Gazelle\Manager\Torrent,
+    new Gazelle\Manager\TGroup(),
+    new Gazelle\Manager\Torrent(),
     $GroupResults,
     $OrderBy,
     $OrderWay,
@@ -39,9 +39,9 @@
 echo (new Gazelle\Json\TGroupList(
     new Gazelle\User\Bookmark($Viewer),
     $Viewer->snatch(),
-    new Gazelle\Manager\Artist,
-    (new Gazelle\Manager\TGroup)->setViewer($Viewer),
-    (new Gazelle\Manager\Torrent)->setViewer($Viewer),
+    new Gazelle\Manager\Artist(),
+    (new Gazelle\Manager\TGroup())->setViewer($Viewer),
+    (new Gazelle\Manager\Torrent())->setViewer($Viewer),
     $Results,
     $GroupResults,
     $resultTotal,
diff --git a/sections/ajax/collage.php b/sections/ajax/collage.php
index eb101faa6..1a316422c 100644
--- a/sections/ajax/collage.php
+++ b/sections/ajax/collage.php
@@ -1,6 +1,6 @@
 <?php
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_GET['id'] ?? 0));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_GET['id'] ?? 0));
 if (is_null($collage)) {
     json_die('bad parameters');
 }
@@ -8,8 +8,8 @@
 echo (new Gazelle\Json\Collage(
     $collage,
     $Viewer,
-    new Gazelle\Manager\TGroup,
-    new Gazelle\Manager\Torrent
+    new Gazelle\Manager\TGroup(),
+    new Gazelle\Manager\Torrent()
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/forum/forum.php b/sections/ajax/forum/forum.php
index c11e37bf8..7f1a24067 100644
--- a/sections/ajax/forum/forum.php
+++ b/sections/ajax/forum/forum.php
@@ -12,7 +12,7 @@
 //---------- Things to sort out before it can start printing/generating content
 
 // Check for lame SQL injection attempts
-$forum = (new Gazelle\Manager\Forum)->findById((int)$_GET['forumid']);
+$forum = (new Gazelle\Manager\Forum())->findById((int)$_GET['forumid']);
 if (is_null($forum)) {
     print json_die(['status' => 'failure']);
 }
@@ -56,7 +56,7 @@
 
 $JsonTopics = [];
 $userCache = [];
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 foreach ($threadList as $thread) {
     [$threadId, $Title, $AuthorID, $Locked, $Sticky, $PostCount, $LastID, $LastTime, $LastAuthorID] = array_values($thread);
 
diff --git a/sections/ajax/forum/main.php b/sections/ajax/forum/main.php
index dc00caeca..397ff6749 100644
--- a/sections/ajax/forum/main.php
+++ b/sections/ajax/forum/main.php
@@ -1,10 +1,10 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $user = [$Viewer->id() => $Viewer];
 
 $category = [];
-$forumList = (new Gazelle\Manager\Forum)->forumList();
+$forumList = (new Gazelle\Manager\Forum())->forumList();
 foreach ($forumList as $forumId) {
     $forum = new Gazelle\Forum($forumId);
     if (!$Viewer->readAccess($forum)) {
diff --git a/sections/ajax/forum/thread.php b/sections/ajax/forum/thread.php
index ba615e50b..91500670d 100644
--- a/sections/ajax/forum/thread.php
+++ b/sections/ajax/forum/thread.php
@@ -9,7 +9,7 @@
 
 ********************************************************************************/
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 //---------- Things to sort out before it can start printing/generating content
 
@@ -19,14 +19,14 @@
 }
 
 if (isset($_GET['postid'])) {
-    $post = (new Gazelle\Manager\ForumPost)->findById((int)$_GET['postid']);
+    $post = (new Gazelle\Manager\ForumPost())->findById((int)$_GET['postid']);
     if (is_null($post)) {
         json_error('bad post id');
     }
     $thread = $post->thread();
 } elseif (isset($_GET['threadid'])) {
     $post = false;
-    $thread = (new Gazelle\Manager\ForumThread)->findById((int)$_GET['threadid']);
+    $thread = (new Gazelle\Manager\ForumThread())->findById((int)$_GET['threadid']);
     if (is_null($thread)) {
         json_error('bad thread id');
     }
diff --git a/sections/ajax/inbox/inbox.php b/sections/ajax/inbox/inbox.php
index 0106a2237..3725c776d 100644
--- a/sections/ajax/inbox/inbox.php
+++ b/sections/ajax/inbox/inbox.php
@@ -5,7 +5,7 @@
     $_GET['type'] ?? 'inbox',
     (int)($_GET['page'] ?? 1),
     ($_GET['sort'] ?? 'unread') === 'unread',
-    new Gazelle\Manager\User,
+    new Gazelle\Manager\User(),
 );
 
 if (!empty($_GET['search'])) {
diff --git a/sections/ajax/inbox/viewconv.php b/sections/ajax/inbox/viewconv.php
index 3e245aad0..9cbdca600 100644
--- a/sections/ajax/inbox/viewconv.php
+++ b/sections/ajax/inbox/viewconv.php
@@ -6,4 +6,4 @@
 }
 $pm->markRead();
 
-echo (new Gazelle\Json\PM($pm, new Gazelle\Manager\User))->response();
+echo (new Gazelle\Json\PM($pm, new Gazelle\Manager\User()))->response();
diff --git a/sections/ajax/info.php b/sections/ajax/info.php
index 97c363a0a..9be007317 100644
--- a/sections/ajax/info.php
+++ b/sections/ajax/info.php
@@ -12,8 +12,8 @@
     $Ratio = number_format(max($Viewer->uploadedSize() / $Viewer->downloadedSize() - 0.005, 0), 2); //Subtract .005 to floor to 2 decimals
 }
 
-$ClassLevels = (new \Gazelle\Manager\User)->classLevelList();
-$latestBlog = (new \Gazelle\Manager\Blog)->latest();
+$ClassLevels = (new \Gazelle\Manager\User())->classLevelList();
+$latestBlog = (new \Gazelle\Manager\Blog())->latest();
 
 json_print("success", [
     'username' => $Viewer->username(),
@@ -23,8 +23,8 @@
     'notifications' => [
         'messages'         => $Viewer->inbox()->unreadTotal(),
         'notifications'    => (new \Gazelle\User\Notification\Torrent($Viewer))->unread(),
-        'newAnnouncement'  => (new \Gazelle\Manager\News)->latestId() < (new \Gazelle\WitnessTable\UserReadNews)->lastRead($Viewer),
-        'newBlog'          => $latestBlog && $latestBlog->createdEpoch() < (new \Gazelle\WitnessTable\UserReadBlog)->lastRead($Viewer),
+        'newAnnouncement'  => (new \Gazelle\Manager\News())->latestId() < (new \Gazelle\WitnessTable\UserReadNews())->lastRead($Viewer),
+        'newBlog'          => $latestBlog && $latestBlog->createdEpoch() < (new \Gazelle\WitnessTable\UserReadBlog())->lastRead($Viewer),
         'newSubscriptions' => (new \Gazelle\User\Subscription($Viewer))->unread() > 0,
     ],
     'userstats' => [
diff --git a/sections/ajax/notifications.php b/sections/ajax/notifications.php
index c909dba9f..57104da23 100644
--- a/sections/ajax/notifications.php
+++ b/sections/ajax/notifications.php
@@ -7,7 +7,7 @@
 echo (new Gazelle\Json\Notification\Torrent(
     new Gazelle\User\Notification\Torrent($Viewer),
     new Gazelle\Util\Paginator(TORRENTS_PER_PAGE, (int)($_GET['page'] ?? 1)),
-    new Gazelle\Manager\Torrent,
+    new Gazelle\Manager\Torrent(),
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/password_validate.php b/sections/ajax/password_validate.php
index 9a6a2d26a..3dee54bc1 100644
--- a/sections/ajax/password_validate.php
+++ b/sections/ajax/password_validate.php
@@ -1,3 +1,3 @@
 <?php
 
-echo (new Gazelle\Manager\User)->checkPassword($_REQUEST['password'] ?? '');
+echo (new Gazelle\Manager\User())->checkPassword($_REQUEST['password'] ?? '');
diff --git a/sections/ajax/post_edit.php b/sections/ajax/post_edit.php
index bf023f7ec..2fe4e33d9 100644
--- a/sections/ajax/post_edit.php
+++ b/sections/ajax/post_edit.php
@@ -17,7 +17,7 @@
     die("bad depth");
 }
 
-$commentMan = new Gazelle\Manager\Comment;
+$commentMan = new Gazelle\Manager\Comment();
 $history = $commentMan->loadEdits($pageType, $postId);
 
 [$userId, $editTime] = $history[$depth];
@@ -25,7 +25,7 @@
     $body = $history[$depth - 1][2];
 } else {
     $body = match ($pageType) {
-        'forums' => (new Gazelle\Manager\ForumPost)->findById($postId)->body(),
+        'forums' => (new Gazelle\Manager\ForumPost())->findById($postId)->body(),
         default  => $commentMan->findById($postId)->body(),
     };
 }
diff --git a/sections/ajax/raw_bbcode.php b/sections/ajax/raw_bbcode.php
index 6a496b9bf..d028790aa 100644
--- a/sections/ajax/raw_bbcode.php
+++ b/sections/ajax/raw_bbcode.php
@@ -1,6 +1,6 @@
 <?php
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_GET['postid'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_GET['postid'] ?? 0));
 if (is_null($post)) {
     json_die("failure", "empty postid");
 } elseif (!$Viewer->readAccess($post->thread()->forum())) {
diff --git a/sections/ajax/request.php b/sections/ajax/request.php
index 43551ba7d..7a7bd0caa 100644
--- a/sections/ajax/request.php
+++ b/sections/ajax/request.php
@@ -1,6 +1,6 @@
 <?php
 
-$request = (new Gazelle\Manager\Request)->findById((int)($_GET['id'] ?? 0));
+$request = (new Gazelle\Manager\Request())->findById((int)($_GET['id'] ?? 0));
 if (is_null($request)) {
     json_die("failure");
 }
@@ -10,7 +10,7 @@
     $Viewer,
     new Gazelle\User\Bookmark($Viewer),
     new Gazelle\Comment\Request($request->id(), (int)($_GET['page'] ?? 1), (int)($_GET['post'] ?? 0)),
-    new Gazelle\Manager\User,
+    new Gazelle\Manager\User(),
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/requests.php b/sections/ajax/requests.php
index 6d4b97dfe..d07f6a972 100644
--- a/sections/ajax/requests.php
+++ b/sections/ajax/requests.php
@@ -1,8 +1,8 @@
 <?php
 
-$search = new Gazelle\Search\Request(new Gazelle\Manager\Request);
+$search = new Gazelle\Search\Request(new Gazelle\Manager\Request());
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['userid'])) {
     $user = null;
 } else {
@@ -76,7 +76,7 @@
         },
     )
     ->setCategory($_GET['filter_cat'] ?? [])
-    ->setReleaseType($_GET['releases'] ?? [], (new \Gazelle\ReleaseType)->list());
+    ->setReleaseType($_GET['releases'] ?? [], (new \Gazelle\ReleaseType())->list());
 
 if (!isset($_GET['show_filled'])) {
     $search->showUnfilled();
diff --git a/sections/ajax/riplog.php b/sections/ajax/riplog.php
index 2ccd36ef2..effd00507 100644
--- a/sections/ajax/riplog.php
+++ b/sections/ajax/riplog.php
@@ -4,7 +4,7 @@
 if (!$logId) {
     json_error('missing logid parameter');
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_GET['id'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_GET['id'] ?? 0));
 if (is_null($torrent)) {
     json_error('torrent not found');
 }
diff --git a/sections/ajax/similar_artists.php b/sections/ajax/similar_artists.php
index fdc354851..6c62f4d20 100644
--- a/sections/ajax/similar_artists.php
+++ b/sections/ajax/similar_artists.php
@@ -1,7 +1,7 @@
 <?php
 
 $limit  = (int)($_GET['limit'] ?? 10);
-$artist = (new Gazelle\Manager\Artist)->findById((int)($_GET['id'] ?? 0));
+$artist = (new Gazelle\Manager\Artist())->findById((int)($_GET['id'] ?? 0));
 if (is_null($artist) || !$limit) {
     print json_die('failure');
 }
diff --git a/sections/ajax/stats.php b/sections/ajax/stats.php
index 5cd3b8ea8..04823f4be 100644
--- a/sections/ajax/stats.php
+++ b/sections/ajax/stats.php
@@ -1,9 +1,9 @@
 <?php
 
 echo (new Gazelle\Json\Stats\General(
-    new Gazelle\Stats\Request,
-    new Gazelle\Stats\Torrent,
-    new Gazelle\Stats\Users,
+    new Gazelle\Stats\Request(),
+    new Gazelle\Stats\Torrent(),
+    new Gazelle\Stats\Users(),
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/stats/torrents.php b/sections/ajax/stats/torrents.php
index d017f829f..34cb954ae 100644
--- a/sections/ajax/stats/torrents.php
+++ b/sections/ajax/stats/torrents.php
@@ -1,5 +1,5 @@
 <?php
 
-echo (new Gazelle\Json\Stats\Torrent(new Gazelle\Stats\Torrent))
+echo (new Gazelle\Json\Stats\Torrent(new Gazelle\Stats\Torrent()))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/stats/users.php b/sections/ajax/stats/users.php
index 0ac98e120..0b4f8908b 100644
--- a/sections/ajax/stats/users.php
+++ b/sections/ajax/stats/users.php
@@ -1,5 +1,5 @@
 <?php
 
-echo (new Gazelle\Json\Stats\User(new Gazelle\Stats\Users))
+echo (new Gazelle\Json\Stats\User(new Gazelle\Stats\Users()))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/subscriptions.php b/sections/ajax/subscriptions.php
index 908121898..40c941469 100644
--- a/sections/ajax/subscriptions.php
+++ b/sections/ajax/subscriptions.php
@@ -6,7 +6,7 @@
 
 $showUnread = (bool)($_GET['showunread'] ?? true);
 
-$forMan = new Gazelle\Manager\Forum;
+$forMan = new Gazelle\Manager\Forum();
 $paginator = new Gazelle\Util\Paginator($Viewer->postsPerPage(), (int)($_GET['page'] ?? 1));
 $paginator->setTotal(
     $showUnread ? $forMan->unreadSubscribedForumTotal($Viewer) : $forMan->subscribedForumTotal($Viewer)
diff --git a/sections/ajax/tcomments.php b/sections/ajax/tcomments.php
index 8a207dd1b..bde6c41f7 100644
--- a/sections/ajax/tcomments.php
+++ b/sections/ajax/tcomments.php
@@ -8,7 +8,7 @@
 $thread = $commentPage->load()->thread();
 
 $userCache = [];
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 $JsonComments = [];
 foreach ($thread as $Post) {
diff --git a/sections/ajax/top10/tags.php b/sections/ajax/top10/tags.php
index d697a7e2e..0bdb9690f 100644
--- a/sections/ajax/top10/tags.php
+++ b/sections/ajax/top10/tags.php
@@ -13,7 +13,7 @@
 echo (new Gazelle\Json\Top10\Tag(
     details: $details,
     limit: $limit,
-    manager: new Gazelle\Manager\Tag,
+    manager: new Gazelle\Manager\Tag(),
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/top10/torrents.php b/sections/ajax/top10/torrents.php
index 351af5522..0216eea8e 100644
--- a/sections/ajax/top10/torrents.php
+++ b/sections/ajax/top10/torrents.php
@@ -6,7 +6,7 @@
 $limit = in_array($limit, [10, 100, 250]) && $details !== 'all' ? $limit : 10;
 
 $top10  = new Gazelle\Top10\Torrent(FORMAT, $Viewer);
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $result = [];
 
 // Filter out common parameters that are not needed in getTopTorrents to get more cache hits
diff --git a/sections/ajax/top10/users.php b/sections/ajax/top10/users.php
index f0632eb4c..8eaa66729 100644
--- a/sections/ajax/top10/users.php
+++ b/sections/ajax/top10/users.php
@@ -13,8 +13,8 @@
 echo (new Gazelle\Json\Top10\User(
     details: $details,
     limit:   $limit,
-    stats:   new Gazelle\Stats\Users,
-    userMan: new Gazelle\Manager\User,
+    stats:   new Gazelle\Stats\Users(),
+    userMan: new Gazelle\Manager\User(),
 ))
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/torrent.php b/sections/ajax/torrent.php
index 8fcfc1dd9..926fd573b 100644
--- a/sections/ajax/torrent.php
+++ b/sections/ajax/torrent.php
@@ -3,14 +3,14 @@
 if (isset($_GET['id']) && isset($_GET['hash'])) {
     json_error('bad parameters');
 } elseif (isset($_GET['hash'])) {
-    $torrent = (new Gazelle\Manager\Torrent)->findByInfohash($_GET['hash'] ?? '');
+    $torrent = (new Gazelle\Manager\Torrent())->findByInfohash($_GET['hash'] ?? '');
 } else {
-    $torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['id']);
+    $torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['id']);
 }
 if (is_null($torrent)) {
     json_error('bad parameters');
 }
 
-echo (new Gazelle\Json\Torrent($torrent, $Viewer, new Gazelle\Manager\Torrent))
+echo (new Gazelle\Json\Torrent($torrent, $Viewer, new Gazelle\Manager\Torrent()))
     ->setVersion(5)
     ->response();
diff --git a/sections/ajax/torrent_remove_cover_art.php b/sections/ajax/torrent_remove_cover_art.php
index 2c51c8054..ab4f9f148 100644
--- a/sections/ajax/torrent_remove_cover_art.php
+++ b/sections/ajax/torrent_remove_cover_art.php
@@ -4,13 +4,13 @@
 if (!$Viewer->permitted('site_edit_wiki')) {
     json_die('failure', 'forbidden');
 }
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_GET['groupid']);
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_GET['groupid']);
 $coverId = (int)$_GET['id'];
 if (!$coverId || is_null($tgroup)) {
     json_die('failure', 'bad parameters');
 }
 
-if ($tgroup->removeCoverArt($coverId, $Viewer, new Gazelle\Log)) {
+if ($tgroup->removeCoverArt($coverId, $Viewer, new Gazelle\Log())) {
     json_print("success", ['id' => $coverId]);
 } else {
     json_die('failure', 'bad coverId');
diff --git a/sections/ajax/torrent_tag_add.php b/sections/ajax/torrent_tag_add.php
index 8af767a42..7b8c2f813 100644
--- a/sections/ajax/torrent_tag_add.php
+++ b/sections/ajax/torrent_tag_add.php
@@ -8,7 +8,7 @@
     authorize();
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroup = $tgMan->findById((int)($_REQUEST['groupid'] ?? 0));
 if (is_null($tgroup)) {
     json_or_error('invalid groupid', 0);
@@ -21,7 +21,7 @@
 
 $added    = [];
 $rejected = [];
-$tagMan   = new \Gazelle\Manager\Tag;
+$tagMan   = new \Gazelle\Manager\Tag();
 $Tags     = array_unique(explode(',', $_REQUEST['tagname']));
 
 foreach ($Tags as $tagName) {
@@ -45,7 +45,7 @@
         $tagMan->createTorrentTagVote($tagId, $tgroup, $Viewer, 'up');
         $added[] = $resolved;
 
-        (new Gazelle\Log)->group($tgroup, $Viewer, "Tag \"$resolved\" added to group");
+        (new Gazelle\Log())->group($tgroup, $Viewer, "Tag \"$resolved\" added to group");
     }
 }
 
diff --git a/sections/ajax/torrent_tag_remove.php b/sections/ajax/torrent_tag_remove.php
index 1ca06cd1f..2fd61cc0d 100644
--- a/sections/ajax/torrent_tag_remove.php
+++ b/sections/ajax/torrent_tag_remove.php
@@ -4,8 +4,8 @@
 if ($Viewer->disableTagging() || !$Viewer->permitted('site_delete_tag')) {
     error(403);
 }
-$tagMan = new Gazelle\Manager\Tag;
-$tgMan = new Gazelle\Manager\TGroup;
+$tagMan = new Gazelle\Manager\Tag();
+$tgMan = new Gazelle\Manager\TGroup();
 
 $tag = $tagMan->findById((int)$_GET['tagid']);
 $tgroup = $tgMan->findById((int)$_GET['groupid']);
@@ -19,7 +19,7 @@
     $Cache->cache_value('deleted_tags_' . $tgroup->id() . '_' . $Viewer->id(), $tagName, 300);
 
     // Log the removal and if it was the last occurrence.
-    $logger = new Gazelle\Log;
+    $logger = new Gazelle\Log();
     $logger->group($tgroup, $Viewer, "Tag \"$tagName\" removed");
     if (!$tagMan->findById($tag->id())) {
         $logger->general("Unused tag \"$tagName\" removed by user {$Viewer->label()}");
diff --git a/sections/ajax/torrentgroup.php b/sections/ajax/torrentgroup.php
index 6c9f92021..36629571c 100644
--- a/sections/ajax/torrentgroup.php
+++ b/sections/ajax/torrentgroup.php
@@ -6,7 +6,7 @@
     json_error('bad parameters');
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroup = $infohash
     ? $tgMan->findByTorrentInfohash($infohash)
     : $tgMan->findById($groupId);
@@ -15,5 +15,5 @@
     json_error('bad parameters');
 }
 
-echo (new Gazelle\Json\TGroup($tgroup, $Viewer, (new \Gazelle\Manager\Torrent)->setViewer($Viewer)))
+echo (new Gazelle\Json\TGroup($tgroup, $Viewer, (new \Gazelle\Manager\Torrent())->setViewer($Viewer)))
     ->response();
diff --git a/sections/ajax/torrentgroupalbumart.php b/sections/ajax/torrentgroupalbumart.php
index a07d29b51..8e2594e2e 100644
--- a/sections/ajax/torrentgroupalbumart.php
+++ b/sections/ajax/torrentgroupalbumart.php
@@ -1,6 +1,6 @@
 <?php
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_GET['id']);
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_GET['id']);
 if (is_null($tgroup)) {
     json_die('failure', 'bad id parameter');
 }
diff --git a/sections/ajax/upload.php b/sections/ajax/upload.php
index 166f5fb5f..d3511db72 100644
--- a/sections/ajax/upload.php
+++ b/sections/ajax/upload.php
@@ -11,8 +11,8 @@
             echo $uploadForm->albumReleaseJS();
         } else {
             echo $uploadForm->music_form(
-                (new Gazelle\Manager\Tag)->genreList(),
-                new Gazelle\Manager\TGroup,
+                (new Gazelle\Manager\Tag())->genreList(),
+                new Gazelle\Manager\TGroup(),
             );
         }
         break;
diff --git a/sections/ajax/user.php b/sections/ajax/user.php
index 785d687d5..6dc262f49 100644
--- a/sections/ajax/user.php
+++ b/sections/ajax/user.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['id']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['id']);
 if (is_null($user)) {
     json_die("failure", "bad id parameter");
 }
diff --git a/sections/ajax/user_recents.php b/sections/ajax/user_recents.php
index 578fbfe93..f3d3a675d 100644
--- a/sections/ajax/user_recents.php
+++ b/sections/ajax/user_recents.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     json_error("bad userid");
 }
@@ -9,7 +9,7 @@
     json_error("bad limit");
 }
 
-echo (new Gazelle\Json\UserRecent($user, $Viewer, new Gazelle\Manager\TGroup))
+echo (new Gazelle\Json\UserRecent($user, $Viewer, new Gazelle\Manager\TGroup()))
     ->setLimit($limit)
     ->setVersion(2)
     ->response();
diff --git a/sections/ajax/userhistory/post_history.php b/sections/ajax/userhistory/post_history.php
index 88ec31263..a336bd118 100644
--- a/sections/ajax/userhistory/post_history.php
+++ b/sections/ajax/userhistory/post_history.php
@@ -4,7 +4,7 @@
     json_error('You do not have access to the forums!');
 }
 
-$user = empty($_GET['userid']) ? $Viewer : (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = empty($_GET['userid']) ? $Viewer : (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     json_error('User does not exist!');
 }
@@ -17,6 +17,6 @@
 
 echo (new Gazelle\Json\PostHistory(
     $forumSearch,
-    new Gazelle\Manager\User,
+    new Gazelle\Manager\User(),
     new Gazelle\Util\Paginator($Viewer->postsPerPage(), (int)($_GET['page'] ?? 1))
 ))->response();
diff --git a/sections/ajax/usersearch.php b/sections/ajax/usersearch.php
index a29935114..028f14ee3 100644
--- a/sections/ajax/usersearch.php
+++ b/sections/ajax/usersearch.php
@@ -9,7 +9,7 @@
 echo (new Gazelle\Json\UserSearch(
     $search,
     $Viewer,
-    new Gazelle\Manager\User,
+    new Gazelle\Manager\User(),
     new Gazelle\Util\Paginator(AJAX_USERS_PER_PAGE, (int)($_GET['page'] ?? 1)),
 ))
     ->setVersion(2)
diff --git a/sections/ajax/wiki.php b/sections/ajax/wiki.php
index f142f5a30..73db60efb 100644
--- a/sections/ajax/wiki.php
+++ b/sections/ajax/wiki.php
@@ -1,6 +1,6 @@
 <?php
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 if (isset($_GET['id'])) {
     $wiki = $wikiMan->findById((int)$_GET['id']);
 } elseif (isset($_GET['name'])) {
@@ -24,7 +24,7 @@
     'body'       => Text::full_format($wiki->body(), false),
     'aliases'    => $wiki->alias(),
     'authorID'   => $wiki->authorId(),
-    'authorName' => (new Gazelle\Manager\User)->findById($wiki->authorId())?->username(),
+    'authorName' => (new Gazelle\Manager\User())->findById($wiki->authorId())?->username(),
     'date'       => $wiki->date(),
     'revision'   => $wiki->revision(),
 ]);
diff --git a/sections/api/index.php b/sections/api/index.php
index 8e5bcce1a..975da0d2a 100644
--- a/sections/api/index.php
+++ b/sections/api/index.php
@@ -3,7 +3,7 @@
 if (empty($_GET['aid']) || empty($_GET['token'])) {
     json_error('invalid parameters');
 }
-if (!(new Gazelle\API)->validateToken((int)($_GET['aid'] ?? 0), $_GET['token'] ?? '')) {
+if (!(new Gazelle\API())->validateToken((int)($_GET['aid'] ?? 0), $_GET['token'] ?? '')) {
     json_error('invalid token');
 }
 $className = "Gazelle\\API\\" . str_replace("_", "", ucwords($_GET['action'], "_"));
@@ -12,7 +12,7 @@
 }
 
 $api = new $className([
-    'ReleaseTypes' => (new \Gazelle\ReleaseType)->list(),
+    'ReleaseTypes' => (new \Gazelle\ReleaseType())->list(),
     'Debug'        => $Debug,
 ]);
 
diff --git a/sections/apply/admin.php b/sections/apply/admin.php
index 6ca120740..ad026c70f 100644
--- a/sections/apply/admin.php
+++ b/sections/apply/admin.php
@@ -1,6 +1,6 @@
 <?php
 
-$appRoleMan = new Gazelle\Manager\ApplicantRole;
+$appRoleMan = new Gazelle\Manager\ApplicantRole();
 if ($Viewer->permitted('admin_manage_applicants')) {
     $list = $appRoleMan->list(); // everything, including archived roles
 } else {
diff --git a/sections/apply/apply.php b/sections/apply/apply.php
index 56b571a78..e1f61332c 100644
--- a/sections/apply/apply.php
+++ b/sections/apply/apply.php
@@ -1,7 +1,7 @@
 <?php
 
-$appMan  = new Gazelle\Manager\Applicant;
-$roleMan = new Gazelle\Manager\ApplicantRole;
+$appMan  = new Gazelle\Manager\Applicant();
+$roleMan = new Gazelle\Manager\ApplicantRole();
 
 if (isset($_POST['auth'])) {
     authorize();
diff --git a/sections/apply/edit.php b/sections/apply/edit.php
index 5d56195bc..c0cd463ed 100644
--- a/sections/apply/edit.php
+++ b/sections/apply/edit.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$role = (new Gazelle\Manager\ApplicantRole)->findById((int)($_GET['id'] ?? 0));
+$role = (new Gazelle\Manager\ApplicantRole())->findById((int)($_GET['id'] ?? 0));
 if (is_null($role)) {
     error(404);
 }
@@ -27,7 +27,7 @@
     }
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 echo $Twig->render('applicant/role.twig', [
     'text'        => new Gazelle\Util\Textarea('description', $role->description()),
diff --git a/sections/apply/view.php b/sections/apply/view.php
index 4ffa6f478..29648417f 100644
--- a/sections/apply/view.php
+++ b/sections/apply/view.php
@@ -1,6 +1,6 @@
 <?php
 
-$appMan = new Gazelle\Manager\Applicant;
+$appMan = new Gazelle\Manager\Applicant();
 if (isset($_REQUEST['id'])) {
     $app = $appMan->findById((int)$_GET['id']);
     if (is_null($app)) {
diff --git a/sections/artist/add_alias.php b/sections/artist/add_alias.php
index c924d48ca..5c0c1ffbf 100644
--- a/sections/artist/add_alias.php
+++ b/sections/artist/add_alias.php
@@ -11,7 +11,7 @@
     error('You must supply an alias for this artist.');
 }
 
-$artMan = new Gazelle\Manager\Artist;
+$artMan = new Gazelle\Manager\Artist();
 $artist = $artMan->findById((int)$_POST['artistid']);
 if (is_null($artist)) {
     error(404);
@@ -53,7 +53,7 @@
             ]);
             exit;
         }
-        $artist->clearAliasFromArtist($CloneAliasID, $Viewer, new Gazelle\Log);
+        $artist->clearAliasFromArtist($CloneAliasID, $Viewer, new Gazelle\Log());
     }
 }
 
@@ -66,7 +66,7 @@
             error('Redirection must target an alias for the current artist.');
         }
     }
-    $artist->addAlias($aliasName, $redirectId, $Viewer, new Gazelle\Log);
+    $artist->addAlias($aliasName, $redirectId, $Viewer, new Gazelle\Log());
 }
 
 header("Location:" . redirectUrl("artist.php?action=edit&artistid={$artistId}"));
diff --git a/sections/artist/add_similar.php b/sections/artist/add_similar.php
index d0d1f5c80..29ccddfcb 100644
--- a/sections/artist/add_similar.php
+++ b/sections/artist/add_similar.php
@@ -4,7 +4,7 @@
     authorize();
 }
 
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $artist = $artistMan->findById((int)($_POST['artistid'] ?? 0));
 if (is_null($artist)) {
     if (defined('AJAX')) {
@@ -24,7 +24,7 @@
         }
     }
 }
-$artist->similar()->addSimilar($other, $Viewer, new Gazelle\Log);
+$artist->similar()->addSimilar($other, $Viewer, new Gazelle\Log());
 
 if (defined('AJAX')) {
     json_print('success', [
diff --git a/sections/artist/artist.php b/sections/artist/artist.php
index 4411a255f..f57d97a5a 100644
--- a/sections/artist/artist.php
+++ b/sections/artist/artist.php
@@ -1,7 +1,7 @@
 <?php
 
 $RevisionID = (int)($_GET['revisionid'] ?? 0);
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $Artist = $RevisionID
     ? $artistMan->findByIdAndRevision((int)($_GET['id'] ?? 0), $RevisionID)
     : $artistMan->findById((int)($_GET['id'] ?? 0));
@@ -12,17 +12,17 @@
 $artistId = $Artist->id();
 
 $bookmark   = new Gazelle\User\Bookmark($Viewer);
-$collageMan = new Gazelle\Manager\Collage;
-$tgMan      = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$torMan     = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$collageMan = new Gazelle\Manager\Collage();
+$tgMan      = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$torMan     = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $stats      = new Gazelle\Stats\Artist($artistId);
-$userMan    = new Gazelle\Manager\User;
+$userMan    = new Gazelle\Manager\User();
 $vote       = new Gazelle\User\Vote($Viewer);
 
 $authKey      = $Viewer->auth();
 $isSubscribed = (new Gazelle\User\Subscription($Viewer))->isSubscribedComments('artist', $artistId);
 $name         = $Artist->name();
-$requestList  = $Viewer->disableRequests() ? [] : (new Gazelle\Manager\Request)->findByArtist($Artist);
+$requestList  = $Viewer->disableRequests() ? [] : (new Gazelle\Manager\Request())->findByArtist($Artist);
 
 View::show_header($name, ['js' => 'browse,requests,bbcode,comments,voting,subscriptions']);
 ?>
diff --git a/sections/artist/change_artistid.php b/sections/artist/change_artistid.php
index cb87922a0..ebf91837a 100644
--- a/sections/artist/change_artistid.php
+++ b/sections/artist/change_artistid.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$artMan = new Gazelle\Manager\Artist;
+$artMan = new Gazelle\Manager\Artist();
 $artist = $artMan->findById((int)($_POST['artistid'] ?? 0));
 if (is_null($artist)) {
     error('Please select a valid artist to change.');
@@ -26,11 +26,11 @@
     $new->merge(
         $artist,
         $Viewer,
-        new \Gazelle\Manager\Collage,
-        new \Gazelle\Manager\Comment,
-        new \Gazelle\Manager\Request,
-        new \Gazelle\Manager\TGroup,
-        new \Gazelle\Log,
+        new \Gazelle\Manager\Collage(),
+        new \Gazelle\Manager\Comment(),
+        new \Gazelle\Manager\Request(),
+        new \Gazelle\Manager\TGroup(),
+        new \Gazelle\Log(),
     );
     header("Location: artist.php?action=edit&artistid={$new->id()}");
     exit;
diff --git a/sections/artist/delete.php b/sections/artist/delete.php
index 290a8bfdf..14cceec56 100644
--- a/sections/artist/delete.php
+++ b/sections/artist/delete.php
@@ -5,15 +5,15 @@
 }
 authorize();
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)($_GET['artistid'] ?? 0));
+$artist = (new Gazelle\Manager\Artist())->findById((int)($_GET['artistid'] ?? 0));
 if (is_null($artist)) {
     error(404);
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroupList = array_map(fn ($id) => $tgMan->findById($id), $artist->tgroupIdUsage());
 
-$reqMan = new Gazelle\Manager\Request;
+$reqMan = new Gazelle\Manager\Request();
 $requestList = array_map(fn ($id) => $reqMan->findById($id), $artist->requestIdUsage());
 
 if (count($tgroupList) + count($requestList) > 0) {
@@ -26,7 +26,7 @@
 }
 
 $name = $artist->name();
-$artist->remove($Viewer, new Gazelle\Log);
+$artist->remove($Viewer, new Gazelle\Log());
 
 echo $Twig->render('artist/remove-success.twig', [
     'name' => $name,
diff --git a/sections/artist/delete_alias.php b/sections/artist/delete_alias.php
index 755482c86..025b3551f 100644
--- a/sections/artist/delete_alias.php
+++ b/sections/artist/delete_alias.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$artMan = new Gazelle\Manager\Artist;
+$artMan = new Gazelle\Manager\Artist();
 $aliasId = (int)$_GET['aliasid'];
 $artist  = $artMan->findByAliasId($aliasId);
 if (is_null($artist)) {
@@ -16,7 +16,7 @@
     error("The alias $aliasId is the only alias for this artist; removing it would cause bad things to happen.");
 }
 
-$tgroupList = $artMan->tgroupList($aliasId, new Gazelle\Manager\TGroup);
+$tgroupList = $artMan->tgroupList($aliasId, new Gazelle\Manager\TGroup());
 if ($tgroupList) {
     echo $Twig->render('artist/tgroup-usage.twig', [
         'artist' => $artist,
@@ -25,6 +25,6 @@
     exit;
 }
 
-$artist->removeAlias($aliasId, $Viewer, new Gazelle\Log);
+$artist->removeAlias($aliasId, $Viewer, new Gazelle\Log());
 
 header("Location: " . redirectUrl("artist.php?action=edit&artistid={$artist->id()}"));
diff --git a/sections/artist/delete_similar.php b/sections/artist/delete_similar.php
index 8889ab426..37c1d030a 100644
--- a/sections/artist/delete_similar.php
+++ b/sections/artist/delete_similar.php
@@ -6,12 +6,12 @@
     error(403);
 }
 
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $artist    = $artistMan->findById((int)($_GET['artistid'] ?? 0));
 $similar   = $artistMan->findById((int)($_GET['similarid'] ?? 0));
 if (is_null($artist) || is_null($similar)) {
     error(404);
 }
 
-$artist->similar()->removeSimilar($similar, $Viewer, new Gazelle\Log);
+$artist->similar()->removeSimilar($similar, $Viewer, new Gazelle\Log());
 header("Location: " . redirectUrl($artist->location()));
diff --git a/sections/artist/download.php b/sections/artist/download.php
index 4c814069f..a8f4a29df 100644
--- a/sections/artist/download.php
+++ b/sections/artist/download.php
@@ -6,12 +6,12 @@
 if (!isset($_REQUEST['preference']) || count($_REQUEST['list']) === 0) {
     error(0);
 }
-$artist = (new Gazelle\Manager\Artist)->findById((int)($_REQUEST['artistid'] ?? 0));
+$artist = (new Gazelle\Manager\Artist())->findById((int)($_REQUEST['artistid'] ?? 0));
 if (is_null($artist)) {
     error(404);
 }
 
-$collector = new Gazelle\Collector\Artist($Viewer, new Gazelle\Manager\Torrent, $artist, (int)$_REQUEST['preference']);
+$collector = new Gazelle\Collector\Artist($Viewer, new Gazelle\Manager\Torrent(), $artist, (int)$_REQUEST['preference']);
 if (!$collector->prepare($_REQUEST['list'])) {
     error("Nothing to gather, choose some encodings and bitrates!");
 }
diff --git a/sections/artist/edit.php b/sections/artist/edit.php
index 30d8b576b..b2def3715 100644
--- a/sections/artist/edit.php
+++ b/sections/artist/edit.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)$_GET['artistid']);
+$artist = (new Gazelle\Manager\Artist())->findById((int)$_GET['artistid']);
 if (is_null($artist)) {
     $id = html_escape($_GET['artistid']); // might not be a number
     error("Cannot find an artist with the ID $id: See the <a href=\"log.php?search=Artist+$id\">site log</a>.");
diff --git a/sections/artist/edit_handle.php b/sections/artist/edit_handle.php
index 2dc74db6a..7e5e6cd96 100644
--- a/sections/artist/edit_handle.php
+++ b/sections/artist/edit_handle.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)$_POST['artistid']);
+$artist = (new Gazelle\Manager\Artist())->findById((int)$_POST['artistid']);
 if (is_null($artist)) {
     error(404);
 }
diff --git a/sections/artist/edit_request.php b/sections/artist/edit_request.php
index 857a773f1..98d9cc1be 100644
--- a/sections/artist/edit_request.php
+++ b/sections/artist/edit_request.php
@@ -1,6 +1,6 @@
 <?php
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)($_GET['artistid'] ?? 0));
+$artist = (new Gazelle\Manager\Artist())->findById((int)($_GET['artistid'] ?? 0));
 if (is_null($artist)) {
     error(404);
 }
diff --git a/sections/artist/edit_request_handle.php b/sections/artist/edit_request_handle.php
index 1196a9e6e..390a2b761 100644
--- a/sections/artist/edit_request_handle.php
+++ b/sections/artist/edit_request_handle.php
@@ -1,12 +1,12 @@
 <?php
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)($_POST['artistid'] ?? 0));
+$artist = (new Gazelle\Manager\Artist())->findById((int)($_POST['artistid'] ?? 0));
 if (is_null($artist)) {
     error(404);
 }
 authorize();
 
-$thread = (new Gazelle\Manager\ForumThread)->create(
+$thread = (new Gazelle\Manager\ForumThread())->create(
     forum: new Gazelle\Forum(EDITING_FORUM_ID),
     user:  new Gazelle\User(SYSTEM_USER_ID),
     title: "Editing request – Artist: " . $artist->name(),
diff --git a/sections/artist/history.php b/sections/artist/history.php
index c3389cb9a..a800ec9e1 100644
--- a/sections/artist/history.php
+++ b/sections/artist/history.php
@@ -1,6 +1,6 @@
 <?php
 
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $artist = $artistMan->findById((int)$_GET['artistid']);
 if (is_null($artist)) {
     error(404);
diff --git a/sections/artist/notify.php b/sections/artist/notify.php
index 19dab3b2a..577512c87 100644
--- a/sections/artist/notify.php
+++ b/sections/artist/notify.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)$_GET['artistid']);
+$artist = (new Gazelle\Manager\Artist())->findById((int)$_GET['artistid']);
 if (is_null($artist)) {
     error(404);
 }
diff --git a/sections/artist/notify_remove.php b/sections/artist/notify_remove.php
index 4b867840b..227ed6420 100644
--- a/sections/artist/notify_remove.php
+++ b/sections/artist/notify_remove.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$artist = (new Gazelle\Manager\Artist)->findById((int)$_GET['artistid']);
+$artist = (new Gazelle\Manager\Artist())->findById((int)$_GET['artistid']);
 if (is_null($artist)) {
     error(404);
 }
diff --git a/sections/artist/rename.php b/sections/artist/rename.php
index 9055bf155..6b3505961 100644
--- a/sections/artist/rename.php
+++ b/sections/artist/rename.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $artist = $artistMan->findById((int)$_POST['artistid']);
 if (is_null($artist)) {
     error(404);
@@ -26,9 +26,9 @@
 $new = $artist->smartRename(
     $newName,
     $artistMan,
-    new Gazelle\Manager\Comment,
-    new Gazelle\Manager\Request,
-    new Gazelle\Manager\TGroup,
+    new Gazelle\Manager\Comment(),
+    new Gazelle\Manager\Request(),
+    new Gazelle\Manager\TGroup(),
     $Viewer,
 );
 
diff --git a/sections/artist/vote_similar.php b/sections/artist/vote_similar.php
index b51a1034d..88ff87633 100644
--- a/sections/artist/vote_similar.php
+++ b/sections/artist/vote_similar.php
@@ -5,7 +5,7 @@
     error(0);
 }
 
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $artist    = $artistMan->findById((int)($_GET['artistid'] ?? 0));
 $similar   = $artistMan->findById((int)($_GET['similarid'] ?? 0));
 if (is_null($artist) || is_null($similar)) {
diff --git a/sections/better/better.php b/sections/better/better.php
index cd06b8b6f..0bcc299a7 100644
--- a/sections/better/better.php
+++ b/sections/better/better.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (isset($_GET['userid']) && $Viewer->permitted('users_override_paranoia')) {
     $user = $userMan->findById((int)$_GET['userid']);
     if (is_null($user)) {
@@ -19,20 +19,20 @@
 }
 
 $better = match ($type) {
-    'artistcollage' => new Gazelle\Better\ArtistCollage($user, $filter, new Gazelle\Manager\Artist),
-    'artistdesc'    => new Gazelle\Better\ArtistDescription($user, $filter, new Gazelle\Manager\Artist),
-    'artistdiscogs' => new Gazelle\Better\ArtistDiscogs($user, $filter, new Gazelle\Manager\Artist),
-    'artistimg'     => new Gazelle\Better\ArtistImage($user, $filter, new Gazelle\Manager\Artist),
-    'artwork'       => new Gazelle\Better\Artwork($user, $filter, (new Gazelle\Manager\TGroup)->setViewer($Viewer)),
-    'checksum'      => new Gazelle\Better\Checksum($user, $filter, (new Gazelle\Manager\Torrent)->setViewer($Viewer)),
-    'single'        => new Gazelle\Better\SingleSeeded($user, $filter, (new Gazelle\Manager\Torrent)->setViewer($Viewer)),
+    'artistcollage' => new Gazelle\Better\ArtistCollage($user, $filter, new Gazelle\Manager\Artist()),
+    'artistdesc'    => new Gazelle\Better\ArtistDescription($user, $filter, new Gazelle\Manager\Artist()),
+    'artistdiscogs' => new Gazelle\Better\ArtistDiscogs($user, $filter, new Gazelle\Manager\Artist()),
+    'artistimg'     => new Gazelle\Better\ArtistImage($user, $filter, new Gazelle\Manager\Artist()),
+    'artwork'       => new Gazelle\Better\Artwork($user, $filter, (new Gazelle\Manager\TGroup())->setViewer($Viewer)),
+    'checksum'      => new Gazelle\Better\Checksum($user, $filter, (new Gazelle\Manager\Torrent())->setViewer($Viewer)),
+    'single'        => new Gazelle\Better\SingleSeeded($user, $filter, (new Gazelle\Manager\Torrent())->setViewer($Viewer)),
     'files', 'folders', 'lineage', 'tags'
-                    => (new Gazelle\Better\Bad($user, $filter, new Gazelle\Manager\Torrent))->setBadType($type),
+                    => (new Gazelle\Better\Bad($user, $filter, new Gazelle\Manager\Torrent()))->setBadType($type),
     default         => error(0),
 };
 
 if (isset($_GET['remove']) && $better instanceof Gazelle\Better\Bad && $Viewer->permitted('admin_reports')) {
-    $torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['remove']);
+    $torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['remove']);
     if ($torrent) {
         $torrent->removeFlag($better->torrentFlag());
     }
diff --git a/sections/better/transcode.php b/sections/better/transcode.php
index e565795b9..f22d6f6fa 100644
--- a/sections/better/transcode.php
+++ b/sections/better/transcode.php
@@ -15,7 +15,7 @@
     if (!$Viewer->permitted('users_override_paranoia')) {
         error(403);
     }
-    $user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+    $user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
     if (is_null($user)) {
         error(404);
     }
@@ -24,7 +24,7 @@
 $filter = $_GET['filter'] ?? 'uploaded';
 $search = $_GET['search'] ?? null;
 $target = $_GET['target'] ?? null;
-$better = new Gazelle\Search\Transcode($user, new Gazelle\Manager\Torrent);
+$better = new Gazelle\Search\Transcode($user, new Gazelle\Manager\Torrent());
 
 switch ($filter) {
     case 'seeding':
diff --git a/sections/blog/blog_page.php b/sections/blog/blog_page.php
index d7d836434..8183550da 100644
--- a/sections/blog/blog_page.php
+++ b/sections/blog/blog_page.php
@@ -1,6 +1,6 @@
 <?php
 
-$blogMan = new Gazelle\Manager\Blog;
+$blogMan = new Gazelle\Manager\Blog();
 
 $action = ($_GET['action'] ?? '') === 'editblog' ? 'Edit' : 'Create';
 if ($Viewer->permitted('admin_manage_blog')) {
@@ -13,7 +13,7 @@
 
 $headlines = $blogMan->headlines();
 if ($headlines) {
-    (new \Gazelle\WitnessTable\UserReadBlog)->witness($Viewer);
+    (new \Gazelle\WitnessTable\UserReadBlog())->witness($Viewer);
 }
 
 echo $Twig->render('blog/editor.twig', [
diff --git a/sections/blog/dead_thread.php b/sections/blog/dead_thread.php
index b98029ff0..4197186a2 100644
--- a/sections/blog/dead_thread.php
+++ b/sections/blog/dead_thread.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$blog = (new Gazelle\Manager\Blog)->findById((int)($_GET['id'] ?? 0));
+$blog = (new Gazelle\Manager\Blog())->findById((int)($_GET['id'] ?? 0));
 if (is_null($blog)) {
     error('Please provide the ID of a blog post from which to remove the thread link.');
 }
diff --git a/sections/blog/delete_blog.php b/sections/blog/delete_blog.php
index 125f0e56a..3c43bee0e 100644
--- a/sections/blog/delete_blog.php
+++ b/sections/blog/delete_blog.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$blogMan = new Gazelle\Manager\Blog;
+$blogMan = new Gazelle\Manager\Blog();
 $blog = $blogMan->findById((int)($_GET['id'] ?? 0));
 if (is_null($blog)) {
     error('You must provide an ID of a blog to delete');
diff --git a/sections/blog/edit_blog_handle.php b/sections/blog/edit_blog_handle.php
index a9564c4c8..efefbcda3 100644
--- a/sections/blog/edit_blog_handle.php
+++ b/sections/blog/edit_blog_handle.php
@@ -15,12 +15,12 @@
     error('The title of the blog article must not be empty');
 }
 
-$blog = (new Gazelle\Manager\Blog)->findById((int)($_POST['blogid'] ?? 0));
+$blog = (new Gazelle\Manager\Blog())->findById((int)($_POST['blogid'] ?? 0));
 if (is_null($blog)) {
     error(404);
 }
 
-$manager = new Gazelle\Manager\ForumThread;
+$manager = new Gazelle\Manager\ForumThread();
 $thread = match ((int)($_POST['thread'] ?? -1)) {
     -1 => null,
      0 => $manager->create(
diff --git a/sections/blog/new_blog_handle.php b/sections/blog/new_blog_handle.php
index 7ecd9b497..643dacf0e 100644
--- a/sections/blog/new_blog_handle.php
+++ b/sections/blog/new_blog_handle.php
@@ -17,16 +17,16 @@
 
 $thread = match ((int)($_POST['thread'] ?? -1)) {
     -1 => null,
-     0 => (new Gazelle\Manager\ForumThread)->create(
+     0 => (new Gazelle\Manager\ForumThread())->create(
         forum: new Gazelle\Forum(ANNOUNCEMENT_FORUM_ID),
         user:  $Viewer,
         title: $title,
         body:  $body,
     ),
-    default => (new Gazelle\Manager\ForumThread)->findById((int)$_POST['thread']),
+    default => (new Gazelle\Manager\ForumThread())->findById((int)$_POST['thread']),
 };
 
-$blog = (new Gazelle\Manager\Blog)->create([
+$blog = (new Gazelle\Manager\Blog())->create([
     'title'     => $title,
     'body'      => $body,
     'important' => isset($_POST['important']) ? 1 : 0,
diff --git a/sections/bonus/bprates.php b/sections/bonus/bprates.php
index 4a3a2df23..4041d8ffc 100644
--- a/sections/bonus/bprates.php
+++ b/sections/bonus/bprates.php
@@ -17,7 +17,7 @@
     'pointspergb'   => ['dbColumn' => 'points_per_gb',  'defaultSort' => 'desc', 'text' => 'BP/GB/year'],
 ]);
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (empty($_GET['userid'])) {
     $user = $Viewer;
     $ownProfile = true;
diff --git a/sections/bonus/history.php b/sections/bonus/history.php
index c0f987d38..fa831b1cd 100644
--- a/sections/bonus/history.php
+++ b/sections/bonus/history.php
@@ -6,7 +6,7 @@
     if (!$Viewer->permitted('admin_bp_history')) {
         error(403);
     }
-    $user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+    $user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
     if (is_null($user)) {
         error(404);
     }
diff --git a/sections/bonus/index.php b/sections/bonus/index.php
index bdbe1f554..c1d6b4580 100644
--- a/sections/bonus/index.php
+++ b/sections/bonus/index.php
@@ -41,7 +41,7 @@
         require_once('history.php');
         break;
     case 'cacheflush':
-        (new \Gazelle\Manager\Bonus)->flushPriceCache();
+        (new \Gazelle\Manager\Bonus())->flushPriceCache();
         header("Location: bonus.php");
         exit;
     case 'donate':
diff --git a/sections/bonus/store.php b/sections/bonus/store.php
index e42aea413..c44cbd14a 100644
--- a/sections/bonus/store.php
+++ b/sections/bonus/store.php
@@ -42,7 +42,7 @@
 }
 
 $points = (int)$Viewer->bonusPointsTotal();
-$bonusMan = new Gazelle\Manager\Bonus;
+$bonusMan = new Gazelle\Manager\Bonus();
 $auth = $Viewer->auth();
 $pool = $bonusMan->getOpenPool();
 if ($pool) {
diff --git a/sections/bonus/token_other.php b/sections/bonus/token_other.php
index 8df715243..2df01d9b8 100644
--- a/sections/bonus/token_other.php
+++ b/sections/bonus/token_other.php
@@ -11,7 +11,7 @@
     if (empty($_POST['user'])) {
         error('You have to enter a username to give tokens to.');
     }
-    $user = (new Gazelle\Manager\User)->findByUsername(urldecode($_POST['user']));
+    $user = (new Gazelle\Manager\User())->findByUsername(urldecode($_POST['user']));
     if (is_null($user)) {
         error('Nobody with that name found at ' . SITE_NAME . '. Try a user search and give them tokens from their profile page.');
     } elseif ($user->id() == $Viewer->id()) {
diff --git a/sections/bookmarks/add.php b/sections/bookmarks/add.php
index 3fb478cbc..e7f293a87 100644
--- a/sections/bookmarks/add.php
+++ b/sections/bookmarks/add.php
@@ -9,6 +9,6 @@
 }
 
 if ($type === 'request') {
-    (new Gazelle\Manager\Request)->findById($id)?->updateBookmarkStats();
+    (new Gazelle\Manager\Request())->findById($id)?->updateBookmarkStats();
 }
 print(json_encode('OK'));
diff --git a/sections/bookmarks/artists.php b/sections/bookmarks/artists.php
index 9f8c6da48..6729e8e3c 100644
--- a/sections/bookmarks/artists.php
+++ b/sections/bookmarks/artists.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['userid'])) {
     $user = $Viewer;
 } else {
diff --git a/sections/bookmarks/edit_torrents.php b/sections/bookmarks/edit_torrents.php
index 83a58f7a6..6974f109b 100644
--- a/sections/bookmarks/edit_torrents.php
+++ b/sections/bookmarks/edit_torrents.php
@@ -6,13 +6,13 @@
     if (!$Viewer->permitted('users_override_paranoia')) {
         error(403);
     }
-    $user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+    $user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
     if (is_null($user)) {
         error(404);
     }
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 
 $list = [];
 foreach ((new Gazelle\User\Bookmark($user))->tgroupBookmarkList() as $info) {
diff --git a/sections/bookmarks/torrents.php b/sections/bookmarks/torrents.php
index dca4bbb8c..5a997bdbf 100644
--- a/sections/bookmarks/torrents.php
+++ b/sections/bookmarks/torrents.php
@@ -11,7 +11,7 @@
     if (!$Viewer->permitted('users_override_paranoia')) {
         error(403);
     }
-    $user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+    $user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
     if (is_null($user)) {
         error(404);
     }
@@ -20,16 +20,16 @@
 
 $bookmark = new Gazelle\User\Bookmark($user);
 $snatcher = $Viewer->snatch();
-$tgMan    = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$torMan   = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
-$collMan  = (new Gazelle\Manager\Collage)->setImageProxy(new Gazelle\Util\ImageProxy($Viewer));
+$tgMan    = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$torMan   = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
+$collMan  = (new Gazelle\Manager\Collage())->setImageProxy(new Gazelle\Util\ImageProxy($Viewer));
 
 $paginator = new Gazelle\Util\Paginator(200, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($bookmark->torrentTotal());
 
 $bookmarkList      = $bookmark->torrentList($paginator->limit(), $paginator->offset());
 $NumGroups         = count($bookmarkList);
-$artistLeaderboard = $bookmark->torrentArtistLeaderboard(new Gazelle\Manager\Artist);
+$artistLeaderboard = $bookmark->torrentArtistLeaderboard(new Gazelle\Manager\Artist());
 $tagLeaderboard    = $bookmark->torrentTagLeaderboard();
 $CollageCovers     = $Viewer->option('CollageCovers') ?? 25;
 
diff --git a/sections/chat/webirc.php b/sections/chat/webirc.php
index a1c3b3257..76624ef94 100644
--- a/sections/chat/webirc.php
+++ b/sections/chat/webirc.php
@@ -5,7 +5,7 @@
     $Viewer->setField('IRCKey', $ircKey)->modify();
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $ircNick = str_replace('.', '', $Viewer->username());
 if (!$ircNick || $userMan->findByUsername($ircNick)) {
     $ircNick = str_replace('.', '_', $Viewer->username());
diff --git a/sections/collages/add_artist.php b/sections/collages/add_artist.php
index 88ebaf302..f62005a9c 100644
--- a/sections/collages/add_artist.php
+++ b/sections/collages/add_artist.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$collageMan = new Gazelle\Manager\Collage;
+$collageMan = new Gazelle\Manager\Collage();
 $collage    = null;
 if (isset($_POST['collage_combo'])) {
     // From artist page
@@ -62,7 +62,7 @@
 }
 
 /* check that they correspond to artist pages */
-$artistMan = new Gazelle\Manager\Artist;
+$artistMan = new Gazelle\Manager\Artist();
 $ID = [];
 foreach ($URL as $u) {
     preg_match(ARTIST_REGEXP, $u, $match);
diff --git a/sections/collages/add_torrent.php b/sections/collages/add_torrent.php
index 013f78cfc..c58e64020 100644
--- a/sections/collages/add_torrent.php
+++ b/sections/collages/add_torrent.php
@@ -9,7 +9,7 @@
     error(403);
 }
 
-$collageMan = new Gazelle\Manager\Collage;
+$collageMan = new Gazelle\Manager\Collage();
 if (isset($_POST['collage_combo']) && (int)$_POST['collage_combo']) {
     $collage = $collageMan->findById((int)$_POST['collage_combo']); // From release page
 } elseif (isset($_POST['collage_ref'])) {
@@ -59,7 +59,7 @@
 }
 
 /* check that they correspond to torrent pages */
-$tgroupMan = new Gazelle\Manager\TGroup;
+$tgroupMan = new Gazelle\Manager\TGroup();
 $groupIds = [];
 foreach ($URL as $u) {
     preg_match(TGROUP_REGEXP, $u, $match);
diff --git a/sections/collages/ajax_add.php b/sections/collages/ajax_add.php
index 14cf9547b..819ff65f1 100644
--- a/sections/collages/ajax_add.php
+++ b/sections/collages/ajax_add.php
@@ -14,7 +14,7 @@
     entryId:       (int)$_REQUEST['entry_id'],
     name:          trim($_REQUEST['name']),
     user:          $Viewer,
-    manager:       new Gazelle\Manager\Collage,
-    artistManager: new Gazelle\Manager\Artist,
-    tgroupManager: new Gazelle\Manager\TGroup,
+    manager:       new Gazelle\Manager\Collage(),
+    artistManager: new Gazelle\Manager\Artist(),
+    tgroupManager: new Gazelle\Manager\TGroup(),
 ))->response();
diff --git a/sections/collages/all_comments.php b/sections/collages/all_comments.php
index 24eeb024f..43c24a3f8 100644
--- a/sections/collages/all_comments.php
+++ b/sections/collages/all_comments.php
@@ -1,6 +1,6 @@
 <?php
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_GET['collageid'] ?? 0));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_GET['collageid'] ?? 0));
 if (is_null($collage)) {
     error(404);
 }
@@ -18,6 +18,6 @@
     'paginator'     => $paginator,
     'textarea'      => (new Gazelle\Util\Textarea('quickpost', '', 90, 8))->setPreviewManual(true),
     'url'           => $_SERVER['REQUEST_URI'],
-    'userMan'       => new Gazelle\Manager\User,
+    'userMan'       => new Gazelle\Manager\User(),
     'viewer'        => $Viewer,
 ]);
diff --git a/sections/collages/autocomplete.php b/sections/collages/autocomplete.php
index 02a049d24..1544e6008 100644
--- a/sections/collages/autocomplete.php
+++ b/sections/collages/autocomplete.php
@@ -12,5 +12,5 @@
 header('Content-Type: application/json; charset=utf-8');
 echo json_encode([
     'query'       => $fullName,
-    'suggestions' => (new Gazelle\Manager\Collage)->autocomplete($fullName, isset($_GET['artist'])),
+    'suggestions' => (new Gazelle\Manager\Collage())->autocomplete($fullName, isset($_GET['artist'])),
 ]);
diff --git a/sections/collages/browse.php b/sections/collages/browse.php
index aa367bee9..7db7cb179 100644
--- a/sections/collages/browse.php
+++ b/sections/collages/browse.php
@@ -1,7 +1,7 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
-$search = (new Gazelle\Search\Collage)->setLookup($_GET['type'] ?? 'name');
+$userMan = new Gazelle\Manager\User();
+$search = (new Gazelle\Search\Collage())->setLookup($_GET['type'] ?? 'name');
 
 if (!empty($_GET['bookmarks'])) {
     $search->setBookmarkView($Viewer);
@@ -17,7 +17,7 @@
     }
 
     if (!empty($_GET['tags'])) {
-        $tagMan = new Gazelle\Manager\Tag;
+        $tagMan = new Gazelle\Manager\Tag();
         $list = explode(',', $_GET['tags']);
         $taglist = [];
         foreach ($list as $name) {
@@ -57,7 +57,7 @@
     'input'     => $_GET,
     'page'      => $search->page($paginator->limit(), $paginator->offset()),
     'paginator' => $paginator,
-    'personal'  => (new Gazelle\Manager\Collage)->findPersonalByUser($Viewer),
+    'personal'  => (new Gazelle\Manager\Collage())->findPersonalByUser($Viewer),
     'search'    => $search,
     'viewer'    => $Viewer,
 ]);
diff --git a/sections/collages/collage.php b/sections/collages/collage.php
index 8cd24bfe5..5a006e721 100644
--- a/sections/collages/collage.php
+++ b/sections/collages/collage.php
@@ -1,6 +1,6 @@
 <?php
 
-$collageMan = new Gazelle\Manager\Collage;
+$collageMan = new Gazelle\Manager\Collage();
 $Collage = $collageMan->findById((int)($_GET['id'] ?? 0));
 if (is_null($Collage)) {
     error(404);
diff --git a/sections/collages/collage_artists.php b/sections/collages/collage_artists.php
index 9be0c8a03..27d1358a3 100644
--- a/sections/collages/collage_artists.php
+++ b/sections/collages/collage_artists.php
@@ -45,7 +45,7 @@
 echo $Twig->render('collage/sidebar.twig', [
     'artists'      => 0, // only makes sense for torrent collages
     'collage'      => $Collage,
-    'comments'     => (new Gazelle\Manager\Comment)->collageSummary($CollageID),
+    'comments'     => (new Gazelle\Manager\Comment())->collageSummary($CollageID),
     'contributors' => array_slice($Collage->contributors(), 0, 5, true),
     'entries'      => $Collage->numArtists(),
     'object'       => 'artist',
diff --git a/sections/collages/collage_torrent.php b/sections/collages/collage_torrent.php
index 47baf3ff1..e1b372ea1 100644
--- a/sections/collages/collage_torrent.php
+++ b/sections/collages/collage_torrent.php
@@ -1,9 +1,9 @@
 <?php
 
-$tgMan         = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$torMan        = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$tgMan         = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$torMan        = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $bookmark      = new Gazelle\User\Bookmark($Viewer);
-$collMan       = (new Gazelle\Manager\Collage)->setImageProxy(new \Gazelle\Util\ImageProxy($Viewer));
+$collMan       = (new Gazelle\Manager\Collage())->setImageProxy(new \Gazelle\Util\ImageProxy($Viewer));
 $urlStem       = (new Gazelle\User\Stylesheet($Viewer))->imagePath();
 $vote          = new Gazelle\User\Vote($Viewer);
 
@@ -28,7 +28,7 @@
 echo$Twig->render('collage/sidebar.twig', [
     'artists'      => $Collage->numArtists(),
     'collage'      => $Collage,
-    'comments'     => (new Gazelle\Manager\Comment)->collageSummary($CollageID),
+    'comments'     => (new Gazelle\Manager\Comment())->collageSummary($CollageID),
     'contributors' => array_slice($Collage->contributors(), 0, 5, true),
     'entries'      => $Collage->numEntries(),
     'object'       => 'torrent',
diff --git a/sections/collages/delete_handle.php b/sections/collages/delete_handle.php
index 9c2816915..5be6d6e98 100644
--- a/sections/collages/delete_handle.php
+++ b/sections/collages/delete_handle.php
@@ -7,7 +7,7 @@
     error('You must enter a reason!');
 }
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)$_POST['collageid']);
+$collage = (new Gazelle\Manager\Collage())->findById((int)$_POST['collageid']);
 if (is_null($collage)) {
     error(404);
 }
@@ -19,8 +19,8 @@
 $name = $collage->name();
 $collage->remove();
 
-(new Gazelle\Manager\Subscription)->flushPage('collages', $collageId);
-(new Gazelle\Log)->general(sprintf("Collage %d (%s) was deleted by %s: %s",
+(new Gazelle\Manager\Subscription())->flushPage('collages', $collageId);
+(new Gazelle\Log())->general(sprintf("Collage %d (%s) was deleted by %s: %s",
     $collageId, $name, $Viewer->username(), $reason
 ));
 
diff --git a/sections/collages/download.php b/sections/collages/download.php
index ce011dbc6..6bbcf8139 100644
--- a/sections/collages/download.php
+++ b/sections/collages/download.php
@@ -8,12 +8,12 @@
     error(0);
 }
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_REQUEST['collageid'] ?? 0));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_REQUEST['collageid'] ?? 0));
 if (is_null($collage)) {
     error(404);
 }
 
-$collector = new Gazelle\Collector\Collage($Viewer, new Gazelle\Manager\Torrent, $collage, (int)$_REQUEST['preference']);
+$collector = new Gazelle\Collector\Collage($Viewer, new Gazelle\Manager\Torrent(), $collage, (int)$_REQUEST['preference']);
 if (!$collector->prepare($_REQUEST['list'])) {
     error("Nothing to gather, choose some encodings and bitrates!");
 }
diff --git a/sections/collages/edit.php b/sections/collages/edit.php
index 73649e0d3..9a81c1358 100644
--- a/sections/collages/edit.php
+++ b/sections/collages/edit.php
@@ -1,13 +1,13 @@
 <?php
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_GET['collageid'] ?? 0));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_GET['collageid'] ?? 0));
 if (is_null($collage)) {
     error(404);
 }
 if ($collage->isPersonal() && !$collage->isOwner($Viewer) && !$Viewer->permitted('site_collages_delete')) {
     error(403);
 }
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 
 echo $Twig->render('collage/edit.twig', [
     'can_rename'   => $Viewer->permitted('site_collages_delete')
diff --git a/sections/collages/edit_handle.php b/sections/collages/edit_handle.php
index 32bb45ba1..813884f8f 100644
--- a/sections/collages/edit_handle.php
+++ b/sections/collages/edit_handle.php
@@ -21,7 +21,7 @@
     error(403);
 }
 
-$collageMan = new Gazelle\Manager\Collage;
+$collageMan = new Gazelle\Manager\Collage();
 if (isset($_POST['name'])) {
     $name = trim($_POST['name']);
     $check = $collageMan->findByName($name);
@@ -43,7 +43,7 @@
 }
 
 if (!isset($_POST['regen-tags'])) {
-    $collage->setField('TagList', (new Gazelle\Manager\Tag)->normalize(str_replace(',', ' ', $_POST['tags'])));
+    $collage->setField('TagList', (new Gazelle\Manager\Tag())->normalize(str_replace(',', ' ', $_POST['tags'])));
 } else {
     $tagList = $collage->rebuildTagList();
     if (count($tagList) > 2) {
@@ -90,7 +90,7 @@
 $collage->modify();
 
 if ($Viewer->permitted('admin_freeleech') && isset($_POST['change_leech'])) {
-    $torMan = new \Gazelle\Manager\Torrent;
+    $torMan = new \Gazelle\Manager\Torrent();
     if (!isset($_POST['neutral'])) {
         $threshold = 0;
     } else {
@@ -101,7 +101,7 @@
     }
     $collage->setFreeleech(
         torMan:    $torMan,
-        tracker:   new \Gazelle\Tracker,
+        tracker:   new \Gazelle\Tracker(),
         user:      $Viewer,
         leechType: $torMan->lookupLeechType($_POST['leech_type'] ?? LeechType::Normal->value),
         reason:    $torMan->lookupLeechReason($_POST['leech_reason'] ?? LeechReason::Normal->value),
diff --git a/sections/collages/manage.php b/sections/collages/manage.php
index 2288088da..ccd64cc00 100644
--- a/sections/collages/manage.php
+++ b/sections/collages/manage.php
@@ -1,6 +1,6 @@
 <?php
 
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_GET['collageid'] ?? $_GET['id'] ?? 0));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_GET['collageid'] ?? $_GET['id'] ?? 0));
 if (is_null($collage) || $collage->isArtist()) {
     error(404);
 }
@@ -10,6 +10,6 @@
 
 echo $Twig->render('collage/manage-tgroup.twig', [
     'collage'  => $collage,
-    'manager'  => new Gazelle\Manager\TGroup,
+    'manager'  => new Gazelle\Manager\TGroup(),
     'viewer'   => $Viewer,
 ]);
diff --git a/sections/collages/manage_artists.php b/sections/collages/manage_artists.php
index 282066bd1..3c7e1bed5 100644
--- a/sections/collages/manage_artists.php
+++ b/sections/collages/manage_artists.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('site_collages_create')) {
     error(403);
 }
-$collage = (new Gazelle\Manager\Collage)->findById((int)$_GET['collageid']);
+$collage = (new Gazelle\Manager\Collage())->findById((int)$_GET['collageid']);
 if (is_null($collage)) {
     error(404);
 }
diff --git a/sections/collages/manage_artists_handle.php b/sections/collages/manage_artists_handle.php
index 65ee65314..1724d471d 100644
--- a/sections/collages/manage_artists_handle.php
+++ b/sections/collages/manage_artists_handle.php
@@ -9,7 +9,7 @@
 if (!$artistId) {
     error(404);
 }
-$collage = (new Gazelle\Manager\Collage)->findById((int)$_POST['collageid']);
+$collage = (new Gazelle\Manager\Collage())->findById((int)$_POST['collageid']);
 if (is_null($collage)) {
     error(404);
 }
diff --git a/sections/collages/manage_handle.php b/sections/collages/manage_handle.php
index eb4426cb1..2fedef4ec 100644
--- a/sections/collages/manage_handle.php
+++ b/sections/collages/manage_handle.php
@@ -6,7 +6,7 @@
 if (!$groupId) {
     error(404);
 }
-$collage = (new Gazelle\Manager\Collage)->findById((int)($_POST['collageid']));
+$collage = (new Gazelle\Manager\Collage())->findById((int)($_POST['collageid']));
 if (is_null($collage)) {
     error(404);
 }
@@ -17,7 +17,7 @@
 if (($_POST['submit'] ?? '') === 'Remove') {
     $userId = $collage->entryUserId($groupId);
     if ($collage->removeEntry($groupId)) {
-        (new Gazelle\Log)->general(sprintf("Collage %d (%s) group entry $groupId (added by user $userId) removed by %s",
+        (new Gazelle\Log())->general(sprintf("Collage %d (%s) group entry $groupId (added by user $userId) removed by %s",
             $collage->id(), $collage->name(), $Viewer->username()
         ));
     }
diff --git a/sections/collages/new_handle.php b/sections/collages/new_handle.php
index b7fbe5838..fa7e8f77e 100644
--- a/sections/collages/new_handle.php
+++ b/sections/collages/new_handle.php
@@ -10,9 +10,9 @@
     error(403);
 }
 $categoryId = (int)$_POST['category'];
-$collageMan = new Gazelle\Manager\Collage;
+$collageMan = new Gazelle\Manager\Collage();
 
-$Val = new Gazelle\Util\Validator;
+$Val = new Gazelle\Util\Validator();
 if ($categoryId != COLLAGE_PERSONAL_ID || $Viewer->permitted('site_collages_renamepersonal')) {
     $Val->setField('name', true, 'string', 'The name must be between 3 and 100 characters', ['range' => [3, 100]]);
     $name = trim($_POST['name']);
@@ -60,8 +60,8 @@
     $categoryId,
     $name,
     $_POST['description'],
-    (new Gazelle\Manager\Tag)->normalize(str_replace(',', ' ', $_POST['tags'])),
-    new Gazelle\Log
+    (new Gazelle\Manager\Tag())->normalize(str_replace(',', ' ', $_POST['tags'])),
+    new Gazelle\Log()
 );
 
 if ($Viewer->option('AutoSubscribe')) {
diff --git a/sections/collages/recover.php b/sections/collages/recover.php
index e2c8ff3f9..5d29b42ed 100644
--- a/sections/collages/recover.php
+++ b/sections/collages/recover.php
@@ -8,7 +8,7 @@
 
 if (!empty($_POST['id']) || $_POST['name'] !== '') {
     authorize();
-    $collageMan = new Gazelle\Manager\Collage;
+    $collageMan = new Gazelle\Manager\Collage();
     $collage = null;
 
     if (!empty($_POST['id'])) {
@@ -21,7 +21,7 @@
         error('Collage is completely deleted');
     } else {
         $collageId = $collage->flush()->id();
-        (new Gazelle\Log)->general("Collage $collageId was recovered by " . $Viewer->username());
+        (new Gazelle\Log())->general("Collage $collageId was recovered by " . $Viewer->username());
         header('Location: ' . $collage->location());
         exit;
     }
diff --git a/sections/comments/comments.php b/sections/comments/comments.php
index fb63bef48..309a516f6 100644
--- a/sections/comments/comments.php
+++ b/sections/comments/comments.php
@@ -13,7 +13,7 @@
  *     If missing or invalid, this defaults to the comments one made
  */
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['id'])) {
     $User = $Viewer;
 } else {
@@ -208,13 +208,13 @@
 $requestList = [];
 $tgroupList = [];
 if ($Action == 'requests') {
-    $requestMan = new Gazelle\Manager\Request;
+    $requestMan = new Gazelle\Manager\Request();
     foreach (array_flip(array_flip($db->collect('PageID'))) as $id) {
         $id = (int)$id;
         $requestList[$id] = $requestMan->findById($id);
     }
 } elseif ($Action == 'torrents') {
-    $tgMan = new Gazelle\Manager\TGroup;
+    $tgMan = new Gazelle\Manager\TGroup();
     foreach (array_flip(array_flip($db->collect('PageID'))) as $id) {
         $id = (int)$id;
         $tgroupList[$id] = $tgMan->findById($id);
@@ -250,7 +250,7 @@
 <?php
 } else {
     echo $paginator->linkbox();
-    $commentMan = new Gazelle\Manager\Comment;
+    $commentMan = new Gazelle\Manager\Comment();
     $db->set_query_id($Comments);
     while ([$AuthorID, $Page, $PageID, $Name, $PostID, $Body, $AddedTime, $EditedTime, $EditedUserID] = $db->next_record(escape: false)) {
         $author = new Gazelle\User($AuthorID);
diff --git a/sections/comments/delete_handle.php b/sections/comments/delete_handle.php
index 441180643..2ed3b5925 100644
--- a/sections/comments/delete_handle.php
+++ b/sections/comments/delete_handle.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$comment = (new Gazelle\Manager\Comment)->findById((int)($_REQUEST['postid'] ?? 0));
+$comment = (new Gazelle\Manager\Comment())->findById((int)($_REQUEST['postid'] ?? 0));
 if (is_null($comment)) {
     error(404);
 }
diff --git a/sections/comments/edit_handle.php b/sections/comments/edit_handle.php
index 6f9b81732..4a89b6b1c 100644
--- a/sections/comments/edit_handle.php
+++ b/sections/comments/edit_handle.php
@@ -10,14 +10,14 @@
     error(404, true);
 }
 
-$comment = (new Gazelle\Manager\Comment)->findById((int)($_REQUEST['postid'] ?? 0));
+$comment = (new Gazelle\Manager\Comment())->findById((int)($_REQUEST['postid'] ?? 0));
 if (is_null($comment)) {
     error(404, true);
 }
 if ($comment->userId() != $Viewer->id() && !$Viewer->permitted('site_moderate_forums')) {
     error(403, true);
 }
-$user = (new Gazelle\Manager\User)->findById($comment->userId());
+$user = (new Gazelle\Manager\User())->findById($comment->userId());
 if (is_null($user)) {
     error(0, true);
 }
diff --git a/sections/comments/get.php b/sections/comments/get.php
index 9e827d9da..adbebb9a4 100644
--- a/sections/comments/get.php
+++ b/sections/comments/get.php
@@ -1,6 +1,6 @@
 <?php
 
-$body = (new Gazelle\Manager\Comment)->findBodyById((int)($_GET['postid'] ?? 0));
+$body = (new Gazelle\Manager\Comment())->findBodyById((int)($_GET['postid'] ?? 0));
 if (is_null($body)) {
     error(404);
 }
diff --git a/sections/comments/jump.php b/sections/comments/jump.php
index 7fd43140f..e32dca5d1 100644
--- a/sections/comments/jump.php
+++ b/sections/comments/jump.php
@@ -1,6 +1,6 @@
 <?php
 
-$comment = (new Gazelle\Manager\Comment)->findById((int)($_REQUEST['postid'] ?? 0));
+$comment = (new Gazelle\Manager\Comment())->findById((int)($_REQUEST['postid'] ?? 0));
 if (is_null($comment)) {
     error(404);
 }
diff --git a/sections/comments/post_handle.php b/sections/comments/post_handle.php
index ddf2ccad4..cb6ff06a5 100644
--- a/sections/comments/post_handle.php
+++ b/sections/comments/post_handle.php
@@ -15,7 +15,7 @@
     error(404);
 }
 
-$commentMan = new Gazelle\Manager\Comment;
+$commentMan = new Gazelle\Manager\Comment();
 $comment = $commentMan->create($Viewer, $page, $pageId, $_POST['quickpost']);
 
 $subscription = new \Gazelle\User\Subscription($Viewer);
diff --git a/sections/comments/warn.php b/sections/comments/warn.php
index bf7413aab..7433611cb 100644
--- a/sections/comments/warn.php
+++ b/sections/comments/warn.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$comment = (new Gazelle\Manager\Comment)->findById((int)($_POST['postid'] ?? 0));
+$comment = (new Gazelle\Manager\Comment())->findById((int)($_POST['postid'] ?? 0));
 if (is_null($comment)) {
     error(404);
 }
diff --git a/sections/comments/warn_handle.php b/sections/comments/warn_handle.php
index 8b2d269cd..352883053 100644
--- a/sections/comments/warn_handle.php
+++ b/sections/comments/warn_handle.php
@@ -2,6 +2,6 @@
 
 require_once(__DIR__ . '/../forums/do_warn.php');
 
-[$post, $body] = handleWarningRequest(new Gazelle\Manager\Comment);
+[$post, $body] = handleWarningRequest(new Gazelle\Manager\Comment());
 $post->setField('Body', $body)
     ->setField('EditedUserID', $Viewer->id())->modify();
diff --git a/sections/contest/admin.php b/sections/contest/admin.php
index 326872cc5..137dde31d 100644
--- a/sections/contest/admin.php
+++ b/sections/contest/admin.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$contestMan = new Gazelle\Manager\Contest;
+$contestMan = new Gazelle\Manager\Contest();
 $create     = isset($_GET['action']) && $_GET['action'] === 'create';
 $saved      = false;
 
@@ -54,6 +54,6 @@
     'list'       => $contestMan->contestList(),
     'saved'      => $saved,
     'type'       => $contestMan->contestTypes(),
-    'user_count' => (new \Gazelle\Stats\Users)->enabledUserTotal(),
+    'user_count' => (new \Gazelle\Stats\Users())->enabledUserTotal(),
     'viewer'     => $Viewer,
 ]);
diff --git a/sections/contest/index.php b/sections/contest/index.php
index 29c029173..5709c22a1 100644
--- a/sections/contest/index.php
+++ b/sections/contest/index.php
@@ -1,6 +1,6 @@
 <?php
 
-$contestMan = new Gazelle\Manager\Contest;
+$contestMan = new Gazelle\Manager\Contest();
 
 switch ($_GET['action'] ?? '') {
     case 'leaderboard':
diff --git a/sections/donate/index.php b/sections/donate/index.php
index 6c45088dc..c99634953 100644
--- a/sections/donate/index.php
+++ b/sections/donate/index.php
@@ -1,14 +1,14 @@
 <?php
 
 if (MONERO_DONATION_ADDRESS) {
-    $moneroDonation = new Gazelle\Donate\Monero;
+    $moneroDonation = new Gazelle\Donate\Monero();
     $moneroAddr = $moneroDonation->address($Viewer->id());
 } else {
     $moneroAddr = null;
 }
 
 if (BITCOIN_DONATION_XYZPUB) {
-    $btcDonation = new Gazelle\Donate\Bitcoin;
+    $btcDonation = new Gazelle\Donate\Bitcoin();
     $btcAddr = $btcDonation->address($Viewer->id());
 } else {
     $btcAddr = null;
diff --git a/sections/enable/index.php b/sections/enable/index.php
index ec4b4de33..1cb1de943 100644
--- a/sections/enable/index.php
+++ b/sections/enable/index.php
@@ -9,7 +9,7 @@
     exit;
 }
 
-$enabler = (new Gazelle\Manager\AutoEnable)->findByToken($_GET['token']);
+$enabler = (new Gazelle\Manager\AutoEnable())->findByToken($_GET['token']);
 if (is_null($enabler)) {
     error('invalid enable token');
 }
diff --git a/sections/forums/add_poll_option.php b/sections/forums/add_poll_option.php
index 8370c73c7..16b5c8961 100644
--- a/sections/forums/add_poll_option.php
+++ b/sections/forums/add_poll_option.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$poll = (new Gazelle\Manager\ForumPoll)->findById((int)($_POST['threadid'] ?? 0));
+$poll = (new Gazelle\Manager\ForumPoll())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($poll)) {
     error(404);
 }
diff --git a/sections/forums/autosub.php b/sections/forums/autosub.php
index 2dc9a01c4..ff99799db 100644
--- a/sections/forums/autosub.php
+++ b/sections/forums/autosub.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$forum = (new Gazelle\Manager\Forum)->findById((int)($_POST['id'] ?? 0));
+$forum = (new Gazelle\Manager\Forum())->findById((int)($_POST['id'] ?? 0));
 if (is_null($forum)) {
     json_error('not found');
 }
diff --git a/sections/forums/catchup.php b/sections/forums/catchup.php
index 044c39a53..33fda8128 100644
--- a/sections/forums/catchup.php
+++ b/sections/forums/catchup.php
@@ -8,7 +8,7 @@
     exit;
 }
 
-$forum = (new Gazelle\Manager\Forum)->findById((int)($_GET['forumid'] ?? 0));
+$forum = (new Gazelle\Manager\Forum())->findById((int)($_GET['forumid'] ?? 0));
 if (is_null($forum)) {
     error(404);
 }
diff --git a/sections/forums/change_vote.php b/sections/forums/change_vote.php
index 9caed717f..727fa5a48 100644
--- a/sections/forums/change_vote.php
+++ b/sections/forums/change_vote.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$poll = (new Gazelle\Manager\ForumPoll)->findById((int)($_POST['threadid'] ?? 0));
+$poll = (new Gazelle\Manager\ForumPoll())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($poll)) {
     error(404);
 }
diff --git a/sections/forums/delete.php b/sections/forums/delete.php
index b8b459222..4873fa481 100644
--- a/sections/forums/delete.php
+++ b/sections/forums/delete.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_GET['postid'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_GET['postid'] ?? 0));
 if (is_null($post)) {
     error(404);
 }
diff --git a/sections/forums/delete_poll_option.php b/sections/forums/delete_poll_option.php
index b15804dc0..78cb10346 100644
--- a/sections/forums/delete_poll_option.php
+++ b/sections/forums/delete_poll_option.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$poll = (new Gazelle\Manager\ForumPoll)->findById((int)($_POST['threadid'] ?? 0));
+$poll = (new Gazelle\Manager\ForumPoll())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($poll)) {
     error(404);
 }
diff --git a/sections/forums/do_warn.php b/sections/forums/do_warn.php
index 0daf2c442..477ef9543 100644
--- a/sections/forums/do_warn.php
+++ b/sections/forums/do_warn.php
@@ -16,7 +16,7 @@ function handleWarningRequest(\Gazelle\Manager\ForumPost|\Gazelle\Manager\Commen
         error(404);
     }
 
-    $userMan = new \Gazelle\Manager\User;
+    $userMan = new \Gazelle\Manager\User();
     $user = $userMan->findById($post->userId());
     if (is_null($user)) {
         error(404);
diff --git a/sections/forums/edit_handle.php b/sections/forums/edit_handle.php
index 7ccf3b127..13b60e0a6 100644
--- a/sections/forums/edit_handle.php
+++ b/sections/forums/edit_handle.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_POST['post'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_POST['post'] ?? 0));
 if (!$post) {
     error("No forum post #{$_POST['post']} found", true);
 }
@@ -22,7 +22,7 @@
         error("You cannot edit someone else's post", true);
     }
     if ($_POST['pm'] ?? 0) {
-        $user = (new Gazelle\Manager\User)->findById($post->userId());
+        $user = (new Gazelle\Manager\User())->findById($post->userId());
         if (is_null($user)) {
             error(0);
         }
diff --git a/sections/forums/forum.php b/sections/forums/forum.php
index 708a0df11..323b60a21 100644
--- a/sections/forums/forum.php
+++ b/sections/forums/forum.php
@@ -8,7 +8,7 @@
 
 ********************************************************************************/
 
-$forum = (new Gazelle\Manager\Forum)->findById((int)$_GET['forumid']);
+$forum = (new Gazelle\Manager\Forum())->findById((int)$_GET['forumid']);
 if (!$forum) {
     error(404);
 }
diff --git a/sections/forums/get_post.php b/sections/forums/get_post.php
index 97e5fc2be..bfedb0979 100644
--- a/sections/forums/get_post.php
+++ b/sections/forums/get_post.php
@@ -1,6 +1,6 @@
 <?php
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_GET['post'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_GET['post'] ?? 0));
 if (is_null($post)) {
     error(404);
 }
diff --git a/sections/forums/mod_thread.php b/sections/forums/mod_thread.php
index c95b2425b..1284e0ee0 100644
--- a/sections/forums/mod_thread.php
+++ b/sections/forums/mod_thread.php
@@ -17,9 +17,9 @@
 }
 authorize();
 
-$forumMan = new Gazelle\Manager\Forum;
+$forumMan = new Gazelle\Manager\Forum();
 
-$thread = (new Gazelle\Manager\ForumThread)->findById((int)($_POST['threadid'] ?? 0));
+$thread = (new Gazelle\Manager\ForumThread())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($thread)) {
     error(404);
 }
@@ -68,7 +68,7 @@
     if ($transId < 1) {
         error(0);
     }
-    $transitions = (new Gazelle\Manager\ForumTransition)->threadTransitionList($Viewer, $forum);
+    $transitions = (new Gazelle\Manager\ForumTransition())->threadTransitionList($Viewer, $forum);
     if (!isset($transitions[$transId])) {
         error(0);
     }
diff --git a/sections/forums/new_thread_handle.php b/sections/forums/new_thread_handle.php
index 4a33812f2..b395cf103 100644
--- a/sections/forums/new_thread_handle.php
+++ b/sections/forums/new_thread_handle.php
@@ -20,7 +20,7 @@
 if (!isset($_POST['forum'])) {
     error(0);
 }
-$forum = (new Gazelle\Manager\Forum)->findById((int)$_POST['forum']);
+$forum = (new Gazelle\Manager\Forum())->findById((int)$_POST['forum']);
 if (is_null($forum)) {
     error(404);
 }
@@ -59,10 +59,10 @@
     }
 }
 
-$thread = (new Gazelle\Manager\ForumThread)->create($forum, $Viewer, $title, $body);
+$thread = (new Gazelle\Manager\ForumThread())->create($forum, $Viewer, $title, $body);
 $threadId = $thread->id();
 if ($needPoll) {
-    (new Gazelle\Manager\ForumPoll)->create($threadId, $question, $answerList);
+    (new Gazelle\Manager\ForumPoll())->create($threadId, $question, $answerList);
     if ($forum->id() == STAFF_FORUM_ID) {
         Irc::sendMessage(
             IRC_CHAN_STAFF,
@@ -74,7 +74,7 @@
 if (isset($_POST['subscribe'])) {
     (new Gazelle\User\Subscription($Viewer))->subscribe($threadId);
 }
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 foreach ($forum->autoSubscribeUserIdList() as $userId) {
     $user = $userMan->findById($userId);
     if ($user) {
diff --git a/sections/forums/newthread.php b/sections/forums/newthread.php
index a3818137b..2283e34de 100644
--- a/sections/forums/newthread.php
+++ b/sections/forums/newthread.php
@@ -1,5 +1,5 @@
 <?php
-$forum = (new Gazelle\Manager\Forum)->findById((int)($_GET['forumid'] ?? 0));
+$forum = (new Gazelle\Manager\Forum())->findById((int)($_GET['forumid'] ?? 0));
 if (!$forum) {
     error(404);
 }
diff --git a/sections/forums/poll_mod.php b/sections/forums/poll_mod.php
index 992386115..0a12676e2 100644
--- a/sections/forums/poll_mod.php
+++ b/sections/forums/poll_mod.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$poll = (new Gazelle\Manager\ForumPoll)->findById((int)($_POST['threadid'] ?? 0));
+$poll = (new Gazelle\Manager\ForumPoll())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($poll)) {
     error(0, true);
 }
diff --git a/sections/forums/poll_vote.php b/sections/forums/poll_vote.php
index 90cc0efa1..920a133c4 100644
--- a/sections/forums/poll_vote.php
+++ b/sections/forums/poll_vote.php
@@ -1,6 +1,6 @@
 <?php
 
-$poll = (new Gazelle\Manager\ForumPoll)->findById((int)($_POST['threadid'] ?? 0));
+$poll = (new Gazelle\Manager\ForumPoll())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($poll)) {
     error(404, true);
 }
@@ -40,7 +40,7 @@
         <ul class="poll nobullet">
 <?php
         if ($poll->hasRevealVotes()) {
-            $staffVote = $poll->staffVote(new Gazelle\Manager\User);
+            $staffVote = $poll->staffVote(new Gazelle\Manager\User());
             foreach ($staffVote as $response => $info) {
                 if ($response !== 'missing') {
 ?>
diff --git a/sections/forums/reply_handle.php b/sections/forums/reply_handle.php
index 18e3421ec..7982019d7 100644
--- a/sections/forums/reply_handle.php
+++ b/sections/forums/reply_handle.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$thread = (new Gazelle\Manager\ForumThread)->findById((int)($_POST['threadid'] ?? 0));
+$thread = (new Gazelle\Manager\ForumThread())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($thread)) {
     error(404);
 }
@@ -31,12 +31,12 @@
 $postId = $post->id();
 
 (new Gazelle\User\Notification\Quote($Viewer))->create(
-    new Gazelle\Manager\User, $body, $postId, 'forums', $threadId
+    new Gazelle\Manager\User(), $body, $postId, 'forums', $threadId
 );
 $subscription = new Gazelle\User\Subscription($Viewer);
 if (isset($_POST['subscribe']) && !$subscription->isSubscribed($threadId)) {
     $subscription->subscribe($threadId);
 }
-(new Gazelle\Manager\Subscription)->flushPage('forums', $threadId);
+(new Gazelle\Manager\Subscription())->flushPage('forums', $threadId);
 
 header("Location: {$thread->location()}&postid=$postId#post$postId");
diff --git a/sections/forums/search.php b/sections/forums/search.php
index 26607d8c8..9389f55dc 100644
--- a/sections/forums/search.php
+++ b/sections/forums/search.php
@@ -128,7 +128,7 @@
     $LastCategoryID = -1;
     $Columns = 0;
     $i = 0;
-    $Forums = (new Gazelle\Manager\Forum)->forumList();
+    $Forums = (new Gazelle\Manager\Forum())->forumList();
     foreach ($Forums as $forumId) {
         $forum = new Gazelle\Forum($forumId);
         if (!$Viewer->readAccess($forum)) {
diff --git a/sections/forums/sticky_post.php b/sections/forums/sticky_post.php
index 36f6d2b46..c70603339 100644
--- a/sections/forums/sticky_post.php
+++ b/sections/forums/sticky_post.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_GET['postid'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_GET['postid'] ?? 0));
 if (is_null($post)) {
     error(404);
 }
diff --git a/sections/forums/thread.php b/sections/forums/thread.php
index a2ed8f94f..347cf6d80 100644
--- a/sections/forums/thread.php
+++ b/sections/forums/thread.php
@@ -13,9 +13,9 @@
 
 //---------- Things to sort out before it can start printing/generating content
 
-$forumMan = new Gazelle\Manager\Forum;
+$forumMan = new Gazelle\Manager\Forum();
 if (isset($_GET['postid'])) {
-    $post = (new Gazelle\Manager\ForumPost)->findById((int)$_GET['postid']);
+    $post = (new Gazelle\Manager\ForumPost())->findById((int)$_GET['postid']);
     if (is_null($post)) {
         error(404);
     }
@@ -26,7 +26,7 @@
     $thread = $post->thread();
 } elseif (isset($_GET['threadid'])) {
     $post = null;
-    $thread = (new Gazelle\Manager\ForumThread)->findById((int)$_GET['threadid']);
+    $thread = (new Gazelle\Manager\ForumThread())->findById((int)$_GET['threadid']);
     if (is_null($thread)) {
         error(404);
     }
@@ -82,10 +82,10 @@
     $Cache->delete_value('subscriptions_user_new_' . $Viewer->id());
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $avatarFilter = Gazelle\Util\Twig::factory()->createTemplate('{{ user|avatar(viewer)|raw }}');
 
-$transitions = (new Gazelle\Manager\ForumTransition)->threadTransitionList($Viewer, $forum);
+$transitions = (new Gazelle\Manager\ForumTransition())->threadTransitionList($Viewer, $forum);
 $department = $forum->departmentList($Viewer);
 $auth = $Viewer->auth();
 
@@ -338,7 +338,7 @@
                     <select name="forumid" id="move_thread_selector" tabindex="8">
 <?php
     $prevCategoryId = 0;
-    $Forums = (new Gazelle\Manager\Forum)->forumList();
+    $Forums = (new Gazelle\Manager\Forum())->forumList();
     foreach ($Forums as $forumId) {
         $forum = new Gazelle\Forum($forumId);
         if (!$Viewer->readAccess($forum)) {
diff --git a/sections/forums/topic_notes_handle.php b/sections/forums/topic_notes_handle.php
index a9bb403ad..636ec2c9e 100644
--- a/sections/forums/topic_notes_handle.php
+++ b/sections/forums/topic_notes_handle.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$thread = (new Gazelle\Manager\ForumThread)->findById((int)($_POST['threadid'] ?? 0));
+$thread = (new Gazelle\Manager\ForumThread())->findById((int)($_POST['threadid'] ?? 0));
 if (is_null($thread)) {
     error(404);
 }
diff --git a/sections/forums/warn.php b/sections/forums/warn.php
index fa07fa85f..582503b92 100644
--- a/sections/forums/warn.php
+++ b/sections/forums/warn.php
@@ -4,11 +4,11 @@
     error(403);
 }
 
-$post = (new Gazelle\Manager\ForumPost)->findById((int)($_POST['postid'] ?? 0));
+$post = (new Gazelle\Manager\ForumPost())->findById((int)($_POST['postid'] ?? 0));
 if (is_null($post)) {
     error(404);
 }
-$user = (new Gazelle\Manager\User)->findById((int)($_POST['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_POST['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/forums/warn_handle.php b/sections/forums/warn_handle.php
index 6c4295be8..90fa1bc14 100644
--- a/sections/forums/warn_handle.php
+++ b/sections/forums/warn_handle.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once('do_warn.php');
-[$post, $body] = handleWarningRequest(new Gazelle\Manager\ForumPost);
+[$post, $body] = handleWarningRequest(new Gazelle\Manager\ForumPost());
 $post->edit($Viewer, $body);
 if ($post->isPinned()) {
     $post->thread()->flush();
diff --git a/sections/friends/friends.php b/sections/friends/friends.php
index 01f4f699b..8ed946372 100644
--- a/sections/friends/friends.php
+++ b/sections/friends/friends.php
@@ -5,7 +5,7 @@
 $paginator->setTotal($friend->total());
 
 echo $Twig->render('user/friend.twig', [
-    'list'      => $friend->page(new Gazelle\Manager\User, $paginator->limit(), $paginator->offset()),
+    'list'      => $friend->page(new Gazelle\Manager\User(), $paginator->limit(), $paginator->offset()),
     'paginator' => $paginator,
     'viewer'    => $Viewer,
 ]);
diff --git a/sections/inbox/compose.php b/sections/inbox/compose.php
index 689e2564e..7243c4068 100644
--- a/sections/inbox/compose.php
+++ b/sections/inbox/compose.php
@@ -1,6 +1,6 @@
 <?php
 
-$recipient = (new Gazelle\Manager\User)->findById((int)$_GET['toid']);
+$recipient = (new Gazelle\Manager\User())->findById((int)$_GET['toid']);
 if (is_null($recipient)) {
     error(404);
 }
diff --git a/sections/inbox/compose_handle.php b/sections/inbox/compose_handle.php
index cc58f1480..fb0c75d2d 100644
--- a/sections/inbox/compose_handle.php
+++ b/sections/inbox/compose_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$recipient = (new Gazelle\Manager\User)->findById((int)$_POST['toid']);
+$recipient = (new Gazelle\Manager\User())->findById((int)$_POST['toid']);
 if (is_null($recipient)) {
     error(404);
 }
@@ -15,7 +15,7 @@
     error('You cannot send a message without a body.');
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $pmMan = new Gazelle\Manager\PM($Viewer);
 $pm = $pmMan->findById((int)($_POST['convid'] ?? 0));
 if ($pm) {
@@ -28,7 +28,7 @@
     $pm = $recipient->inbox()->create($Viewer, $subject, $body);
 }
 
-(new Gazelle\Manager\Notification)->push([$recipient->id()],
+(new Gazelle\Manager\Notification())->push([$recipient->id()],
     "Message from " . $Viewer->username() . ", Subject: " . $pm->subject(),
     $body,
     SITE_URL . '/inbox.php',
diff --git a/sections/inbox/conversation.php b/sections/inbox/conversation.php
index bae4eb359..bb1d63197 100644
--- a/sections/inbox/conversation.php
+++ b/sections/inbox/conversation.php
@@ -15,6 +15,6 @@
     'paginator'  => $paginator,
     'pm'         => $pm,
     'post_list'  => $pm->postList($paginator->limit(), $paginator->offset()),
-    'staff_list' => (new Gazelle\Manager\User)->staffPMList(),
+    'staff_list' => (new Gazelle\Manager\User())->staffPMList(),
     'viewer'     => $Viewer,
 ]);
diff --git a/sections/inbox/forward.php b/sections/inbox/forward.php
index 856d419b2..ac717ea9a 100644
--- a/sections/inbox/forward.php
+++ b/sections/inbox/forward.php
@@ -6,7 +6,7 @@
 if (is_null($pm)) {
     error('Sorry, there is no trace of that conversation in your folder');
 }
-$recipient = (new Gazelle\Manager\User)->findById((int)$_POST['receiverid']);
+$recipient = (new Gazelle\Manager\User())->findById((int)$_POST['receiverid']);
 if (is_null($recipient)) {
     error('Sorry, there is no-one here by that name');
 }
diff --git a/sections/index/private.php b/sections/index/private.php
index 87f1705d4..537eb2294 100644
--- a/sections/index/private.php
+++ b/sections/index/private.php
@@ -4,12 +4,12 @@
 
 Text::$TOC = true;
 
-$featured   = new Gazelle\Manager\FeaturedAlbum;
-$contestMan = new Gazelle\Manager\Contest;
-$newsMan    = new Gazelle\Manager\News;
-$newsReader = new Gazelle\WitnessTable\UserReadNews;
-$tgMan      = new Gazelle\Manager\TGroup;
-$torMan     = new Gazelle\Manager\Torrent;
+$featured   = new Gazelle\Manager\FeaturedAlbum();
+$contestMan = new Gazelle\Manager\Contest();
+$newsMan    = new Gazelle\Manager\News();
+$newsReader = new Gazelle\WitnessTable\UserReadNews();
+$tgMan      = new Gazelle\Manager\TGroup();
+$torMan     = new Gazelle\Manager\Torrent();
 
 if ($newsMan->latestId() != -1 && $newsReader->lastRead($Viewer) < $newsMan->latestId()) {
     $newsReader->witness($Viewer);
@@ -27,7 +27,7 @@
             $leaderboard = [];
         } else {
             $leaderboard = array_slice($leaderboard, 0, 3);
-            $userMan = new Gazelle\Manager\User;
+            $userMan = new Gazelle\Manager\User();
             foreach ($leaderboard as &$entry) {
                 $entry['username'] = $userMan->findById($entry['user_id'])->username();
             }
@@ -38,17 +38,17 @@
 }
 
 echo $Twig->render('index/private-sidebar.twig', [
-    'blog'          => new Gazelle\Manager\Blog,
-    'collage_count' => (new Gazelle\Stats\Collage)->collageTotal(),
+    'blog'          => new Gazelle\Manager\Blog(),
+    'collage_count' => (new Gazelle\Stats\Collage())->collageTotal(),
     'contest_rank'  => $contestRank,
     'leaderboard'   => $leaderboard,
     'aotm'          => $featured->findByType(FeaturedAlbumType::AlbumOfTheMonth),
     'showcase'      => $featured->findByType(FeaturedAlbumType::Showcase),
-    'staff_blog'    => new Gazelle\Manager\StaffBlog,
-    'poll'          => (new Gazelle\Manager\ForumPoll)->findByFeaturedPoll(),
-    'request_stats' => new Gazelle\Stats\Request,
-    'torrent_stats' => new Gazelle\Stats\Torrent,
-    'user_stats'    => new Gazelle\Stats\Users,
+    'staff_blog'    => new Gazelle\Manager\StaffBlog(),
+    'poll'          => (new Gazelle\Manager\ForumPoll())->findByFeaturedPoll(),
+    'request_stats' => new Gazelle\Stats\Request(),
+    'torrent_stats' => new Gazelle\Stats\Torrent(),
+    'user_stats'    => new Gazelle\Stats\Users(),
     'viewer'        => $Viewer,
 ]);
 
diff --git a/sections/index/public.php b/sections/index/public.php
index 8c5db085f..d3a60fad9 100644
--- a/sections/index/public.php
+++ b/sections/index/public.php
@@ -4,5 +4,5 @@
     exit;
 }
 echo $Twig->render('index/public.twig', [
-    'new' => (new Gazelle\Stats\Users)->enabledUserTotal() == 0,
+    'new' => (new Gazelle\Stats\Users())->enabledUserTotal() == 0,
 ]);
diff --git a/sections/log/index.php b/sections/log/index.php
index a41e38e4d..3ad33d54e 100644
--- a/sections/log/index.php
+++ b/sections/log/index.php
@@ -1,6 +1,6 @@
 <?php
 
-$siteLog   = new Gazelle\Manager\SiteLog(new Gazelle\Manager\User);
+$siteLog   = new Gazelle\Manager\SiteLog(new Gazelle\Manager\User());
 $paginator = new Gazelle\Util\Paginator(LOG_ENTRIES_PER_PAGE, (int)($_GET['page'] ?? 1));
 $search    = $_GET['search'] ?? '';
 
diff --git a/sections/logchecker/update.php b/sections/logchecker/update.php
index dd0e067b3..6a1d0e32a 100644
--- a/sections/logchecker/update.php
+++ b/sections/logchecker/update.php
@@ -2,5 +2,5 @@
 
 echo $Twig->render('logchecker/update.twig', [
     'accepted' => OrpheusNET\Logchecker\Logchecker::getAcceptValues(),
-    'list'     => (new Gazelle\Manager\Torrent)->logFileList($Viewer->id()),
+    'list'     => (new Gazelle\Manager\Torrent())->logFileList($Viewer->id()),
 ]);
diff --git a/sections/logchecker/upload.php b/sections/logchecker/upload.php
index 513a24855..0ebc6375b 100644
--- a/sections/logchecker/upload.php
+++ b/sections/logchecker/upload.php
@@ -4,5 +4,5 @@
 
 echo $Twig->render('logchecker/upload.twig', [
     'accepted' => Logchecker::getAcceptValues(),
-    'list'     => (new Gazelle\Manager\Torrent)->setViewer($Viewer)->missingLogfiles($Viewer->id()),
+    'list'     => (new Gazelle\Manager\Torrent())->setViewer($Viewer)->missingLogfiles($Viewer->id()),
 ]);
diff --git a/sections/logchecker/upload_handle.php b/sections/logchecker/upload_handle.php
index 4ac70aedd..74fa65f68 100644
--- a/sections/logchecker/upload_handle.php
+++ b/sections/logchecker/upload_handle.php
@@ -4,7 +4,7 @@
 
 ini_set('upload_max_filesize', 1_000_000);
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_POST['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_POST['torrentid']);
 if (is_null($torrent)) {
     error('No torrent is selected.');
 }
@@ -21,8 +21,8 @@
 if (!$logfileSummary->total()) {
     error("No logfiles uploaded.");
 } else {
-    $ripFiler = new Gazelle\File\RipLog;
-    $htmlFiler = new Gazelle\File\RipLogHTML;
+    $ripFiler = new Gazelle\File\RipLog();
+    $htmlFiler = new Gazelle\File\RipLogHTML();
 
     $torrent->removeLogDb();
     $ripFiler->remove([$torrent->id(), null]);
diff --git a/sections/login/disabled.php b/sections/login/disabled.php
index e229de6e2..10f381dd2 100644
--- a/sections/login/disabled.php
+++ b/sections/login/disabled.php
@@ -2,9 +2,9 @@
 
 $enabler = null;
 if (isset($_POST['username'])) {
-    $user = (new Gazelle\Manager\User)->findByUsername(trim($_POST['username']));
+    $user = (new Gazelle\Manager\User())->findByUsername(trim($_POST['username']));
     if ($user) {
-        $enabler = (new Gazelle\Manager\AutoEnable)->create($user, $_POST['email']);
+        $enabler = (new Gazelle\Manager\AutoEnable())->create($user, $_POST['email']);
         if ($enabler) {
             setcookie('username', '', [
                 'expires'  => time() + 60 * 60,
diff --git a/sections/login/login.php b/sections/login/login.php
index 9148ee135..e99a93ad2 100644
--- a/sections/login/login.php
+++ b/sections/login/login.php
@@ -6,7 +6,7 @@
 }
 
 $watch = new Gazelle\LoginWatch($_SERVER['REMOTE_ADDR']);
-$login = new Gazelle\Login;
+$login = new Gazelle\Login();
 
 if (isset($_POST['username'])) {
     $user = $login->login(
@@ -67,6 +67,6 @@
     'delta'    => $watch->bannedEpoch() - time(),
     'error'    => $login->error(),
     'ip_addr'  => $_SERVER['REMOTE_ADDR'],
-    'tor_node' => (new Gazelle\Manager\Tor)->isExitNode($_SERVER['REMOTE_ADDR']),
+    'tor_node' => (new Gazelle\Manager\Tor())->isExitNode($_SERVER['REMOTE_ADDR']),
     'watch'    => $watch,
 ]);
diff --git a/sections/login/recover_step1.php b/sections/login/recover_step1.php
index c7cbb04ec..5baa6e6cd 100644
--- a/sections/login/recover_step1.php
+++ b/sections/login/recover_step1.php
@@ -2,7 +2,7 @@
 
 use Gazelle\Enum\UserTokenType;
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setField('email', true, 'email', 'You entered an invalid email address.');
 
 $error = false;
@@ -12,9 +12,9 @@
 } elseif (!empty($_REQUEST['email'])) {
     $error = $validator->validate($_REQUEST) ? false : $validator->errorMessage();
     if (!$error) {
-        $user = (new Gazelle\Manager\User)->findByEmail(trim($_REQUEST['email']));
+        $user = (new Gazelle\Manager\User())->findByEmail(trim($_REQUEST['email']));
         if ($user) {
-            (new Gazelle\Manager\UserToken)->createPasswordResetToken($user);
+            (new Gazelle\Manager\UserToken())->createPasswordResetToken($user);
             $user->logoutEverywhere();
             $sent = true;
         }
diff --git a/sections/login/recover_step2.php b/sections/login/recover_step2.php
index 5e7e96078..81ccfbaf2 100644
--- a/sections/login/recover_step2.php
+++ b/sections/login/recover_step2.php
@@ -2,13 +2,13 @@
 
 use Gazelle\Enum\UserTokenType;
 
-$userToken = (new Gazelle\Manager\UserToken)->findByToken($_GET['key']);
+$userToken = (new Gazelle\Manager\UserToken())->findByToken($_GET['key']);
 if ($userToken?->type() != UserTokenType::password) {
     header('Location: login.php?action=recover');
     exit;
 }
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setFields([
     ['verifypassword', true, 'compare', 'Your passwords did not match.', ['comparefield' => 'password']],
     ['password', true, 'regex',
diff --git a/sections/random/index.php b/sections/random/index.php
index 7bb913f3a..909df7ab9 100644
--- a/sections/random/index.php
+++ b/sections/random/index.php
@@ -1,9 +1,9 @@
 <?php
 
 $object = match ($_REQUEST['action'] ?? '') {
-    'artist'  => (new Gazelle\Manager\Artist)->findRandom(),
-    'collage' => (new Gazelle\Manager\Collage)->findRandom(),
-    default   => (new Gazelle\Manager\TGroup)->findRandom(),
+    'artist'  => (new Gazelle\Manager\Artist())->findRandom(),
+    'collage' => (new Gazelle\Manager\Collage())->findRandom(),
+    default   => (new Gazelle\Manager\TGroup())->findRandom(),
 };
 if (is_null($object)) {
     error(404); /* only likely to happen on a brand new installation */
diff --git a/sections/recovery/admin.php b/sections/recovery/admin.php
index 8e4336f12..51d65d5e6 100644
--- a/sections/recovery/admin.php
+++ b/sections/recovery/admin.php
@@ -3,7 +3,7 @@
     error(403);
 }
 
-$recovery = new Gazelle\Manager\Recovery;
+$recovery = new Gazelle\Manager\Recovery();
 if (isset($_GET['task'])) {
     $id = (int)($_GET['id'] ?? 0);
     if ($id) {
diff --git a/sections/recovery/browse.php b/sections/recovery/browse.php
index fb53b145a..63944e4c7 100644
--- a/sections/recovery/browse.php
+++ b/sections/recovery/browse.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('admin_recovery')) {
     error(403);
 }
-$recovery = new Gazelle\Manager\Recovery;
+$recovery = new Gazelle\Manager\Recovery();
 
 if (isset($_POST['username']) && strlen($_POST['username'])) {
     $class = 'username';
diff --git a/sections/recovery/pair.php b/sections/recovery/pair.php
index 28ba08c27..3b9d0b5cb 100644
--- a/sections/recovery/pair.php
+++ b/sections/recovery/pair.php
@@ -9,11 +9,11 @@
 $result   = false;
 $confirm  = false;
 $messsage = false;
-$recovery = new Gazelle\Manager\Recovery;
+$recovery = new Gazelle\Manager\Recovery();
 
 if (isset($_POST['curr']) && isset($_POST['prev'])) {
     authorize();
-    $userMan  = new Gazelle\Manager\User;
+    $userMan  = new Gazelle\Manager\User();
     $currId = (int)trim($_POST['curr']);
     $curr = $userMan->findById($currId);
     if (is_null($curr)) {
diff --git a/sections/recovery/view.php b/sections/recovery/view.php
index 8736fb69e..bc49d176b 100644
--- a/sections/recovery/view.php
+++ b/sections/recovery/view.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('admin_recovery')) {
     error(403);
 }
-$recovery = new Gazelle\Manager\Recovery;
+$recovery = new Gazelle\Manager\Recovery();
 
 if (isset($_GET['id']) && (int)$_GET['id'] > 0) {
     $id = (int)$_GET['id'];
diff --git a/sections/referral/index.php b/sections/referral/index.php
index 6c5ec6421..fbbc47fdf 100644
--- a/sections/referral/index.php
+++ b/sections/referral/index.php
@@ -14,7 +14,7 @@
 
 <?php
 // redirect if referrals are currently closed, or no partner sites
-$ReferralManager = new Gazelle\Manager\Referral;
+$ReferralManager = new Gazelle\Manager\Referral();
 $Accounts = $ReferralManager->getActiveAccounts();
 
 if (!OPEN_EXTERNAL_REFERRALS || !count($Accounts) || $ReferralManager->readOnly) {
diff --git a/sections/register/index.php b/sections/register/index.php
index f35af30fc..a64e50f65 100644
--- a/sections/register/index.php
+++ b/sections/register/index.php
@@ -5,7 +5,7 @@
 
 if (isset($_REQUEST['confirm'])) {
     // Confirm registration
-    $token = (new Gazelle\Manager\UserToken)->findByToken($_REQUEST['confirm']);
+    $token = (new Gazelle\Manager\UserToken())->findByToken($_REQUEST['confirm']);
     if (!$token || $token->type() != UserTokenType::confirm || !$token->consume()) {
         // we have no token, or not of the right type, or not consumable (expired)
         echo $Twig->render('register/expired.twig');
@@ -18,17 +18,17 @@
         $Twig->render('register/welcome.bbcode.twig', ['user' => $user])
     );
     echo $Twig->render('register/complete.twig');
-    (new Gazelle\Tracker)->addUser($user);
+    (new Gazelle\Tracker())->addUser($user);
 
-} elseif (OPEN_REGISTRATION || isset($_REQUEST['invite']) || (new Gazelle\Stats\Users)->enabledUserTotal() == 0) {
+} elseif (OPEN_REGISTRATION || isset($_REQUEST['invite']) || (new Gazelle\Stats\Users())->enabledUserTotal() == 0) {
     if ($_REQUEST['invite']) {
-        if (!(new Gazelle\Manager\Invite)->inviteExists($_GET['invite'])) {
+        if (!(new Gazelle\Manager\Invite())->inviteExists($_GET['invite'])) {
             echo $Twig->render('register/no-invite.twig');
             exit;
         }
     }
 
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['username', true, 'regex', 'You did not enter a valid username.', ['regex' => USERNAME_REGEXP]],
         ['email', true, 'email', 'You did not enter a valid email address.'],
@@ -45,7 +45,7 @@
             $username = trim($_POST['username']);
             $email    = trim($_POST['email']);
 
-            $creator = new Gazelle\UserCreator;
+            $creator = new Gazelle\UserCreator();
             $creator->setUsername($username)
                 ->setEmail($email)
                 ->setPassword($_POST['password'])
@@ -56,11 +56,11 @@
 
             try {
                 $user = $creator->create();
-                (new Gazelle\Util\Mail)->send($user->email(), 'New account confirmation at ' . SITE_NAME,
+                (new Gazelle\Util\Mail())->send($user->email(), 'New account confirmation at ' . SITE_NAME,
                     $Twig->render('email/registration.twig', [
                         'ipaddr' => $_SERVER['REMOTE_ADDR'],
                         'user'   => $user,
-                        'token'  => (new \Gazelle\Manager\UserToken)->create(UserTokenType::confirm, $user),
+                        'token'  => (new \Gazelle\Manager\UserToken())->create(UserTokenType::confirm, $user),
                     ])
                 );
                 $emailSent = true;
diff --git a/sections/reports/ajax_add_notes.php b/sections/reports/ajax_add_notes.php
index 5a10b0a94..c9782948c 100644
--- a/sections/reports/ajax_add_notes.php
+++ b/sections/reports/ajax_add_notes.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('site_moderate_forums')) {
     json_error('forbidden');
 }
-$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User))->findById((int)($_POST['id'] ?? 0));
+$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->findById((int)($_POST['id'] ?? 0));
 if (is_null($report)) {
     json_error('bad post id');
 }
diff --git a/sections/reports/ajax_claim_report.php b/sections/reports/ajax_claim_report.php
index f5f31183a..fbc90ea45 100644
--- a/sections/reports/ajax_claim_report.php
+++ b/sections/reports/ajax_claim_report.php
@@ -4,7 +4,7 @@
     json_error('bad parameters');
 }
 
-$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User))->findById((int)($_POST['id'] ?? 0));
+$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->findById((int)($_POST['id'] ?? 0));
 if (is_null($report)) {
     json_error('no report id');
 }
diff --git a/sections/reports/ajax_resolve_report.php b/sections/reports/ajax_resolve_report.php
index 65e87e767..e3fcc9764 100644
--- a/sections/reports/ajax_resolve_report.php
+++ b/sections/reports/ajax_resolve_report.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$manager = new Gazelle\Manager\Report(new Gazelle\Manager\User);
+$manager = new Gazelle\Manager\Report(new Gazelle\Manager\User());
 $report  = $manager->findById((int)($_POST['reportid'] ?? 0));
 if (is_null($report)) {
     json_error('no report id');
diff --git a/sections/reports/ajax_unclaim_report.php b/sections/reports/ajax_unclaim_report.php
index aa191f2a3..0f964e384 100644
--- a/sections/reports/ajax_unclaim_report.php
+++ b/sections/reports/ajax_unclaim_report.php
@@ -4,7 +4,7 @@
     json_error('bad parameters');
 }
 
-$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User))->findById((int)($_POST['id'] ?? 0));
+$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->findById((int)($_POST['id'] ?? 0));
 if (is_null($report)) {
     json_error('no report id');
 }
diff --git a/sections/reports/compose.php b/sections/reports/compose.php
index da03d79bb..99f59fb30 100644
--- a/sections/reports/compose.php
+++ b/sections/reports/compose.php
@@ -17,7 +17,7 @@
 
 $user = null;
 if (!isset($Return)) {
-    $user = (new Gazelle\Manager\User)->findById((int)($_GET['toid'] ?? 0));
+    $user = (new Gazelle\Manager\User())->findById((int)($_GET['toid'] ?? 0));
     if (is_null($user)) {
         error(404);
     }
@@ -28,7 +28,7 @@
 
 switch ($type) {
     case 'user':
-        $reported = (new Gazelle\Manager\User)->findById($id);
+        $reported = (new Gazelle\Manager\User())->findById($id);
         if (is_null($reported)) {
             error(404);
         }
@@ -37,7 +37,7 @@
 
     case 'request':
     case 'request_update':
-        $request = (new Gazelle\Manager\Request)->findById($id);
+        $request = (new Gazelle\Manager\Request())->findById($id);
         if (is_null($request)) {
             error(404);
         }
@@ -45,7 +45,7 @@
         break;
 
     case 'collage':
-        $collage = (new Gazelle\Manager\Collage)->findById($id);
+        $collage = (new Gazelle\Manager\Collage())->findById($id);
         if (is_null($collage)) {
             error(404);
         }
@@ -53,7 +53,7 @@
         break;
 
     case 'thread':
-        $thread = (new Gazelle\Manager\ForumThread)->findById($id);
+        $thread = (new Gazelle\Manager\ForumThread())->findById($id);
         if (is_null($thread)) {
             error(404);
         }
@@ -64,7 +64,7 @@
         break;
 
     case 'post':
-        $post = (new Gazelle\Manager\ForumPost)->findById($id);
+        $post = (new Gazelle\Manager\ForumPost())->findById($id);
         if (is_null($post)) {
             error(404);
         }
@@ -75,7 +75,7 @@
         break;
 
     case 'comment':
-        $comment = (new Gazelle\Manager\Comment)->findById($id);
+        $comment = (new Gazelle\Manager\Comment())->findById($id);
         if (is_null($comment)) {
             error(404);
         }
diff --git a/sections/reports/compose_handle.php b/sections/reports/compose_handle.php
index 3bf9e9150..ae4056688 100644
--- a/sections/reports/compose_handle.php
+++ b/sections/reports/compose_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $recipient = $userMan->findById((int)($_POST['toid'] ?? 0));
 if (is_null($recipient)) {
     error("No such recipient!");
diff --git a/sections/reports/report.php b/sections/reports/report.php
index df0151a62..43cb74e41 100644
--- a/sections/reports/report.php
+++ b/sections/reports/report.php
@@ -14,7 +14,7 @@
 
 switch ($type) {
     case 'user':
-        $user = (new Gazelle\Manager\User)->findById($id);
+        $user = (new Gazelle\Manager\User())->findById($id);
         if (is_null($user)) {
             error(404);
         }
@@ -22,7 +22,7 @@
         break;
 
     case 'request':
-        $request = (new Gazelle\Manager\Request)->findById($id);
+        $request = (new Gazelle\Manager\Request())->findById($id);
         if (is_null($request)) {
             error(404);
         }
@@ -30,7 +30,7 @@
         break;
 
     case 'request_update':
-        $request = (new Gazelle\Manager\Request)->findById($id);
+        $request = (new Gazelle\Manager\Request())->findById($id);
         if (is_null($request)) {
             error(404);
         }
@@ -41,7 +41,7 @@
         break;
 
     case 'collage':
-        $collage = (new Gazelle\Manager\Collage)->findById($id);
+        $collage = (new Gazelle\Manager\Collage())->findById($id);
         if (is_null($collage)) {
             error(404);
         }
@@ -49,7 +49,7 @@
         break;
 
     case 'thread':
-        $thread = (new Gazelle\Manager\ForumThread)->findById($id);
+        $thread = (new Gazelle\Manager\ForumThread())->findById($id);
         if (is_null($thread)) {
             error(404);
         }
@@ -60,7 +60,7 @@
         break;
 
     case 'post':
-        $post = (new Gazelle\Manager\ForumPost)->findById($id);
+        $post = (new Gazelle\Manager\ForumPost())->findById($id);
         if (is_null($post)) {
             error(404);
         }
@@ -71,7 +71,7 @@
         break;
 
     case 'comment':
-        $comment = (new Gazelle\Manager\Comment)->findById($id);
+        $comment = (new Gazelle\Manager\Comment())->findById($id);
         if (is_null($comment)) {
             error(404);
         }
@@ -83,7 +83,7 @@
 
 echo $Twig->render('report/create.twig', [
     'id'          => $id,
-    'release'     => (new Gazelle\ReleaseType)->list(),
+    'release'     => (new Gazelle\ReleaseType())->list(),
     'report'      => $report,
     'report_type' => $reportType,
     'type'        => $type,
diff --git a/sections/reports/report_handle.php b/sections/reports/report_handle.php
index a4cafa141..fee3c4ea9 100644
--- a/sections/reports/report_handle.php
+++ b/sections/reports/report_handle.php
@@ -26,14 +26,14 @@
     $reason = "[b]Year[/b]: {$year}.\n\n";
     // If the release type is somehow invalid, return "Not given"; otherwise, return the release type.
     $reason .= '[b]Release type[/b]: ' . ((empty($_POST['releasetype']) || !is_number($_POST['releasetype']) || $_POST['releasetype'] == '0')
-        ? 'Not given' : (new Gazelle\ReleaseType)->findNameById($_POST['releasetype'])) . " . \n\n";
+        ? 'Not given' : (new Gazelle\ReleaseType())->findNameById($_POST['releasetype'])) . " . \n\n";
     $reason .= '[b]Additional comments[/b]: ' . $_POST['comment'];
 }
 
 $location = match ($subjectType) {
     'collage'        => "collages.php?id=$subjectId",
     'comment'        => "comments.php?action=jump&postid=$subjectId",
-    'post'           => (new Gazelle\Manager\ForumPost)->findById($subjectId)?->location(), // could be null
+    'post'           => (new Gazelle\Manager\ForumPost())->findById($subjectId)?->location(), // could be null
     'request',
     'request_update' => "requests.php?action=view&id=$subjectId",
     'thread'         => "forums.php?action=viewthread&threadid=$subjectId",
@@ -44,7 +44,7 @@
     error("Cannot generate a link to the reported item");
 }
 
-$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User))->create($Viewer, $subjectId, $subjectType, $reason);
+$report = (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->create($Viewer, $subjectId, $subjectType, $reason);
 if (in_array($report->subjectType(), ['user', 'comment'])) {
     Irc::sendMessage(
         IRC_CHAN_MOD,
diff --git a/sections/reports/reports.php b/sections/reports/reports.php
index 3e19dd1a5..797d829d6 100644
--- a/sections/reports/reports.php
+++ b/sections/reports/reports.php
@@ -8,7 +8,7 @@
 
 require_once('array.php');
 
-$search    = new Gazelle\Search\Report;
+$search    = new Gazelle\Search\Report();
 $paginator = new Gazelle\Util\Paginator(REPORTS_PER_PAGE, (int)($_REQUEST['page'] ?? 1));
 $typeList  = ['collage', 'comment', 'post', 'request', 'thread', 'user'];
 
@@ -57,13 +57,13 @@
 $paginator->setTotal($search->total());
 
 echo $Twig->render('report/index.twig', [
-    'list' => (new Gazelle\Manager\Report(new Gazelle\Manager\User))->decorate(
+    'list' => (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->decorate(
         $search->page($paginator->limit(), $paginator->offset()),
-        new Gazelle\Manager\Collage,
-        new Gazelle\Manager\Comment,
-        new Gazelle\Manager\ForumThread,
-        new Gazelle\Manager\ForumPost,
-        new Gazelle\Manager\Request,
+        new Gazelle\Manager\Collage(),
+        new Gazelle\Manager\Comment(),
+        new Gazelle\Manager\ForumThread(),
+        new Gazelle\Manager\ForumPost(),
+        new Gazelle\Manager\Request(),
     ),
     'paginator' => $paginator,
     'type'      => $Types,
diff --git a/sections/reports/resolve_handle.php b/sections/reports/resolve_handle.php
index 3407252aa..81e14b499 100644
--- a/sections/reports/resolve_handle.php
+++ b/sections/reports/resolve_handle.php
@@ -5,7 +5,7 @@
 }
 authorize();
 
-$manager = new Gazelle\Manager\Report(new Gazelle\Manager\User);
+$manager = new Gazelle\Manager\Report(new Gazelle\Manager\User());
 $report  = $manager->findById((int)($_POST['id'] ?? 0));
 if (is_null($report)) {
     json_error('no report id');
diff --git a/sections/reports/stats.php b/sections/reports/stats.php
index c236d2832..081dbfae4 100644
--- a/sections/reports/stats.php
+++ b/sections/reports/stats.php
@@ -5,6 +5,6 @@
 }
 
 echo $Twig->render('report/stats.twig', [
-    'stats'  => new Gazelle\Stats\Report,
+    'stats'  => new Gazelle\Stats\Report(),
     'viewer' => $Viewer,
 ]);
diff --git a/sections/reportsv2/ajax_change_resolve.php b/sections/reportsv2/ajax_change_resolve.php
index 3774180ee..183687628 100644
--- a/sections/reportsv2/ajax_change_resolve.php
+++ b/sections/reportsv2/ajax_change_resolve.php
@@ -8,7 +8,7 @@
     json_error("forbidden");
 }
 
-$reportType = (new Gazelle\Manager\Torrent\ReportType)->findByType($_GET['type'] ?? '');
+$reportType = (new Gazelle\Manager\Torrent\ReportType())->findByType($_GET['type'] ?? '');
 if (is_null($reportType)) {
     json_error("bad type");
 }
diff --git a/sections/reportsv2/ajax_claim.php b/sections/reportsv2/ajax_claim.php
index 4f2032cdb..2288d2183 100644
--- a/sections/reportsv2/ajax_claim.php
+++ b/sections/reportsv2/ajax_claim.php
@@ -4,6 +4,6 @@
     error(403);
 }
 
-echo (new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent))
+echo (new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent()))
     ->findById((int)($_GET['id'] ?? 0))
     ?->claim($Viewer) ?? 0;
diff --git a/sections/reportsv2/ajax_new_report.php b/sections/reportsv2/ajax_new_report.php
index b39a7de02..57e520dd2 100644
--- a/sections/reportsv2/ajax_new_report.php
+++ b/sections/reportsv2/ajax_new_report.php
@@ -10,11 +10,11 @@
 }
 
 $imgProxy      = new Gazelle\Util\ImageProxy($Viewer);
-$torMan        = new Gazelle\Manager\Torrent;
+$torMan        = new Gazelle\Manager\Torrent();
 $reportMan     = new Gazelle\Manager\Torrent\Report($torMan);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
-$reqMan        = new Gazelle\Manager\Request;
-$userMan       = new Gazelle\Manager\User;
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
+$reqMan        = new Gazelle\Manager\Request();
+$userMan       = new Gazelle\Manager\User();
 
 $report    = $reportMan->findNewest();
 $reportId  = $report->id();
diff --git a/sections/reportsv2/ajax_report.php b/sections/reportsv2/ajax_report.php
index 9a38e03d6..5339c3532 100644
--- a/sections/reportsv2/ajax_report.php
+++ b/sections/reportsv2/ajax_report.php
@@ -7,7 +7,7 @@
 
 authorize();
 
-$reportType = (new Gazelle\Manager\Torrent\ReportType)->findByType($_POST['type'] ?? '');
+$reportType = (new Gazelle\Manager\Torrent\ReportType())->findByType($_POST['type'] ?? '');
 if (is_null($reportType)) {
     json_error("bad parameters");
 }
diff --git a/sections/reportsv2/ajax_switch.php b/sections/reportsv2/ajax_switch.php
index 66e4e744b..efbbcbe15 100644
--- a/sections/reportsv2/ajax_switch.php
+++ b/sections/reportsv2/ajax_switch.php
@@ -14,7 +14,7 @@
 }
 
 authorize();
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $other = $torMan->findById((int)$_POST['otherid']);
 if (is_null($other)) {
     json_error("bad other id");
@@ -36,7 +36,7 @@
     reason:      $report->reason(),
     image:       implode(' ', $report->image()),
     otherIdList: (string)$report->torrentId(),
-    irc:         new Gazelle\Util\Irc,
+    irc:         new Gazelle\Util\Irc(),
 );
 
 if ($other->uploaderId() != $Viewer->id()) {
diff --git a/sections/reportsv2/ajax_take_pm.php b/sections/reportsv2/ajax_take_pm.php
index 0b0e32628..e2cd574de 100644
--- a/sections/reportsv2/ajax_take_pm.php
+++ b/sections/reportsv2/ajax_take_pm.php
@@ -9,7 +9,7 @@
     die();
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     json_error("bad parameters");
 }
@@ -27,7 +27,7 @@
     json_error("bad parameters from_delete");
 }
 
-$reportType = (new Gazelle\Manager\Torrent\ReportType)->findByType($_POST['resolve_type'] ?? '');
+$reportType = (new Gazelle\Manager\Torrent\ReportType())->findByType($_POST['resolve_type'] ?? '');
 
 switch ($_POST['pm_type']) {
     case 'Uploader':
@@ -48,7 +48,7 @@
         json_error("no recipient target");
 }
 
-$recipient = (new Gazelle\Manager\User)->findById($ToID);
+$recipient = (new Gazelle\Manager\User())->findById($ToID);
 if (is_null($recipient)) {
     json_error("bad recipient id");
 } elseif ($ToID == $Viewer->id()) {
diff --git a/sections/reportsv2/ajax_unclaim.php b/sections/reportsv2/ajax_unclaim.php
index f85377c99..bbac77821 100644
--- a/sections/reportsv2/ajax_unclaim.php
+++ b/sections/reportsv2/ajax_unclaim.php
@@ -4,6 +4,6 @@
     error(403);
 }
 
-(new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent))
+(new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent()))
     ->findById((int)($_GET['id'] ?? 0))
     ?->unclaim();
diff --git a/sections/reportsv2/ajax_update_comment.php b/sections/reportsv2/ajax_update_comment.php
index 79458646d..79c7239bd 100644
--- a/sections/reportsv2/ajax_update_comment.php
+++ b/sections/reportsv2/ajax_update_comment.php
@@ -6,6 +6,6 @@
 
 authorize();
 
-(new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent))
+(new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent()))
     ->findById((int)($_POST['reportid'] ?? 0))
     ?->modifyComment($_POST['comment'] ?? '');
diff --git a/sections/reportsv2/ajax_update_resolve.php b/sections/reportsv2/ajax_update_resolve.php
index 11fdd3bee..c4ea0b18a 100644
--- a/sections/reportsv2/ajax_update_resolve.php
+++ b/sections/reportsv2/ajax_update_resolve.php
@@ -7,12 +7,12 @@
 
 authorize();
 
-$reportType = (new Gazelle\Manager\Torrent\ReportType)->findByType($_GET['newresolve'] ?? '');
+$reportType = (new Gazelle\Manager\Torrent\ReportType())->findByType($_GET['newresolve'] ?? '');
 if (is_null($reportType)) {
     json_error("bad newresolve");
 }
 
-$report = (new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent))->findById((int)($_GET['reportid'] ?? 0));
+$report = (new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent()))->findById((int)($_GET['reportid'] ?? 0));
 if (is_null($report)) {
     json_error("bad reportid");
 }
diff --git a/sections/reportsv2/report.php b/sections/reportsv2/report.php
index 8efcb9ffe..0b20f569b 100644
--- a/sections/reportsv2/report.php
+++ b/sections/reportsv2/report.php
@@ -4,7 +4,7 @@
  * they visit reportsv2.php?id=xxx
  */
 
-$torMan = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$torMan = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $torrentId = (int)($_GET['id'] ?? 0);
 $torrent   = $torMan->findById($torrentId);
 if (is_null($torrent)) {
@@ -20,12 +20,12 @@
 $FirstUnknown  = $torrent->isRemasteredUnknown();
 $EditionID     = 0;
 
-$reportMan      = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent);
-$reportTypeMan  = new Gazelle\Manager\Torrent\ReportType;
+$reportMan      = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent());
+$reportTypeMan  = new Gazelle\Manager\Torrent\ReportType();
 $reportTypeList = $reportTypeMan->categoryList($CategoryID);
 $snatcher       = $Viewer->snatch();
 $urlStem        = (new Gazelle\User\Stylesheet($Viewer))->imagePath();
-$userMan        = new Gazelle\Manager\User;
+$userMan        = new Gazelle\Manager\User();
 $reportList     = array_map(fn ($id) => $reportMan->findById($id), $torrent->reportIdList($Viewer));
 
 View::show_header('Report', ['js' => 'reportsv2,browse,torrent,bbcode']);
diff --git a/sections/reportsv2/report_handle.php b/sections/reportsv2/report_handle.php
index 82726bae5..4760ef50a 100644
--- a/sections/reportsv2/report_handle.php
+++ b/sections/reportsv2/report_handle.php
@@ -12,7 +12,7 @@
 
 authorize();
 
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $torrent = $torMan->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
@@ -23,7 +23,7 @@
     error("Slow down, you're moving too fast!");
 }
 
-$reportType = (new Gazelle\Manager\Torrent\ReportType)->findByType($_POST['type'] ?? '');
+$reportType = (new Gazelle\Manager\Torrent\ReportType())->findByType($_POST['type'] ?? '');
 if (is_null($reportType)) {
     error("bad report type");
 }
@@ -110,7 +110,7 @@
     track:       $trackList,
     image:       $Images,
     link:        $Links,
-    irc:         new Gazelle\Util\Irc,
+    irc:         new Gazelle\Util\Irc(),
 );
 
 if (!$reportType->isInvisible() && $torrent->uploaderId() != $Viewer->id()) {
diff --git a/sections/reportsv2/resolve_handle.php b/sections/reportsv2/resolve_handle.php
index f45e234f2..e537c41eb 100644
--- a/sections/reportsv2/resolve_handle.php
+++ b/sections/reportsv2/resolve_handle.php
@@ -16,14 +16,14 @@
 authorize();
 
 $fromReportPage = !isset($_POST['from_delete']);
-$reportTypeMan  = new Gazelle\Manager\Torrent\ReportType;
-$reportMan      = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent);
-$userMan        = new Gazelle\Manager\User;
+$reportTypeMan  = new Gazelle\Manager\Torrent\ReportType();
+$reportMan      = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent());
+$userMan        = new Gazelle\Manager\User();
 
 $report = $reportMan->findById((int)($_POST['reportid'] ?? 0));
 if (is_null($report)) {
     // torrent is being deleted using RM link
-    $torMan = new Gazelle\Manager\Torrent;
+    $torMan = new Gazelle\Manager\Torrent();
     $torrent = $torMan->findById((int)($_POST['torrentid'] ?? 0));
     if (is_null($torrent)) {
         json_die("failure", "torrent not found");
@@ -36,7 +36,7 @@
         torrent:     $torrent,
         user:        $Viewer,
         reportType:  $reportType,
-        irc:         new Gazelle\Util\Irc,
+        irc:         new Gazelle\Util\Irc(),
         reason:      '',
         otherIdList: '',
     );
diff --git a/sections/reportsv2/search.php b/sections/reportsv2/search.php
index b5aad5d91..665f9639e 100644
--- a/sections/reportsv2/search.php
+++ b/sections/reportsv2/search.php
@@ -4,9 +4,9 @@
     error(403);
 }
 
-$userMan       = new Gazelle\Manager\User;
-$reportMan     = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
+$userMan       = new Gazelle\Manager\User();
+$reportMan     = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent());
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
 $categories    = $reportMan->categories();
 
 $filter = [];
diff --git a/sections/reportsv2/static.php b/sections/reportsv2/static.php
index e967b4702..128a099fd 100644
--- a/sections/reportsv2/static.php
+++ b/sections/reportsv2/static.php
@@ -13,15 +13,15 @@
     error(403);
 }
 
-$torMan        = new Gazelle\Manager\Torrent;
+$torMan        = new Gazelle\Manager\Torrent();
 $reportMan     = new Gazelle\Manager\Torrent\Report($torMan);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
-$requestMan    = new Gazelle\Manager\Request;
-$userMan       = new Gazelle\Manager\User;
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
+$requestMan    = new Gazelle\Manager\Request();
+$userMan       = new Gazelle\Manager\User();
 $search        = new Gazelle\Search\Torrent\Report($_GET['view'] ?? '', $_GET['id'] ?? '', $reportTypeMan, $userMan);
 $imgProxy      = new Gazelle\Util\ImageProxy($Viewer);
-$ripFiler      = new Gazelle\File\RipLog;
-$htmlFiler     = new Gazelle\File\RipLogHTML;
+$ripFiler      = new Gazelle\File\RipLog();
+$htmlFiler     = new Gazelle\File\RipLogHTML();
 
 $paginator = new Gazelle\Util\Paginator(REPORTS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($search->total());
diff --git a/sections/reportsv2/views.php b/sections/reportsv2/views.php
index 23497a4f9..e5829e810 100644
--- a/sections/reportsv2/views.php
+++ b/sections/reportsv2/views.php
@@ -9,9 +9,9 @@
     error(403);
 }
 
-$reportMan     = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
-$userMan       = new Gazelle\Manager\User;
+$reportMan     = new Gazelle\Manager\Torrent\Report(new Gazelle\Manager\Torrent());
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
+$userMan       = new Gazelle\Manager\User();
 
 echo $Twig->render('reportsv2/summary.twig', [
     'in_progress' => $reportMan->inProgressSummary($userMan),
diff --git a/sections/requests/bounty_handle.php b/sections/requests/bounty_handle.php
index e8477c8f2..2e120f4a3 100644
--- a/sections/requests/bounty_handle.php
+++ b/sections/requests/bounty_handle.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_POST['id']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_POST['id']);
 if (is_null($request)) {
     error(404);
 }
@@ -45,7 +45,7 @@
  *    $check:
  *      4 => true
  */
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $refund = [];
 $remove = [];
 foreach ($action as $userId => $operation) {
diff --git a/sections/requests/delete_handle.php b/sections/requests/delete_handle.php
index 8c812507d..e1e8f7938 100644
--- a/sections/requests/delete_handle.php
+++ b/sections/requests/delete_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_POST['id']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_POST['id']);
 if (is_null($request)) {
     error(404);
 }
@@ -13,7 +13,7 @@
 $reason = trim($_POST['reason']);
 $title = $request->text();
 if ($request->userId() !== $Viewer->id()) {
-    $user = (new Gazelle\Manager\User)->findById($request->userId());
+    $user = (new Gazelle\Manager\User())->findById($request->userId());
     if ($user) {
         $user->inbox()->createSystem(
             'A request you created has been deleted',
@@ -25,7 +25,7 @@
 $requestId = $request->id();
 $request->remove();
 
-(new Gazelle\Log)->general("Request $requestId ($title) was deleted by user "
+(new Gazelle\Log())->general("Request $requestId ($title) was deleted by user "
     . $Viewer->label() . " for the reason: $reason"
 );
 
diff --git a/sections/requests/edit.php b/sections/requests/edit.php
index e760603f2..af460a156 100644
--- a/sections/requests/edit.php
+++ b/sections/requests/edit.php
@@ -1,6 +1,6 @@
 <?php
 
-$request = (new Gazelle\Manager\Request)->findById((int)($_GET['id'] ?? 0));
+$request = (new Gazelle\Manager\Request())->findById((int)($_GET['id'] ?? 0));
 if (is_null($request)) {
     error(404);
 }
@@ -44,9 +44,9 @@
     'request'          => $request,
     'category_name'    => $categoryName,
     'artist_role'      => $artistRole,
-    'tgroup'           => (new Gazelle\Manager\TGroup)->findById((int)($groupId ?? $request->tgroupId())),
-    'release_list'     => (new Gazelle\ReleaseType)->list(),
-    'tag_list'         => (new Gazelle\Manager\Tag)->genreList(),
+    'tgroup'           => (new Gazelle\Manager\TGroup())->findById((int)($groupId ?? $request->tgroupId())),
+    'release_list'     => (new Gazelle\ReleaseType())->list(),
+    'tag_list'         => (new Gazelle\Manager\Tag())->genreList(),
     'catalogue_number' => $catalogueNumber ?? $request->catalogueNumber(),
     'category_id'      => $categoryId      ?? $request->categoryId(),
     'description'      => new Gazelle\Util\Textarea('description', $description ?? $request->description(), 70, 7),
diff --git a/sections/requests/edit_bounty.php b/sections/requests/edit_bounty.php
index f9a08c684..2e1329ddc 100644
--- a/sections/requests/edit_bounty.php
+++ b/sections/requests/edit_bounty.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_GET['id']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_GET['id']);
 if (is_null($request)) {
     error(404);
 }
diff --git a/sections/requests/edit_handle.php b/sections/requests/edit_handle.php
index ad423c077..9523f6852 100644
--- a/sections/requests/edit_handle.php
+++ b/sections/requests/edit_handle.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$requestMan = new Gazelle\Manager\Request;
+$requestMan = new Gazelle\Manager\Request();
 $request = $requestMan->findById((int)($_POST['requestid'] ?? 0));
 if (is_null($request)) {
     error(404);
@@ -32,7 +32,7 @@
 $tgroup     = null;
 
 while (true) {
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     if (isset($_POST['description'])) {
         $validator->setField('description', true, 'string', 'You forgot to enter a description.', ['maxlength' => 32000]);
     }
@@ -87,7 +87,7 @@
 
     if (isset($_POST['releasetype'])) {
         $releaseType = (int)$_POST['releasetype'];
-        if (!(new Gazelle\ReleaseType)->findNameById($releaseType)) {
+        if (!(new Gazelle\ReleaseType())->findNameById($releaseType)) {
             $error = 'Please pick a release type';
             break;
         }
@@ -163,7 +163,7 @@
             ? (int)$match['id']
             : (int)$_POST['groupid'];
         if ($tgroupId > 0) {
-            $tgroup = (new Gazelle\Manager\TGroup)->findById($tgroupId);
+            $tgroup = (new Gazelle\Manager\TGroup())->findById($tgroupId);
             if (is_null($tgroup)) {
                 $error = 'The torrent group, if entered, must correspond to a music torrent group on the site.';
                 break;
@@ -234,13 +234,13 @@
 
 $request->modify();
 if ($categoryName === 'Music' && $Viewer->permittedAny('site_edit_requests', 'site_moderate_requests')) {
-    $request->artistRole()->set($artistRole, new Gazelle\Manager\Artist);
+    $request->artistRole()->set($artistRole, new Gazelle\Manager\Artist());
 }
 if (isset($_POST['tags'])) {
     $request->setTagList(
         array_unique(array_map('trim', explode(',', trim($_POST['tags'])))),
         $Viewer,
-        new Gazelle\Manager\Tag,
+        new Gazelle\Manager\Tag(),
     );
 }
 $request->updateSphinx();
diff --git a/sections/requests/interim.php b/sections/requests/interim.php
index a75289fe2..30c55dfbb 100644
--- a/sections/requests/interim.php
+++ b/sections/requests/interim.php
@@ -1,6 +1,6 @@
 <?php
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_GET['id']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_GET['id']);
 if (is_null($request)) {
     error(404);
 }
diff --git a/sections/requests/new.php b/sections/requests/new.php
index 55a7f691a..7a230e002 100644
--- a/sections/requests/new.php
+++ b/sections/requests/new.php
@@ -6,14 +6,14 @@
 
 // We may be able to prepare some things based on whence we came
 if (isset($_GET['artistid'])) {
-    $artist = (new Gazelle\Manager\Artist)->findById((int)$_GET['artistid']);
+    $artist = (new Gazelle\Manager\Artist())->findById((int)$_GET['artistid']);
     if ($artist) {
         $artistRole = [
             ARTIST_MAIN => [['name' => $artist->name()]],
         ];
     }
 } elseif (isset($_GET['groupid'])) {
-    $tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_GET['groupid']);
+    $tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_GET['groupid']);
     if ($tgroup) {
         $categoryId   = $tgroup->categoryId();
         $categoryName = $tgroup->categoryName();
@@ -32,8 +32,8 @@
     'error'            => $error        ?? null,
     'tgroup'           => $tgroup       ?? null,
     'viewer'           => $Viewer,
-    'release_list'     => (new Gazelle\ReleaseType)->list(),
-    'tag_list'         => (new Gazelle\Manager\Tag)->genreList(),
+    'release_list'     => (new Gazelle\ReleaseType())->list(),
+    'tag_list'         => (new Gazelle\Manager\Tag())->genreList(),
     'amount'           => $amount          ?? REQUEST_MIN * 1024 ** 2,
     'amount_box'       => $amount          ?? REQUEST_MIN,
     'unit_GiB'         => $unitGiB         ?? false,
diff --git a/sections/requests/new_handle.php b/sections/requests/new_handle.php
index cb4d8f026..9736c6f5b 100644
--- a/sections/requests/new_handle.php
+++ b/sections/requests/new_handle.php
@@ -56,7 +56,7 @@
 while (true) { // break early on error
     if ($categoryName !== 'Music') {
         $artistRole = [];
-        $logCue = new Gazelle\Request\LogCue;
+        $logCue = new Gazelle\Request\LogCue();
     } else {
         $logCue = $format->exists('FLAC') && $media->exists('CD')
             ? new Gazelle\Request\LogCue(
@@ -65,7 +65,7 @@
                 isset($_POST['needlog']),
                 (int)($_POST['minlogscore'] ?? 0)
             )
-            : new Gazelle\Request\LogCue;
+            : new Gazelle\Request\LogCue();
 
         if (empty($_POST['artists'])) {
             $error = 'You did not enter any artists.';
@@ -102,7 +102,7 @@
             break;
         }
 
-        if (!(new Gazelle\ReleaseType)->findNameById($releaseType)) {
+        if (!(new Gazelle\ReleaseType())->findNameById($releaseType)) {
             $error = 'Please pick a release type';
             break;
         }
@@ -136,7 +136,7 @@
             ? (int)$match['id']
             : (int)$_POST['groupid'];
         if ($GroupID > 0) {
-            $tgroup = (new Gazelle\Manager\TGroup)->findById($GroupID);
+            $tgroup = (new Gazelle\Manager\TGroup())->findById($GroupID);
             if (is_null($tgroup)) {
                 $error = 'The torrent group, if entered, must correspond to a music torrent group on the site.';
                 break;
@@ -144,7 +144,7 @@
         }
     }
 
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['description', true,  'string', 'You forgot to enter a description.', ['maxlength' => 32000]],
         ['image',       false, 'image',  ''],
@@ -182,7 +182,7 @@
     exit;
 }
 
-$request = (new Gazelle\Manager\Request)->create(
+$request = (new Gazelle\Manager\Request())->create(
     user:            $Viewer,
     bounty:          (int)($amount * $scale),
     categoryId:      $categoryId,
@@ -202,9 +202,9 @@
     groupId:         $tgroup?->id(),
 );
 if ($categoryName == 'Music') {
-    $request->artistRole()->set($artistRole, new Gazelle\Manager\Artist);
+    $request->artistRole()->set($artistRole, new Gazelle\Manager\Artist());
 }
-$request->setTagList(array_unique(array_map('trim', explode(',', $tags))), $Viewer, new Gazelle\Manager\Tag);
+$request->setTagList(array_unique(array_map('trim', explode(',', $tags))), $Viewer, new Gazelle\Manager\Tag());
 $tgroup?->flush();
 
 if ($Viewer->option('AutoSubscribe')) {
diff --git a/sections/requests/request.php b/sections/requests/request.php
index 3ce0cd48a..36ffe3bd3 100644
--- a/sections/requests/request.php
+++ b/sections/requests/request.php
@@ -4,7 +4,7 @@
  * This is the page that displays the request to the end user after being created.
  */
 
-$request = (new Gazelle\Manager\Request)->findById((int)($_GET['id'] ?? 0));
+$request = (new Gazelle\Manager\Request())->findById((int)($_GET['id'] ?? 0));
 if (is_null($request)) {
     error(404);
 }
@@ -17,7 +17,7 @@
 $paginator->setAnchor('comments')->setTotal($commentPage->total())->removeParam('postid');
 
 $isSubscribed = (new Gazelle\User\Subscription($Viewer))->isSubscribedComments('requests', $requestId);
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $topVoteList = array_slice($request->userVoteList($userMan), 0, 5);
 $filler = $userMan->findById($request->fillerId());
 $roleList = $request->artistRole()?->roleList() ?? [];
diff --git a/sections/requests/requests.php b/sections/requests/requests.php
index 87a2b884d..a95535719 100644
--- a/sections/requests/requests.php
+++ b/sections/requests/requests.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['userid'])) {
     $user = $Viewer;
 } else {
@@ -20,7 +20,7 @@
     'random'   => ['dbColumn' => 'RAND()',     'defaultSort' => ''],
 ]);
 
-$search = new Gazelle\Search\Request(new Gazelle\Manager\Request);
+$search = new Gazelle\Search\Request(new Gazelle\Manager\Request());
 $initial = !isset($_GET['submit']);
 $bookmarkView = false;
 
@@ -68,7 +68,7 @@
 if (($initial && !isset($_GET['type'])) || (!$initial && !isset($_GET['show_filled']))) {
     $search->showUnfilled();
 }
-$releaseTypes = (new \Gazelle\ReleaseType)->list();
+$releaseTypes = (new \Gazelle\ReleaseType())->list();
 $search->setFormat($_GET['formats'] ?? [], isset($_GET['formats_strict']))
     ->setMedia($_GET['media'] ?? [], isset($_GET['media_strict']))
     ->setEncoding($_GET['bitrates'] ?? [], isset($_GET['bitrate_strict']))
diff --git a/sections/requests/take_fill.php b/sections/requests/take_fill.php
index 40799b4aa..af72b845a 100644
--- a/sections/requests/take_fill.php
+++ b/sections/requests/take_fill.php
@@ -12,14 +12,14 @@ function print_or_return($JsonMsg, $Error = null) {
     authorize();
 }
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_REQUEST['requestid']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_REQUEST['requestid']);
 if (is_null($request)) {
     error(404);
 }
 
 $error = [];
 $torrent = null;
-$tgMan = new Gazelle\Manager\Torrent;
+$tgMan = new Gazelle\Manager\Torrent();
 if (!empty($_REQUEST['torrentid'])) {
     $torrent = $tgMan->findById((int)$_REQUEST['torrentid']);
 } else {
@@ -37,7 +37,7 @@ function print_or_return($JsonMsg, $Error = null) {
     $error[] = print_or_return('could not determine torrentid', 404);
 }
 if (!empty($_REQUEST['user']) && $Viewer->permitted('site_moderate_requests')) {
-    $filler = (new Gazelle\Manager\User)->findByUsername($_REQUEST['user']);
+    $filler = (new Gazelle\Manager\User())->findByUsername($_REQUEST['user']);
     if (is_null($filler)) {
         $error[] = 'No such user to fill for!';
     }
diff --git a/sections/requests/unfill_handle.php b/sections/requests/unfill_handle.php
index 5298026b7..4eb49dbd9 100644
--- a/sections/requests/unfill_handle.php
+++ b/sections/requests/unfill_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$request = (new Gazelle\Manager\Request)->findById((int)$_REQUEST['id']);
+$request = (new Gazelle\Manager\Request())->findById((int)$_REQUEST['id']);
 if (is_null($request)) {
     error(404);
 }
@@ -15,6 +15,6 @@
     error(403);
 }
 
-$request->unfill($Viewer, trim($_POST['reason']), new Gazelle\Manager\Torrent);
+$request->unfill($Viewer, trim($_POST['reason']), new Gazelle\Manager\Torrent());
 
 header('Location: ' . $request->location());
diff --git a/sections/requests/vote_handle.php b/sections/requests/vote_handle.php
index 8b64f47a5..909d29329 100644
--- a/sections/requests/vote_handle.php
+++ b/sections/requests/vote_handle.php
@@ -8,7 +8,7 @@
 
 authorize();
 
-$request = (new Gazelle\Manager\Request)->findById((int)($_GET['id'] ?? 0));
+$request = (new Gazelle\Manager\Request())->findById((int)($_GET['id'] ?? 0));
 if (is_null($request)) {
     echo "missing";
 } elseif ($request->isFilled()) {
diff --git a/sections/rules/index.php b/sections/rules/index.php
index cfbd7025a..34e257592 100644
--- a/sections/rules/index.php
+++ b/sections/rules/index.php
@@ -6,7 +6,7 @@
         break;
     case 'clients':
         echo $Twig->render('rules/client-whitelist.twig', [
-            'list' => (new Gazelle\Manager\ClientWhitelist)->list(),
+            'list' => (new Gazelle\Manager\ClientWhitelist())->list(),
         ]);
         break;
     case 'collages':
diff --git a/sections/staff/index.php b/sections/staff/index.php
index 0e060eeab..7ae7798b3 100644
--- a/sections/staff/index.php
+++ b/sections/staff/index.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new \Gazelle\Manager\User;
+$userMan = new \Gazelle\Manager\User();
 $classList = $userMan->classList();
 
 echo $Twig->render('staff/index.twig', [
diff --git a/sections/staffblog/index.php b/sections/staffblog/index.php
index 0f4c216de..bd95421d7 100644
--- a/sections/staffblog/index.php
+++ b/sections/staffblog/index.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$blogMan = new Gazelle\Manager\StaffBlog;
+$blogMan = new Gazelle\Manager\StaffBlog();
 $blogMan->catchup($Viewer);
 
 if ($Viewer->permitted('admin_manage_blog')) {
diff --git a/sections/staffpm/ajax_delete_response.php b/sections/staffpm/ajax_delete_response.php
index e8bb6b70d..db2bdb2e7 100644
--- a/sections/staffpm/ajax_delete_response.php
+++ b/sections/staffpm/ajax_delete_response.php
@@ -4,4 +4,4 @@
     error(403);
 }
 
-echo (new Gazelle\Manager\StaffPM)->removeCommonAnswer((int)($_GET['id'] ?? 0));
+echo (new Gazelle\Manager\StaffPM())->removeCommonAnswer((int)($_GET['id'] ?? 0));
diff --git a/sections/staffpm/ajax_edit_response.php b/sections/staffpm/ajax_edit_response.php
index 6a8eecbce..5d7a08ab4 100644
--- a/sections/staffpm/ajax_edit_response.php
+++ b/sections/staffpm/ajax_edit_response.php
@@ -12,7 +12,7 @@
 }
 
 $id     = (int)($_POST['id'] ?? 0);
-$spmMan = new Gazelle\Manager\StaffPM;
+$spmMan = new Gazelle\Manager\StaffPM();
 $answer = $spmMan->commonAnswer($id);
 if (is_null($answer)) {
     $spmMan->createCommonAnswer($name, $message);
diff --git a/sections/staffpm/ajax_get_response.php b/sections/staffpm/ajax_get_response.php
index 3688be561..4ce94a308 100644
--- a/sections/staffpm/ajax_get_response.php
+++ b/sections/staffpm/ajax_get_response.php
@@ -4,5 +4,5 @@
     error(403);
 }
 
-$answer = (new Gazelle\Manager\StaffPM)->commonAnswer((int)($_GET['id'] ?? 0));
+$answer = (new Gazelle\Manager\StaffPM())->commonAnswer((int)($_GET['id'] ?? 0));
 echo (int)($_GET['plain'] ?? 0) === 1 ? $answer : Text::full_format($answer);
diff --git a/sections/staffpm/assign.php b/sections/staffpm/assign.php
index b622ac289..45df6c714 100644
--- a/sections/staffpm/assign.php
+++ b/sections/staffpm/assign.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$staffPm = (new Gazelle\Manager\StaffPM)->findById((int)($_REQUEST['convid'] ?? 0));
+$staffPm = (new Gazelle\Manager\StaffPM())->findById((int)($_REQUEST['convid'] ?? 0));
 if (is_null($staffPm)) {
     header('Location: staffpm.php');
     exit;
@@ -18,7 +18,7 @@
     if (empty($_GET['to'])) {
         error(404);
     }
-    $classList = (new Gazelle\Manager\User)->classList();
+    $classList = (new Gazelle\Manager\User())->classList();
     match ($_GET['to']) {
         'forum' => $staffPm->assignClass($classList[FORUM_MOD]['Level'], $Viewer),
         'staff' => $staffPm->assignClass($classList[MOD]['Level'], $Viewer),
@@ -38,7 +38,7 @@
     if ($assignTo == 'class') {
         $staffPm->assignClass($NewLevel, $Viewer);
     } else {
-        $assignee = (new Gazelle\Manager\User)->findById($NewLevel);
+        $assignee = (new Gazelle\Manager\User())->findById($NewLevel);
         if (is_null($assignee)) {
             error(404, true);
         }
diff --git a/sections/staffpm/common_responses.php b/sections/staffpm/common_responses.php
index 2a8a6e053..1067e2cf7 100644
--- a/sections/staffpm/common_responses.php
+++ b/sections/staffpm/common_responses.php
@@ -6,6 +6,6 @@
 
 echo $Twig->render('staffpm/common-response.twig', [
     'conv_id' => $_GET['convid'] ?? false,
-    'list'    => (new Gazelle\Manager\StaffPM)->commonAnswerList(),
+    'list'    => (new Gazelle\Manager\StaffPM())->commonAnswerList(),
     'viewer'  => $Viewer,
 ]);
diff --git a/sections/staffpm/multiresolve.php b/sections/staffpm/multiresolve.php
index 440dbfcee..cde838ef5 100644
--- a/sections/staffpm/multiresolve.php
+++ b/sections/staffpm/multiresolve.php
@@ -1,6 +1,6 @@
 <?php
 
-$manager = new Gazelle\Manager\StaffPM;
+$manager = new Gazelle\Manager\StaffPM();
 
 $list = [];
 foreach ($_POST['id'] as $id) {
diff --git a/sections/staffpm/post_handle.php b/sections/staffpm/post_handle.php
index 2ee724d97..376ec34bb 100644
--- a/sections/staffpm/post_handle.php
+++ b/sections/staffpm/post_handle.php
@@ -1,6 +1,6 @@
 <?php
 
-$manager = new Gazelle\Manager\StaffPM;
+$manager = new Gazelle\Manager\StaffPM();
 
 if (isset($_POST['convid'])) {
     $staffPM = $manager->findById((int)($_POST['convid'] ?? 0));
diff --git a/sections/staffpm/resolve.php b/sections/staffpm/resolve.php
index d2249e651..9a078dd2d 100644
--- a/sections/staffpm/resolve.php
+++ b/sections/staffpm/resolve.php
@@ -1,6 +1,6 @@
 <?php
 
-$staffPM = (new Gazelle\Manager\StaffPM)->findById((int)($_GET['id'] ?? 0));
+$staffPM = (new Gazelle\Manager\StaffPM())->findById((int)($_GET['id'] ?? 0));
 if (is_null($staffPM)) {
     header("Location: staffpm.php");
     exit;
diff --git a/sections/staffpm/scoreboard.php b/sections/staffpm/scoreboard.php
index 1ac50ff4b..6ddaece21 100644
--- a/sections/staffpm/scoreboard.php
+++ b/sections/staffpm/scoreboard.php
@@ -4,8 +4,8 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
-$spmMan  = new Gazelle\Manager\StaffPM;
+$userMan = new Gazelle\Manager\User();
+$spmMan  = new Gazelle\Manager\StaffPM();
 
 $isStaffView  = ($_REQUEST['view'] ?? 'staff') === 'staff';
 $SupportStaff = [...array_keys($userMan->flsList()), ...array_keys($userMan->staffList())];
diff --git a/sections/staffpm/staff_inbox.php b/sections/staffpm/staff_inbox.php
index 478dbd451..78c5c2609 100644
--- a/sections/staffpm/staff_inbox.php
+++ b/sections/staffpm/staff_inbox.php
@@ -2,8 +2,8 @@
 
 $View = empty($_GET['view']) ? '' : display_str($_GET['view']);
 
-$staffpmMan = new Gazelle\Manager\StaffPM;
-$userMan    = new Gazelle\Manager\User;
+$staffpmMan = new Gazelle\Manager\StaffPM();
+$userMan    = new Gazelle\Manager\User();
 
 $viewMap = [
     '' => [
@@ -50,7 +50,7 @@
     $args = array_merge([$Viewer->privilege()->effectiveClassLevel(), $Viewer->id()], $viewMap[$View]['status']);
 }
 
-$Classes = (new Gazelle\Manager\User)->classList();
+$Classes = (new Gazelle\Manager\User())->classList();
 if ($viewMap[$View]['title'] === 'Your Unanswered') {
     if ($Viewer->privilege()->effectiveClassLevel() >= $Classes[MOD]['Level']) {
         $cond[] = 'spc.Level >= ?';
diff --git a/sections/staffpm/unresolve.php b/sections/staffpm/unresolve.php
index 00fb11210..049cf4693 100644
--- a/sections/staffpm/unresolve.php
+++ b/sections/staffpm/unresolve.php
@@ -1,6 +1,6 @@
 <?php
 
-$spm = (new Gazelle\Manager\StaffPM)->findById((int)($_GET['id'] ?? 0));
+$spm = (new Gazelle\Manager\StaffPM())->findById((int)($_GET['id'] ?? 0));
 if (is_null($spm)) {
     header('Location: staffpm.php');
     exit;
diff --git a/sections/staffpm/user_inbox.php b/sections/staffpm/user_inbox.php
index c46931ade..6ada977cd 100644
--- a/sections/staffpm/user_inbox.php
+++ b/sections/staffpm/user_inbox.php
@@ -1,6 +1,6 @@
 <?php
 
-$classList = (new Gazelle\Manager\User)->classList();
+$classList = (new Gazelle\Manager\User())->classList();
 
 echo $Twig->render('staffpm/user-inbox.twig', [
     'level' => [
@@ -8,7 +8,7 @@
         'mod'   => $classList[MOD]['Level'],
         'sysop' => $classList[SYSOP]['Level'],
     ],
-    'list'   => (new Gazelle\Manager\StaffPM)->findAllByUserId($Viewer->id()),
+    'list'   => (new Gazelle\Manager\StaffPM())->findAllByUserId($Viewer->id()),
     'max'    => 'Sysop',
     'reply'  => new Gazelle\Util\Textarea('quickpost', ''),
     'viewer' => $Viewer,
diff --git a/sections/staffpm/viewconv.php b/sections/staffpm/viewconv.php
index c4ff67576..6fcec5559 100644
--- a/sections/staffpm/viewconv.php
+++ b/sections/staffpm/viewconv.php
@@ -5,7 +5,7 @@
     exit;
 }
 
-$manager = new Gazelle\Manager\StaffPM;
+$manager = new Gazelle\Manager\StaffPM();
 $staffPM = $manager->findById((int)($_GET['id'] ?? 0));
 if (is_null($staffPM)) {
     error(404);
@@ -17,7 +17,7 @@
     // User is viewing their own unread conversation, set it to read
     $staffPM->markAsRead($Viewer);
 }
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 echo $Twig->render('staffpm/message.twig', [
     'author'      => $userMan->findById($staffPM->userId()),
diff --git a/sections/stats/torrents.php b/sections/stats/torrents.php
index d1c9ae957..a1d990cda 100644
--- a/sections/stats/torrents.php
+++ b/sections/stats/torrents.php
@@ -1,6 +1,6 @@
 <?php
 
-$statsTor = new Gazelle\Stats\Torrent;
+$statsTor = new Gazelle\Stats\Torrent();
 $flow = $statsTor->flow();
 
 echo $Twig->render('stats/torrent.twig', [
diff --git a/sections/stats/users.php b/sections/stats/users.php
index b89427efd..643960d2e 100644
--- a/sections/stats/users.php
+++ b/sections/stats/users.php
@@ -1,6 +1,6 @@
 <?php
 
-$statsUser = new Gazelle\Stats\Users;
+$statsUser = new Gazelle\Stats\Users();
 $flow      = $statsUser->flow();
 
 [$Countries, $Rank, $CountryUsers, $CountryMax, $CountryMin, $LogIncrements]
diff --git a/sections/tools/data/bonus_stats.php b/sections/tools/data/bonus_stats.php
index b5714ee30..5d7984522 100644
--- a/sections/tools/data/bonus_stats.php
+++ b/sections/tools/data/bonus_stats.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$bonus = new Gazelle\Stats\Bonus;
+$bonus = new Gazelle\Stats\Bonus();
 $day = [];
 $week = [];
 $month = [];
@@ -19,5 +19,5 @@
     'day'   => $day,
     'week'  => $week,
     'month' => $month,
-    'fl'    => (new Gazelle\Stats\Users)->stockpileTokenList(10),
+    'fl'    => (new Gazelle\Stats\Users())->stockpileTokenList(10),
 ]);
diff --git a/sections/tools/data/economic_stats.php b/sections/tools/data/economic_stats.php
index d73520912..795b8b019 100644
--- a/sections/tools/data/economic_stats.php
+++ b/sections/tools/data/economic_stats.php
@@ -5,5 +5,5 @@
 }
 
 echo $Twig->render('admin/economy.twig', [
-    'info' => new Gazelle\Stats\Economic,
+    'info' => new Gazelle\Stats\Economic(),
 ]);
diff --git a/sections/tools/data/invite_pool.php b/sections/tools/data/invite_pool.php
index fe70556df..7a120e1c5 100644
--- a/sections/tools/data/invite_pool.php
+++ b/sections/tools/data/invite_pool.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$inviteMan = new Gazelle\Manager\Invite;
+$inviteMan = new Gazelle\Manager\Invite();
 
 $removed = null;
 if (!empty($_POST['invitekey']) && $Viewer->permitted('users_edit_invites')) {
diff --git a/sections/tools/data/platform_usage.php b/sections/tools/data/platform_usage.php
index c2f50821a..5fb53ab6c 100644
--- a/sections/tools/data/platform_usage.php
+++ b/sections/tools/data/platform_usage.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$stats = new Gazelle\Stats\Users;
+$stats = new Gazelle\Stats\Users();
 
 echo $Twig->render('admin/platform-usage.twig', [
     'os_list'      => $stats->operatingSystemList(),
diff --git a/sections/tools/data/ratio_watch.php b/sections/tools/data/ratio_watch.php
index 2dc2647b9..d09566b95 100644
--- a/sections/tools/data/ratio_watch.php
+++ b/sections/tools/data/ratio_watch.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $paginator = new Gazelle\Util\Paginator(USERS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($userMan->totalRatioWatchUsers());
 
diff --git a/sections/tools/data/registration_log.php b/sections/tools/data/registration_log.php
index 8d604b370..c0ae719cc 100644
--- a/sections/tools/data/registration_log.php
+++ b/sections/tools/data/registration_log.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$registration = new Gazelle\Manager\Registration;
+$registration = new Gazelle\Manager\Registration();
 
 if ($_REQUEST['before_date']) {
     if (!str_contains($_SERVER['REQUEST_URI'], '&before_date=')) {
@@ -25,7 +25,7 @@
 echo $Twig->render('admin/registration.twig', [
     'after'  => $_REQUEST['after_date'] ?? null,
     'before' => $_REQUEST['before_date'] ?? null,
-    'ipv4'   => new Gazelle\Manager\IPv4,
+    'ipv4'   => new Gazelle\Manager\IPv4(),
     'list'   => array_map(fn($u) => new Gazelle\User($u), $registration->page($paginator->limit(), $paginator->offset())),
     'paginator' => $paginator,
 ]);
diff --git a/sections/tools/data/site_info.php b/sections/tools/data/site_info.php
index 906d206af..7fac5509f 100644
--- a/sections/tools/data/site_info.php
+++ b/sections/tools/data/site_info.php
@@ -38,7 +38,7 @@ function gid(int $id): string {
         'openssl_strong'   => $strong,
         'mysql_version'    => $db->scalar('SELECT @@version'),
         'php_version'      => phpversion(),
-        'site_info'        => new Gazelle\SiteInfo,
+        'site_info'        => new Gazelle\SiteInfo(),
         'timestamp_php'    => date('Y-m-d H:i:s'),
         'timestamp_db'     => $db->scalar("SELECT now()"),
     ]);
diff --git a/sections/tools/data/special_users.php b/sections/tools/data/special_users.php
index 41ef7d38a..ca6ca8cb5 100644
--- a/sections/tools/data/special_users.php
+++ b/sections/tools/data/special_users.php
@@ -5,5 +5,5 @@
 }
 
 echo $Twig->render('admin/user-custom-permission.twig', [
-    'list' => (new Gazelle\Manager\User)->findAllByCustomPermission()
+    'list' => (new Gazelle\Manager\User())->findAllByCustomPermission()
 ]);
diff --git a/sections/tools/data/torrent_stats.php b/sections/tools/data/torrent_stats.php
index cf18d826d..a4accfeee 100644
--- a/sections/tools/data/torrent_stats.php
+++ b/sections/tools/data/torrent_stats.php
@@ -5,8 +5,8 @@
 }
 
 echo $Twig->render('admin/stats/torrent.twig', [
-    'notification' => new Gazelle\Manager\Notification,
-    'reaper'       => new Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User),
-    'torr_stat'    => new Gazelle\Stats\Torrent,
-    'user_stat'    => new Gazelle\Stats\Users,
+    'notification' => new Gazelle\Manager\Notification(),
+    'reaper'       => new Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User()),
+    'torr_stat'    => new Gazelle\Stats\Torrent(),
+    'user_stat'    => new Gazelle\Stats\Users(),
 ]);
diff --git a/sections/tools/data/user_flow.php b/sections/tools/data/user_flow.php
index 16eef48fc..da4d3103a 100644
--- a/sections/tools/data/user_flow.php
+++ b/sections/tools/data/user_flow.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $paginator = new Gazelle\Util\Paginator(100, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($userMan->userflowTotal());
 $showFlow = $paginator->page() === 1;
diff --git a/sections/tools/data/user_info.php b/sections/tools/data/user_info.php
index b09dd0a54..8cf65cd8b 100644
--- a/sections/tools/data/user_info.php
+++ b/sections/tools/data/user_info.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
@@ -13,10 +13,10 @@
 $direction = $_GET['dir'] ?? 'up';
 
 echo $Twig->render('admin/user-info.twig', [
-    'asn'       => new Gazelle\Search\ASN,
+    'asn'       => new Gazelle\Search\ASN(),
     'column'    => $column,
     'direction' => $direction,
-    'source'    => (new Gazelle\Manager\InviteSource)->findSourceNameByUser($user),
+    'source'    => (new Gazelle\Manager\InviteSource())->findSourceNameByUser($user),
     'hist'      => new Gazelle\User\History($user, $column, $direction),
     'now'       => date('Y-m-d H:i:s'),
     'user'      => $user,
diff --git a/sections/tools/development/analysis.php b/sections/tools/development/analysis.php
index 70a1ab1bb..5fbc6c7a0 100644
--- a/sections/tools/development/analysis.php
+++ b/sections/tools/development/analysis.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$errorLog = new Gazelle\Manager\ErrorLog;
+$errorLog = new Gazelle\Manager\ErrorLog();
 $case = null;
 
 if (isset($_POST['remove'])) {
diff --git a/sections/tools/development/analysis_list.php b/sections/tools/development/analysis_list.php
index ff8be9f3d..32bcf5a9f 100644
--- a/sections/tools/development/analysis_list.php
+++ b/sections/tools/development/analysis_list.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$errMan = new Gazelle\Manager\ErrorLog;
+$errMan = new Gazelle\Manager\ErrorLog();
 $remove = array_key_extract_suffix('clear-', $_POST);
 if ($remove) {
     $removed = $errMan->remove($remove);
diff --git a/sections/tools/development/clear_cache.php b/sections/tools/development/clear_cache.php
index b63b26565..52217c36d 100644
--- a/sections/tools/development/clear_cache.php
+++ b/sections/tools/development/clear_cache.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$flusher = new Gazelle\Util\CacheMultiFlush;
+$flusher = new Gazelle\Util\CacheMultiFlush();
 
 if (isset($_POST['confirm-flush']) && isset($_POST['global_flush'])) {
     authorize();
diff --git a/sections/tools/development/database_specifics.php b/sections/tools/development/database_specifics.php
index 8cefa10a6..852a6d715 100644
--- a/sections/tools/development/database_specifics.php
+++ b/sections/tools/development/database_specifics.php
@@ -8,7 +8,7 @@
 $db = Gazelle\DB::DB();
 if (!empty($_GET['table']) && preg_match('/([\w-]+)/', $_GET['table'], $match)) {
     $tableName = $match[1];
-    $siteInfo = new Gazelle\SiteInfo;
+    $siteInfo = new Gazelle\SiteInfo();
     if (!$siteInfo->tableExists($tableName)) {
         error("No such table");
     }
diff --git a/sections/tools/development/periodic_alter.php b/sections/tools/development/periodic_alter.php
index 5e1121609..962fc326f 100644
--- a/sections/tools/development/periodic_alter.php
+++ b/sections/tools/development/periodic_alter.php
@@ -7,7 +7,7 @@
 authorize();
 
 $p = $_POST;
-$scheduler = new Gazelle\TaskScheduler;
+$scheduler = new Gazelle\TaskScheduler();
 
 if ($p['submit'] == 'Delete') {
     if (!is_number($p['id']) || $p['id'] == '') {
@@ -16,7 +16,7 @@
 
     $scheduler->deleteTask($p['id']);
 } else {
-    $Val = new Gazelle\Util\Validator;
+    $Val = new Gazelle\Util\Validator();
     $Val->setFields([
         ['name', true, 'string', 'The name must be set, and has a max length of 64 characters', ['maxlength' => 64]],
         ['classname', true, 'string', 'The class name must be set, and has a max length of 32 characters', ['maxlength' => 32]],
diff --git a/sections/tools/development/periodic_detail.php b/sections/tools/development/periodic_detail.php
index e86c87277..36c8d4c87 100644
--- a/sections/tools/development/periodic_detail.php
+++ b/sections/tools/development/periodic_detail.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$scheduler = new Gazelle\TaskScheduler;
+$scheduler = new Gazelle\TaskScheduler();
 $id = (int)($_GET['id'] ?? 0);
 if (!$scheduler->getTask($id)) {
     error(404);
diff --git a/sections/tools/development/periodic_edit.php b/sections/tools/development/periodic_edit.php
index fe579ee03..8bd81e1c5 100644
--- a/sections/tools/development/periodic_edit.php
+++ b/sections/tools/development/periodic_edit.php
@@ -7,5 +7,5 @@
 echo $Twig->render('admin/scheduler/edit.twig', [
     'auth'      => $Viewer->auth(),
     'err'       => $err ?? null,
-    'task_list' => (new Gazelle\TaskScheduler)->getTasks(),
+    'task_list' => (new Gazelle\TaskScheduler())->getTasks(),
 ]);
diff --git a/sections/tools/development/periodic_run.php b/sections/tools/development/periodic_run.php
index dde3ee9c8..8b41c7470 100644
--- a/sections/tools/development/periodic_run.php
+++ b/sections/tools/development/periodic_run.php
@@ -11,7 +11,7 @@
     error("Task not found");
 }
 
-$scheduler = new Gazelle\TaskScheduler;
+$scheduler = new Gazelle\TaskScheduler();
 ob_start();
 $processed = $scheduler->runTask($taskId, true);
 $output    = ob_get_flush();
diff --git a/sections/tools/development/periodic_stats.php b/sections/tools/development/periodic_stats.php
index afc913172..39b641dcc 100644
--- a/sections/tools/development/periodic_stats.php
+++ b/sections/tools/development/periodic_stats.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$stats = (new Gazelle\TaskScheduler)->getRuntimeStats();
+$stats = (new Gazelle\TaskScheduler())->getRuntimeStats();
 echo $Twig->render('admin/scheduler/stats.twig', [
     'hourly' => [
         'duration'  => json_encode($stats['hourly'][0]['data']),
diff --git a/sections/tools/development/periodic_view.php b/sections/tools/development/periodic_view.php
index 387ec1e16..0639b1e06 100644
--- a/sections/tools/development/periodic_view.php
+++ b/sections/tools/development/periodic_view.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$scheduler = new Gazelle\TaskScheduler;
+$scheduler = new Gazelle\TaskScheduler();
 $taskId = (int)($_REQUEST['id'] ?? 0);
 
 if ($taskId && $_REQUEST['mode'] === 'run_now') {
diff --git a/sections/tools/development/service_stats.php b/sections/tools/development/service_stats.php
index c284d208d..1125ba0cc 100644
--- a/sections/tools/development/service_stats.php
+++ b/sections/tools/development/service_stats.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$inspectDb = new Gazelle\DB;
+$inspectDb = new Gazelle\DB();
 $MemStats = $Cache->getStats();
 
 echo $Twig->render('admin/cache-db-stats.twig', [
diff --git a/sections/tools/development/site_options.php b/sections/tools/development/site_options.php
index c7b80b2dc..995238261 100644
--- a/sections/tools/development/site_options.php
+++ b/sections/tools/development/site_options.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$siteOption = new Gazelle\Manager\SiteOption;
+$siteOption = new Gazelle\Manager\SiteOption();
 
 if ($Viewer->permitted('admin_manage_permissions') && isset($_POST['submit'])) {
     authorize();
@@ -16,7 +16,7 @@
     if ($_POST['submit'] == 'Delete') {
         $siteOption->remove($name);
     } else {
-        $Val = new Gazelle\Util\Validator;
+        $Val = new Gazelle\Util\Validator();
         $Val->setFields([
             ['name', true, 'regex', 'The name must be alphanumeric and may contain dashes or underscores. No spaces are allowed.', ['regex' => '/^[a-z][-_a-z0-9]{0,63}$/i']],
             ['value', true, 'string', 'You must specify a value for the option.'],
diff --git a/sections/tools/finances/donation_log.php b/sections/tools/finances/donation_log.php
index 80803b77c..105c039be 100644
--- a/sections/tools/finances/donation_log.php
+++ b/sections/tools/finances/donation_log.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$search = new Gazelle\Search\Donation;
+$search = new Gazelle\Search\Donation();
 if (!empty($_GET['username'])) {
     $search->setUsername($_GET['username']);
 }
@@ -15,7 +15,7 @@
 $paginator = new Gazelle\Util\Paginator(ITEMS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($search->total());
 
-$donorMan = new Gazelle\Manager\Donation;
+$donorMan = new Gazelle\Manager\Donation();
 $timeline = $donorMan->timeline();
 
 echo $Twig->render('admin/donation-log.twig', [
@@ -26,6 +26,6 @@
     'grand_total' => $donorMan->grandTotal(),
     'page'        => $search->page($paginator->limit(), $paginator->offset()),
     'paginator'   => $paginator,
-    'rental'      => (new Gazelle\Manager\Payment)->monthlyRental(),
+    'rental'      => (new Gazelle\Manager\Payment())->monthlyRental(),
     'username'    => $_GET['username'] ?? '',
 ]);
diff --git a/sections/tools/finances/donor_rewards.php b/sections/tools/finances/donor_rewards.php
index b7da58e9e..15c9fdf5a 100644
--- a/sections/tools/finances/donor_rewards.php
+++ b/sections/tools/finances/donor_rewards.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$manager = new Gazelle\Manager\Donation;
+$manager = new Gazelle\Manager\Donation();
 $paginator = new Gazelle\Util\Paginator(USERS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($manager->rewardTotal());
 $search = $_GET['search'] ?? null;
diff --git a/sections/tools/finances/payment_alter.php b/sections/tools/finances/payment_alter.php
index a48710452..782bf7e80 100644
--- a/sections/tools/finances/payment_alter.php
+++ b/sections/tools/finances/payment_alter.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$Payment = new Gazelle\Manager\Payment;
+$Payment = new Gazelle\Manager\Payment();
 
 if ($_POST['submit'] == 'Delete') {
     if (!is_number($_POST['id']) || $_POST['id'] == '') {
@@ -12,7 +12,7 @@
     }
     $Payment->remove($_POST['id']);
 } else {
-    $Validator = new Gazelle\Util\Validator;
+    $Validator = new Gazelle\Util\Validator();
     $Validator->setFields([
         ['text', true, 'string', 'The payment text must be set, and has a max length of 100 characters', ['maxlength' => 100]],
         ['rent', true, 'number', 'Rent must be zero or positive)', ['min' => 0, 'allowperiod' => true]],
diff --git a/sections/tools/finances/payment_list.php b/sections/tools/finances/payment_list.php
index 2d72bd2ed..d4b860f58 100644
--- a/sections/tools/finances/payment_list.php
+++ b/sections/tools/finances/payment_list.php
@@ -5,7 +5,7 @@
 }
 
 echo $Twig->render('admin/payment.twig', [
-    'donorMan' => new Gazelle\Manager\Donation,
-    'list'     => (new Gazelle\Manager\Payment)->list(),
+    'donorMan' => new Gazelle\Manager\Donation(),
+    'list'     => (new Gazelle\Manager\Payment())->list(),
     'viewer'   => $Viewer,
 ]);
diff --git a/sections/tools/managers/ajax_take_enable_request.php b/sections/tools/managers/ajax_take_enable_request.php
index 3c9661660..a4695f989 100644
--- a/sections/tools/managers/ajax_take_enable_request.php
+++ b/sections/tools/managers/ajax_take_enable_request.php
@@ -8,7 +8,7 @@
     json_error("This feature is currently deactivated.");
 }
 
-$enableMan = new Gazelle\Manager\AutoEnable;
+$enableMan = new Gazelle\Manager\AutoEnable();
 $idList = array_map('intval', $_GET['ids'] ?? []);
 if (empty($idList)) {
     json_error("You must select at least one request to resolve");
diff --git a/sections/tools/managers/asn_search.php b/sections/tools/managers/asn_search.php
index 7b7f63fb1..a407270d9 100644
--- a/sections/tools/managers/asn_search.php
+++ b/sections/tools/managers/asn_search.php
@@ -8,7 +8,7 @@
 $search    = false;
 $similar   = false;
 $result    = false;
-$asnSearch = new Gazelle\Search\ASN;
+$asnSearch = new Gazelle\Search\ASN();
 
 if (isset($_REQUEST['name'])) {
     $name = trim($_REQUEST['name']);
diff --git a/sections/tools/managers/bans.php b/sections/tools/managers/bans.php
index fc880c685..bd1bffe98 100644
--- a/sections/tools/managers/bans.php
+++ b/sections/tools/managers/bans.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$IPv4Man = new Gazelle\Manager\IPv4;
+$IPv4Man = new Gazelle\Manager\IPv4();
 
 if (isset($_POST['submit'])) {
     authorize();
@@ -15,7 +15,7 @@
         }
         $IPv4Man->removeBan($id);
     } else { //Edit & Create, Shared Validation
-        $validator = new Gazelle\Util\Validator;
+        $validator = new Gazelle\Util\Validator();
         $validator->setFields([
             ['start', true,'regex','You must include the starting IP address.',['regex' => '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i']],
             ['end', true,'regex','You must include the ending IP address.',['regex' => '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/i']],
diff --git a/sections/tools/managers/bonus_points.php b/sections/tools/managers/bonus_points.php
index 093be7b88..edc6c3987 100644
--- a/sections/tools/managers/bonus_points.php
+++ b/sections/tools/managers/bonus_points.php
@@ -16,7 +16,7 @@
         error('Please enter a positive number of points.');
     }
 
-    $bonusMan = new Gazelle\Manager\Bonus;
+    $bonusMan = new Gazelle\Manager\Bonus();
     $activeCount = $bonusMan->addActivePoints($active, $since);
     $uploadCount = $bonusMan->addUploadPoints($upload, $since);
     $seedCount   = $bonusMan->addSeedPoints($seed);
diff --git a/sections/tools/managers/categories_alter.php b/sections/tools/managers/categories_alter.php
index 234475272..bef93235b 100644
--- a/sections/tools/managers/categories_alter.php
+++ b/sections/tools/managers/categories_alter.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$manager = new Gazelle\Manager\ForumCategory;
+$manager = new Gazelle\Manager\ForumCategory();
 
 if ($_POST['submit'] == 'Delete') {
     $forumCategory = $manager->findById((int)($_POST['id'] ?? 0));
@@ -19,7 +19,7 @@
 
 } else {
     // Edit & Create
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['name', true, 'string', 'The name must be set, and has a max length of 40 characters', ['range' => [1, 40]]],
         ['sort', true, 'number', 'Sequence must be set'],
diff --git a/sections/tools/managers/categories_list.php b/sections/tools/managers/categories_list.php
index ccd1d5df5..13c5ea690 100644
--- a/sections/tools/managers/categories_list.php
+++ b/sections/tools/managers/categories_list.php
@@ -6,5 +6,5 @@
 
 echo $Twig->render('admin/forum-category.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\ForumCategory)->usageList(),
+    'list' => (new Gazelle\Manager\ForumCategory())->usageList(),
 ]);
diff --git a/sections/tools/managers/change_log.php b/sections/tools/managers/change_log.php
index faaa63f47..d5dc93931 100644
--- a/sections/tools/managers/change_log.php
+++ b/sections/tools/managers/change_log.php
@@ -1,6 +1,6 @@
 <?php
 
-$changeMan = new Gazelle\Manager\Changelog;
+$changeMan = new Gazelle\Manager\Changelog();
 
 if ($Viewer->permitted('users_mod') && isset($_POST['perform'])) {
     authorize();
diff --git a/sections/tools/managers/create_user.php b/sections/tools/managers/create_user.php
index c45407023..da9a3fcbd 100644
--- a/sections/tools/managers/create_user.php
+++ b/sections/tools/managers/create_user.php
@@ -20,7 +20,7 @@
         error('Please supply a password');
     }
 
-    $creator = new Gazelle\UserCreator;
+    $creator = new Gazelle\UserCreator();
     try {
         $user = $creator->setUsername($username)
             ->setEmail($email)
diff --git a/sections/tools/managers/custom_pm.php b/sections/tools/managers/custom_pm.php
index 551c65f9e..7b5272e4a 100644
--- a/sections/tools/managers/custom_pm.php
+++ b/sections/tools/managers/custom_pm.php
@@ -41,7 +41,7 @@
     }
 
     // we don't actually know if the query returned user ids, so check them
-    $userMan = new Gazelle\Manager\User;
+    $userMan = new Gazelle\Manager\User();
     foreach ($result as $userId) {
         $user = $userMan->findById($userId);
         if ($user) {
diff --git a/sections/tools/managers/dnu_alter.php b/sections/tools/managers/dnu_alter.php
index cc9209b41..2033daef9 100644
--- a/sections/tools/managers/dnu_alter.php
+++ b/sections/tools/managers/dnu_alter.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$manager = new Gazelle\Manager\DNU;
+$manager = new Gazelle\Manager\DNU();
 
 $db = Gazelle\DB::DB();
 
@@ -22,7 +22,7 @@
 
 } else {
     // Edit & Create, Shared Validation
-    $Val = new Gazelle\Util\Validator;
+    $Val = new Gazelle\Util\Validator();
     $Val->setField('name', true, 'string', 'The name must be set, have a length of between 5 and 100 characters.', ['range' => [5, 100]]);
     $Val->setField('comment', false, 'string', 'The description has a maximum length of 255 characters.', ['maxlength' => 255]);
     if (!$Val->validate($_POST)) {
diff --git a/sections/tools/managers/dnu_list.php b/sections/tools/managers/dnu_list.php
index 2edb6e29d..f05664db8 100644
--- a/sections/tools/managers/dnu_list.php
+++ b/sections/tools/managers/dnu_list.php
@@ -6,5 +6,5 @@
 
 echo $Twig->render('admin/dnu.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\DNU)->dnuList(),
+    'list' => (new Gazelle\Manager\DNU())->dnuList(),
 ]);
diff --git a/sections/tools/managers/dupe_ip.php b/sections/tools/managers/dupe_ip.php
index 57251acc9..91ee4cd3b 100644
--- a/sections/tools/managers/dupe_ip.php
+++ b/sections/tools/managers/dupe_ip.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$manager = new Gazelle\Manager\DuplicateIP;
+$manager = new Gazelle\Manager\DuplicateIP();
 $paginator = new Gazelle\Util\Paginator(USERS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $paginator->setTotal($manager->total(IP_OVERLAPS));
 
diff --git a/sections/tools/managers/email_blacklist.php b/sections/tools/managers/email_blacklist.php
index 210d859e4..1a8414f31 100644
--- a/sections/tools/managers/email_blacklist.php
+++ b/sections/tools/managers/email_blacklist.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$emailBlacklist = new Gazelle\Manager\EmailBlacklist;
+$emailBlacklist = new Gazelle\Manager\EmailBlacklist();
 if (!empty($_POST['email'])) {
     $emailBlacklist->setFilterEmail(trim($_POST['email']));
 }
diff --git a/sections/tools/managers/email_blacklist_alter.php b/sections/tools/managers/email_blacklist_alter.php
index 4d76a38c8..6edde0363 100644
--- a/sections/tools/managers/email_blacklist_alter.php
+++ b/sections/tools/managers/email_blacklist_alter.php
@@ -5,14 +5,14 @@
 }
 
 authorize();
-$emailBlacklist = new Gazelle\Manager\EmailBlacklist;
+$emailBlacklist = new Gazelle\Manager\EmailBlacklist();
 
 if ($_POST['submit'] === 'Delete') { // Delete
     if (!$emailBlacklist->remove((int)$_POST['id'])) {
         error(0);
     }
 } else { // Edit & Create, Shared Validation
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setField('email', true, 'string', 'The email must be set', ['minlength' => 6]);
     $validator->setField('comment', false, 'string', 'The description has a max length of 255 characters', ['maxlength' => 255]);
     if (!$validator->validate($_POST)) {
diff --git a/sections/tools/managers/email_search.php b/sections/tools/managers/email_search.php
index 80c48c185..3d1aa1b1c 100644
--- a/sections/tools/managers/email_search.php
+++ b/sections/tools/managers/email_search.php
@@ -19,7 +19,7 @@
     default                   => '',
 };
 if ($text) {
-    $search = (new Gazelle\Search\Email(new Gazelle\Search\ASN))
+    $search = (new Gazelle\Search\Email(new Gazelle\Search\ASN()))
         ->create('email_search_' . getmypid())
         ->setColumn($column)
         ->setDirection($direction);
diff --git a/sections/tools/managers/enable_requests.php b/sections/tools/managers/enable_requests.php
index bd83276b2..1e4fff729 100644
--- a/sections/tools/managers/enable_requests.php
+++ b/sections/tools/managers/enable_requests.php
@@ -9,7 +9,7 @@
 }
 
 $showChecked = $_GET['show_checked'] ?? false;
-$enableMan = new Gazelle\Manager\AutoEnable;
+$enableMan = new Gazelle\Manager\AutoEnable();
 $enableMan->configureView($_GET['view'] ?? '', $showChecked);
 
 // Build query further based on search
diff --git a/sections/tools/managers/featured_album.php b/sections/tools/managers/featured_album.php
index 6ef2972c3..32ce2db13 100644
--- a/sections/tools/managers/featured_album.php
+++ b/sections/tools/managers/featured_album.php
@@ -8,9 +8,9 @@
     error(403);
 }
 
-$tgMan   = new Gazelle\Manager\TGroup;
-$torMan  = new Gazelle\Manager\Torrent;
-$manager = new Gazelle\Manager\FeaturedAlbum;
+$tgMan   = new Gazelle\Manager\TGroup();
+$torMan  = new Gazelle\Manager\Torrent();
+$manager = new Gazelle\Manager\FeaturedAlbum();
 
 if (isset($_GET['unfeature'])) {
     authorize();
@@ -63,12 +63,12 @@
 
     $featuredAlbum = $manager->create(
         featureType: $featureType,
-        news:        new Gazelle\Manager\News,
+        news:        new Gazelle\Manager\News(),
         tgMan:       $tgMan,
         torMan:      $torMan,
-        tracker:     new Gazelle\Tracker,
+        tracker:     new Gazelle\Tracker(),
         tgroup:      $tgroup,
-        forumThread: (new Gazelle\Manager\ForumThread)->create(
+        forumThread: (new Gazelle\Manager\ForumThread())->create(
             forum: new Gazelle\Forum($featureType->forumId()),
             user:  $Viewer,
             title: $tgroup->text(),
diff --git a/sections/tools/managers/forum_alter.php b/sections/tools/managers/forum_alter.php
index 9b93d6f7e..cfa9151e2 100644
--- a/sections/tools/managers/forum_alter.php
+++ b/sections/tools/managers/forum_alter.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$forumMan = new Gazelle\Manager\Forum;
+$forumMan = new Gazelle\Manager\Forum();
 $forum = $forumMan->findById((int)($_POST['id'] ?? 0));
 if (is_null($forum) && in_array($_POST['submit'], ['Edit', 'Delete'])) {
     error(0);
@@ -21,7 +21,7 @@
         error(403);
     }
 
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['name', true, 'string', 'The name must be set, and has a max length of 40 characters', ['maxlength' => 40]],
         ['description', false, 'string', 'The description has a max length of 255 characters', ['maxlength' => 255]],
diff --git a/sections/tools/managers/forum_list.php b/sections/tools/managers/forum_list.php
index 467455e59..21f7f0534 100644
--- a/sections/tools/managers/forum_list.php
+++ b/sections/tools/managers/forum_list.php
@@ -6,7 +6,7 @@
 
 echo $Twig->render('admin/forum-management.twig', [
     'auth'       => $Viewer->auth(),
-    'category'   => (new Gazelle\Manager\ForumCategory)->forumCategoryList(),
-    'class_list' => (new Gazelle\Manager\User)->classList(),
-    'toc'        => (new Gazelle\Manager\Forum)->tableOfContents($Viewer),
+    'category'   => (new Gazelle\Manager\ForumCategory())->forumCategoryList(),
+    'class_list' => (new Gazelle\Manager\User())->classList(),
+    'toc'        => (new Gazelle\Manager\Forum())->tableOfContents($Viewer),
 ]);
diff --git a/sections/tools/managers/forum_transitions_alter.php b/sections/tools/managers/forum_transitions_alter.php
index 3d026a440..d26c0cc7d 100644
--- a/sections/tools/managers/forum_transitions_alter.php
+++ b/sections/tools/managers/forum_transitions_alter.php
@@ -5,7 +5,7 @@
 }
 
 authorize();
-$manager = new Gazelle\Manager\ForumTransition;
+$manager = new Gazelle\Manager\ForumTransition();
 $transition = $manager->findById((int)($_POST['id'] ?? 0));
 
 if ($_POST['submit'] === 'Delete') {
@@ -14,7 +14,7 @@
     }
     $transition->remove();
 } else {
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['source', true, 'number', 'You must set a source forum ID for the transition'],
         ['destination', true, 'number', 'You must set a destination forum ID for the transition'],
@@ -27,7 +27,7 @@
         error($validator->errorMessage());
     }
 
-    $forumMan = new Gazelle\Manager\Forum;
+    $forumMan = new Gazelle\Manager\Forum();
     $source = $forumMan->findById((int)$_POST['source']);
     if (is_null($source)) {
         error("no such source forum id: " . (int)$_POST['source']);
diff --git a/sections/tools/managers/forum_transitions_list.php b/sections/tools/managers/forum_transitions_list.php
index 4674ccca3..54914ed38 100644
--- a/sections/tools/managers/forum_transitions_list.php
+++ b/sections/tools/managers/forum_transitions_list.php
@@ -23,7 +23,7 @@ function forumList(array $list, int $selected = 0): string {
 
 function classList(int $Selected = 0): string {
     $Return = '';
-    $Classes = (new Gazelle\Manager\User)->classList();
+    $Classes = (new Gazelle\Manager\User())->classList();
     foreach ($Classes as $Class) {
         if ($Class['Secondary']) {
             continue;
@@ -46,7 +46,7 @@ function classList(int $Selected = 0): string {
 
 $user = null;
 if (isset($_REQUEST['userid'])) {
-    $user = (new Gazelle\Manager\User)->find($_REQUEST['userid']);
+    $user = (new Gazelle\Manager\User())->find($_REQUEST['userid']);
 } else {
     $user = $Viewer;
 }
@@ -55,9 +55,9 @@ function classList(int $Selected = 0): string {
 }
 $userId = $user->id();
 
-$forumMan = new Gazelle\Manager\Forum;
+$forumMan = new Gazelle\Manager\Forum();
 $forumList = array_map(fn($f) => new Gazelle\Forum($f), $forumMan->forumList());
-$items = (new Gazelle\Manager\ForumTransition)->userTransitionList($user);
+$items = (new Gazelle\Manager\ForumTransition())->userTransitionList($user);
 
 View::show_header('Forum Transitions');
 ?>
diff --git a/sections/tools/managers/global_notification.php b/sections/tools/managers/global_notification.php
index e6208b38b..0b8508020 100644
--- a/sections/tools/managers/global_notification.php
+++ b/sections/tools/managers/global_notification.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$global = new Gazelle\Notification\GlobalNotification;
+$global = new Gazelle\Notification\GlobalNotification();
 if (isset($_POST['set'])) {
     $global->create($_POST['title'], $_POST['url'], $_POST['level'], (int)$_POST['length']);
 } elseif (isset($_POST['delete'])) {
diff --git a/sections/tools/managers/invite_source.php b/sections/tools/managers/invite_source.php
index 7c258f4a2..b1a2cae4c 100644
--- a/sections/tools/managers/invite_source.php
+++ b/sections/tools/managers/invite_source.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->find(trim($_POST['user'] ?? ''));
+$user = (new Gazelle\Manager\User())->find(trim($_POST['user'] ?? ''));
 if ($user) {
     header('Location: ' . $user->location() . "#invite_source");
     exit;
@@ -12,5 +12,5 @@
 
 echo $Twig->render('admin/invite-source.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\InviteSource)->summaryByInviter(),
+    'list' => (new Gazelle\Manager\InviteSource())->summaryByInviter(),
 ]);
diff --git a/sections/tools/managers/invite_source_config.php b/sections/tools/managers/invite_source_config.php
index 5d8bb5f51..0758d8397 100644
--- a/sections/tools/managers/invite_source_config.php
+++ b/sections/tools/managers/invite_source_config.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$manager = new Gazelle\Manager\InviteSource;
+$manager = new Gazelle\Manager\InviteSource();
 if (!empty($_POST['name'])) {
     authorize();
     $manager->create(trim($_POST['name']));
diff --git a/sections/tools/managers/ip_search.php b/sections/tools/managers/ip_search.php
index 00da45c89..4aebf6e7f 100644
--- a/sections/tools/managers/ip_search.php
+++ b/sections/tools/managers/ip_search.php
@@ -19,7 +19,7 @@
     default                => '',
 };
 if ($text) {
-    $search = (new Gazelle\Search\IPv4(new Gazelle\Search\ASN))
+    $search = (new Gazelle\Search\IPv4(new Gazelle\Search\ASN()))
         ->create('search_' . getmypid())
         ->setColumn($column)
         ->setDirection($direction);
diff --git a/sections/tools/managers/manipulate_tree.php b/sections/tools/managers/manipulate_tree.php
index 38e0306cf..9e0ea738f 100644
--- a/sections/tools/managers/manipulate_tree.php
+++ b/sections/tools/managers/manipulate_tree.php
@@ -21,7 +21,7 @@
     if (!$_POST['comment']) {
         error('Please enter a comment to add to the users affected.');
     }
-    $userMan = new Gazelle\Manager\User;
+    $userMan = new Gazelle\Manager\User();
     $user = $userMan->find(trim($_POST['id']));
     if (is_null($user)) {
         error(404);
@@ -59,7 +59,7 @@
                 if ($doComment) {
                     $invitee->addStaffNote($comment)->modify();
                 } elseif ($doDisable) {
-                    $userMan->disableUserList(new Gazelle\Tracker, [$inviteeId], $comment, Gazelle\Manager\User::DISABLE_TREEBAN);
+                    $userMan->disableUserList(new Gazelle\Tracker(), [$inviteeId], $comment, Gazelle\Manager\User::DISABLE_TREEBAN);
                 } elseif ($doInvites) {
                     $invitee->toggleAttr('disable-invites', true);
                     $invitee->addStaffNote($comment)->modify();
diff --git a/sections/tools/managers/mass_pm.php b/sections/tools/managers/mass_pm.php
index 558bf91d5..a03d2db36 100644
--- a/sections/tools/managers/mass_pm.php
+++ b/sections/tools/managers/mass_pm.php
@@ -7,5 +7,5 @@
 echo $Twig->render('admin/mass-pm.twig', [
     'auth'  => $Viewer->auth(),
     'body'  => new Gazelle\Util\Textarea('body', '', 95, 10),
-    'class' => (new Gazelle\Manager\User)->classList(),
+    'class' => (new Gazelle\Manager\User())->classList(),
 ]);
diff --git a/sections/tools/managers/navigation_alter.php b/sections/tools/managers/navigation_alter.php
index a1a77e3e9..705741218 100644
--- a/sections/tools/managers/navigation_alter.php
+++ b/sections/tools/managers/navigation_alter.php
@@ -8,7 +8,7 @@
 
 authorize();
 
-$manager = new Gazelle\Manager\UserNavigation;
+$manager = new Gazelle\Manager\UserNavigation();
 
 if ($_POST['submit'] == 'Delete') {
     $id = (int)($_POST['id'] ?? 0);
@@ -18,7 +18,7 @@
     }
     $control->remove();
 } else {
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['tag',       true, 'string', 'The key must be set, and has a max length of 20 characters', ['maxlength' => 20]],
         ['title',     true, 'string', 'The title must be set, and has a max length of 50 characters', ['maxlength' => 50]],
diff --git a/sections/tools/managers/navigation_list.php b/sections/tools/managers/navigation_list.php
index 4f49322a5..2a3161e48 100644
--- a/sections/tools/managers/navigation_list.php
+++ b/sections/tools/managers/navigation_list.php
@@ -6,5 +6,5 @@
 
 echo $Twig->render('admin/user-navigation.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\UserNavigation)->fullList(),
+    'list' => (new Gazelle\Manager\UserNavigation())->fullList(),
 ]);
diff --git a/sections/tools/managers/news.php b/sections/tools/managers/news.php
index 1b3b3d07b..e0fc90401 100644
--- a/sections/tools/managers/news.php
+++ b/sections/tools/managers/news.php
@@ -6,7 +6,7 @@
     error(403);
 }
 
-$newsMan = new Gazelle\Manager\News;
+$newsMan = new Gazelle\Manager\News();
 $create  = false;
 $title   = '';
 $body    = '';
diff --git a/sections/tools/managers/ocelot.php b/sections/tools/managers/ocelot.php
index 8508e5fa4..59b98f9c0 100644
--- a/sections/tools/managers/ocelot.php
+++ b/sections/tools/managers/ocelot.php
@@ -11,4 +11,4 @@
     error(403);
 }
 
-(new Gazelle\Tracker)->expireFreeleechTokens($_GET['tokens']);
+(new Gazelle\Tracker())->expireFreeleechTokens($_GET['tokens']);
diff --git a/sections/tools/managers/ocelot_info.php b/sections/tools/managers/ocelot_info.php
index 55f119637..736e27150 100644
--- a/sections/tools/managers/ocelot_info.php
+++ b/sections/tools/managers/ocelot_info.php
@@ -4,13 +4,13 @@
     error(403);
 }
 
-$tracker = new Gazelle\Tracker;
+$tracker = new Gazelle\Tracker();
 $stats   = false;
 $user    = null;
 $info    = $tracker->info();
 
 if (isset($_GET['userid'])) {
-    $user = (new Gazelle\Manager\User)->find($_GET['userid']);
+    $user = (new Gazelle\Manager\User())->find($_GET['userid']);
     if ($user) {
         $stats = $tracker->userReport($user);
         $_GET['userid'] = $user->id(); // change @user to id
diff --git a/sections/tools/managers/privilege_matrix.php b/sections/tools/managers/privilege_matrix.php
index d013b979b..4f55daf8c 100644
--- a/sections/tools/managers/privilege_matrix.php
+++ b/sections/tools/managers/privilege_matrix.php
@@ -5,8 +5,8 @@
 }
 
 echo $Twig->render('admin/privilege-matrix.twig', [
-    'class_list' => (new Gazelle\Manager\User)->classList(),
-    'privilege'  => (new Gazelle\Manager\Privilege)->privilege(),
+    'class_list' => (new Gazelle\Manager\User())->classList(),
+    'privilege'  => (new Gazelle\Manager\Privilege())->privilege(),
     'star'       => "\xE2\x98\x85",
     'tick'       => ICON_ALL,
 ]);
diff --git a/sections/tools/managers/quick_ban.php b/sections/tools/managers/quick_ban.php
index a00932c6a..14aadd831 100644
--- a/sections/tools/managers/quick_ban.php
+++ b/sections/tools/managers/quick_ban.php
@@ -5,7 +5,7 @@
 }
 
 if (isset($_GET['perform'])) {
-    $IPv4Man = new Gazelle\Manager\IPv4;
+    $IPv4Man = new Gazelle\Manager\IPv4();
     if ($_GET['perform'] == 'delete') {
         $IPv4Man->removeBan((int)$_GET['id']);
     } elseif ($_GET['perform'] == 'create') {
diff --git a/sections/tools/managers/rate_limit.php b/sections/tools/managers/rate_limit.php
index 3a074026f..ce8607786 100644
--- a/sections/tools/managers/rate_limit.php
+++ b/sections/tools/managers/rate_limit.php
@@ -4,14 +4,14 @@
     error(403);
 }
 
-$limiter = new Gazelle\Manager\UserclassRateLimit;
+$limiter = new Gazelle\Manager\UserclassRateLimit();
 if ($_POST) {
     authorize();
     $remove = array_key_extract_suffix('remove-', $_POST);
     if (count($remove) == 1) {
         $limiter->remove($remove[0]);
     } elseif ($_POST['task'] === 'add') {
-        $val = new Gazelle\Util\Validator;
+        $val = new Gazelle\Util\Validator();
         $val->setFields([
             ['class', true, 'number', 'class must be set'],
             ['factor', true, 'number', 'factor must be set (usually, a number larger than 1.0)', ['minlength' => 1, 'allowperiod' => true]],
@@ -27,8 +27,8 @@
 }
 
 echo $Twig->render('admin/rate-limiting.twig', [
-    'class_list' => (new Gazelle\Manager\User)->classList(),
-    'priv_list'  => (new Gazelle\Manager\Privilege)->privilegeList(),
+    'class_list' => (new Gazelle\Manager\User())->classList(),
+    'priv_list'  => (new Gazelle\Manager\Privilege())->privilegeList(),
     'rate_list'  => $limiter->list(),
     'viewer'     => $Viewer,
 ]);
diff --git a/sections/tools/managers/reaper.php b/sections/tools/managers/reaper.php
index 143ce57e2..8c6211013 100644
--- a/sections/tools/managers/reaper.php
+++ b/sections/tools/managers/reaper.php
@@ -5,7 +5,7 @@
 }
 
 $affected = false;
-$reaper   = new Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User);
+$reaper   = new Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User());
 
 $extend = array_key_extract_suffix('extend-', $_POST);
 if ($extend) {
diff --git a/sections/tools/managers/referral_accounts.php b/sections/tools/managers/referral_accounts.php
index d570b38f6..6155b6f7b 100644
--- a/sections/tools/managers/referral_accounts.php
+++ b/sections/tools/managers/referral_accounts.php
@@ -16,7 +16,7 @@ function type_list(array $Types, int $Selected = 0): string {
     error(403);
 }
 
-$ReferralManager = new Gazelle\Manager\Referral;
+$ReferralManager = new Gazelle\Manager\Referral();
 $ReferralAccounts = $ReferralManager->getFullAccounts();
 
 View::show_header('Referral Accounts');
diff --git a/sections/tools/managers/referral_alter.php b/sections/tools/managers/referral_alter.php
index 1405ae552..71513f07a 100644
--- a/sections/tools/managers/referral_alter.php
+++ b/sections/tools/managers/referral_alter.php
@@ -6,7 +6,7 @@
 
 authorize();
 
-$ReferralManager = new Gazelle\Manager\Referral;
+$ReferralManager = new Gazelle\Manager\Referral();
 
 if ($_POST['submit'] == 'Delete') {
     $id = (int)$_POST['id'];
@@ -15,7 +15,7 @@
     }
     $ReferralManager->deleteAccount($id);
 } else {
-    $Val = new Gazelle\Util\Validator;
+    $Val = new Gazelle\Util\Validator();
     $Val->setFields([
         ['site', true, 'string', 'The site must be set, and has a max length of 30 characters', ['maxlength' => 30]],
         ['url', true, 'string', 'The URL must be set, and has a max length of 30 characters', ['maxlength' => 30]],
diff --git a/sections/tools/managers/referral_users.php b/sections/tools/managers/referral_users.php
index 478edca84..af8fe774a 100644
--- a/sections/tools/managers/referral_users.php
+++ b/sections/tools/managers/referral_users.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$ReferralManager = new Gazelle\Manager\Referral;
+$ReferralManager = new Gazelle\Manager\Referral();
 
 if (isset($_POST['id'])) {
     authorize();
diff --git a/sections/tools/managers/ssl_host.php b/sections/tools/managers/ssl_host.php
index 2e132d657..fb98f9db8 100644
--- a/sections/tools/managers/ssl_host.php
+++ b/sections/tools/managers/ssl_host.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$ssl = new Gazelle\Manager\SSLHost;
+$ssl = new Gazelle\Manager\SSLHost();
 
 $remove = array_key_extract_suffix('id-', $_POST);
 if ($remove) {
diff --git a/sections/tools/managers/staff_groups_alter.php b/sections/tools/managers/staff_groups_alter.php
index 649c7398a..1781fe121 100644
--- a/sections/tools/managers/staff_groups_alter.php
+++ b/sections/tools/managers/staff_groups_alter.php
@@ -5,7 +5,7 @@
 }
 
 authorize();
-$manager = new Gazelle\Manager\StaffGroup;
+$manager = new Gazelle\Manager\StaffGroup();
 $staffGroup = $manager->findById((int)($_POST['id'] ?? 0));
 
 if ($_POST['submit'] == 'Delete') {
@@ -14,7 +14,7 @@
     }
     $staffGroup->remove();
 } else {
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['sort', true, 'number', 'Sort must be set'],
         ['name', true, 'string', 'Name must be set, and has a max length of 50 characters', ['maxlength' => 50]],
diff --git a/sections/tools/managers/staff_groups_list.php b/sections/tools/managers/staff_groups_list.php
index 4d138ddae..6c45551c5 100644
--- a/sections/tools/managers/staff_groups_list.php
+++ b/sections/tools/managers/staff_groups_list.php
@@ -6,5 +6,5 @@
 
 echo $Twig->render('admin/staff-group.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\StaffGroup)->groupList(),
+    'list' => (new Gazelle\Manager\StaffGroup())->groupList(),
 ]);
diff --git a/sections/tools/managers/stylesheets_list.php b/sections/tools/managers/stylesheets_list.php
index c1fe576ff..2541b94b0 100644
--- a/sections/tools/managers/stylesheets_list.php
+++ b/sections/tools/managers/stylesheets_list.php
@@ -13,5 +13,5 @@
 
 echo $Twig->render('admin/stylesheet.twig', [
     'heading' => $heading,
-    'list'    => (new Gazelle\Manager\Stylesheet)->usageList($heading->getOrderBy(), $heading->getOrderDir()),
+    'list'    => (new Gazelle\Manager\Stylesheet())->usageList($heading->getOrderBy(), $heading->getOrderDir()),
 ]);
diff --git a/sections/tools/managers/tags.php b/sections/tools/managers/tags.php
index 698900880..2868c219b 100644
--- a/sections/tools/managers/tags.php
+++ b/sections/tools/managers/tags.php
@@ -4,12 +4,12 @@
     error(403);
 }
 
-$Val = new Gazelle\Util\Validator;
+$Val = new Gazelle\Util\Validator();
 $Val->setFields([
     ['tag',     true, 'string', 'Enter a single tag to change.', ['range' => [2, 100]]],
     ['replace', true, 'string', 'Enter a single replacement name.', ['range' => [2, 100]]],
 ]);
-$tagMan = new Gazelle\Manager\Tag;
+$tagMan = new Gazelle\Manager\Tag();
 
 View::show_header('Batch Tag Editor', ['js' => 'validate']);
 echo $Val->generateJS('tagform');
diff --git a/sections/tools/managers/tags_aliases.php b/sections/tools/managers/tags_aliases.php
index 31bcf922c..69c4c39d8 100644
--- a/sections/tools/managers/tags_aliases.php
+++ b/sections/tools/managers/tags_aliases.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$tagMan = new Gazelle\Manager\Tag;
+$tagMan = new Gazelle\Manager\Tag();
 $action = null;
 $result = null;
 if ($Viewer->permitted('users_mod')) {
diff --git a/sections/tools/managers/tags_official.php b/sections/tools/managers/tags_official.php
index d5247f534..700bd6778 100644
--- a/sections/tools/managers/tags_official.php
+++ b/sections/tools/managers/tags_official.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$tagMan = new Gazelle\Manager\Tag;
+$tagMan = new Gazelle\Manager\Tag();
 
 $unofficialName = [];
 if ($_POST['oldtags'] ?? null) {
diff --git a/sections/tools/managers/take_mass_pm.php b/sections/tools/managers/take_mass_pm.php
index bf84490b3..b521b6eb7 100644
--- a/sections/tools/managers/take_mass_pm.php
+++ b/sections/tools/managers/take_mass_pm.php
@@ -21,7 +21,7 @@
     ", $permissionId, $Viewer->id(), $permissionId, $Viewer->id()
 );
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $subject = trim($_POST['subject']);
 $body    = trim($_POST['body']);
 while ([$userId] = $db->next_record()) {
diff --git a/sections/tools/managers/tokens.php b/sections/tools/managers/tokens.php
index 48981c11f..51f07a49d 100644
--- a/sections/tools/managers/tokens.php
+++ b/sections/tools/managers/tokens.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $amount = (int)($_POST['numtokens'] ?? 0);
 $flAdded = false;
 $flCleared = false;
diff --git a/sections/tools/managers/tor_node.php b/sections/tools/managers/tor_node.php
index dedbabc18..d22737407 100644
--- a/sections/tools/managers/tor_node.php
+++ b/sections/tools/managers/tor_node.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$tor = new Gazelle\Manager\Tor;
+$tor = new Gazelle\Manager\Tor();
 
 if (isset($_POST['exitlist'])) {
     authorize();
diff --git a/sections/tools/managers/torrent_report_edit.php b/sections/tools/managers/torrent_report_edit.php
index 493801959..64332f876 100644
--- a/sections/tools/managers/torrent_report_edit.php
+++ b/sections/tools/managers/torrent_report_edit.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$config = (new Gazelle\Manager\Torrent\ReportType)->findById((int)($_GET['id'] ?? 0));
+$config = (new Gazelle\Manager\Torrent\ReportType())->findById((int)($_GET['id'] ?? 0));
 if (is_null($config)) {
     error(404);
 }
@@ -61,7 +61,7 @@
 }
 
 echo $Twig->render('admin/torrent-report-edit.twig', [
-    'category'    => (new Gazelle\Manager\Category)->categoryList(),
+    'category'    => (new Gazelle\Manager\Category())->categoryList(),
     'config'      => $config,
     'pm'          => new Gazelle\Util\Textarea('pm_body', $config->pmBody() ?? ''),
     'explanation' => new Gazelle\Util\Textarea('explanation', $config->explanation()),
diff --git a/sections/tools/managers/torrent_report_view.php b/sections/tools/managers/torrent_report_view.php
index 0f83a23a8..f04aaee29 100644
--- a/sections/tools/managers/torrent_report_view.php
+++ b/sections/tools/managers/torrent_report_view.php
@@ -5,6 +5,6 @@
 }
 
 echo $Twig->render('admin/torrent-report-view.twig', [
-    'list'   => (new Gazelle\Manager\Torrent\ReportType)->list(),
+    'list'   => (new Gazelle\Manager\Torrent\ReportType())->list(),
     'viewer' => $Viewer,
 ]);
diff --git a/sections/tools/managers/userclass_alter.php b/sections/tools/managers/userclass_alter.php
index fc7488e65..129bec684 100644
--- a/sections/tools/managers/userclass_alter.php
+++ b/sections/tools/managers/userclass_alter.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$privMan = new Gazelle\Manager\Privilege;
+$privMan = new Gazelle\Manager\Privilege();
 
 $privilege = $privMan->findById((int)($_REQUEST['removeid'] ?? 0));
 if ($privilege) {
@@ -23,7 +23,7 @@
 
 if (isset($_REQUEST['submit'])) {
     authorize();
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['name', true, 'string', 'You did not enter a valid name for this permission set.'],
         ['level', true, 'number', 'You did not enter a valid level for this permission set.'],
@@ -52,7 +52,7 @@
     $forums       = $_REQUEST['forums'];
     $displayStaff = isset($_REQUEST['displaystaff']);
     $staffGroupId = $displayStaff
-        ? (new Gazelle\Manager\StaffGroup)->findById((int)($_REQUEST['staffgroup'] ?? 0))?->id()
+        ? (new Gazelle\Manager\StaffGroup())->findById((int)($_REQUEST['staffgroup'] ?? 0))?->id()
         : null;
     $level        = (int)$_REQUEST['level'];
     $secondary    = (int)isset($_REQUEST['secondary']);
@@ -79,7 +79,7 @@
         ->setField('`Values`', serialize($values))
         ->modify();
 
-    $usersAffected = (new Gazelle\Manager\User)->flushUserclass($privilege->id());
+    $usersAffected = (new Gazelle\Manager\User())->flushUserclass($privilege->id());
 }
 
 require_once('userclass_edit.php');
diff --git a/sections/tools/managers/userclass_edit.php b/sections/tools/managers/userclass_edit.php
index 8259ad4f8..92d84b79b 100644
--- a/sections/tools/managers/userclass_edit.php
+++ b/sections/tools/managers/userclass_edit.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$privMan = new Gazelle\Manager\Privilege;
+$privMan = new Gazelle\Manager\Privilege();
 
 $privilege = null;
 if (isset($_REQUEST['id']) && $_REQUEST['id'] !== 'new') {
@@ -18,8 +18,8 @@
 echo $Twig->render('admin/privilege-edit.twig', [
     'edited'     => isset($usersAffected),
     'edit_total' => $usersAffected ?? 0,
-    'js'         => (new Gazelle\Util\Validator)->generateJS('permissionsform'),
-    'group_list' => (new Gazelle\Manager\StaffGroup)->groupList(),
+    'js'         => (new Gazelle\Util\Validator())->generateJS('permissionsform'),
+    'group_list' => (new Gazelle\Manager\StaffGroup())->groupList(),
     'privilege'  => $privilege,
     'viewer'     => $Viewer,
 ]);
diff --git a/sections/tools/managers/userclass_list.php b/sections/tools/managers/userclass_list.php
index a460791ec..cca87cfea 100644
--- a/sections/tools/managers/userclass_list.php
+++ b/sections/tools/managers/userclass_list.php
@@ -10,6 +10,6 @@
 }
 
 echo $Twig->render('admin/privilege-usage.twig', [
-    'list'   => (new Gazelle\Manager\Privilege)->usageList(),
+    'list'   => (new Gazelle\Manager\Privilege())->usageList(),
     'viewer' => $Viewer,
 ]);
diff --git a/sections/tools/managers/whitelist_alter.php b/sections/tools/managers/whitelist_alter.php
index 85d59b90d..9ab35cbd4 100644
--- a/sections/tools/managers/whitelist_alter.php
+++ b/sections/tools/managers/whitelist_alter.php
@@ -6,8 +6,8 @@
 
 authorize();
 
-$tracker   = new Gazelle\Tracker;
-$whitelist = new Gazelle\Manager\ClientWhitelist;
+$tracker   = new Gazelle\Tracker();
+$whitelist = new Gazelle\Manager\ClientWhitelist();
 
 $submitAction = $_POST['submit'] ?? null;
 
diff --git a/sections/tools/managers/whitelist_list.php b/sections/tools/managers/whitelist_list.php
index 47c2a50a7..17dd00b9e 100644
--- a/sections/tools/managers/whitelist_list.php
+++ b/sections/tools/managers/whitelist_list.php
@@ -6,5 +6,5 @@
 
 echo $Twig->render('admin/client-whitelist.twig', [
     'auth' => $Viewer->auth(),
-    'list' => (new Gazelle\Manager\ClientWhitelist)->list(),
+    'list' => (new Gazelle\Manager\ClientWhitelist())->list(),
 ]);
diff --git a/sections/tools/sandboxes/db_sandbox.php b/sections/tools/sandboxes/db_sandbox.php
index 20fdad309..d0986a654 100644
--- a/sections/tools/sandboxes/db_sandbox.php
+++ b/sections/tools/sandboxes/db_sandbox.php
@@ -9,7 +9,7 @@
     $query = html_entity_decode(base64_decode($_GET['debug']));
     $textAreaRows = max(8, substr_count($query, "\n") + 2);
 } elseif (isset($_GET['table'])) {
-    $query = (new Gazelle\DB)->selectQuery($_GET['table']);
+    $query = (new Gazelle\DB())->selectQuery($_GET['table']);
     $textAreaRows = max(8, substr_count($query, "\n") + 2);
 } elseif (!empty($_POST['query'])) {
     $query = trim($_POST['query']);
diff --git a/sections/tools/sandboxes/notification.php b/sections/tools/sandboxes/notification.php
index bcd6c284a..efd30b312 100644
--- a/sections/tools/sandboxes/notification.php
+++ b/sections/tools/sandboxes/notification.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 
 $notifiedId   = null;
 $result       = [];
@@ -14,7 +14,7 @@
 
     $result = $notification->userFilterList();
     if (isset($_POST['notifiedid'])) {
-        $notified = (new Gazelle\Manager\User)->find(trim($_POST['notifiedid']));
+        $notified = (new Gazelle\Manager\User())->find(trim($_POST['notifiedid']));
         if ($notified) {
             $notifiedId = $notified->id();
             $result = array_filter($result, fn($r) => $r['user_id'] === $notifiedId);
diff --git a/sections/tools/sandboxes/referral_sandbox.php b/sections/tools/sandboxes/referral_sandbox.php
index 330f872ea..736be7876 100644
--- a/sections/tools/sandboxes/referral_sandbox.php
+++ b/sections/tools/sandboxes/referral_sandbox.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$referralManager = new Gazelle\Manager\Referral;
+$referralManager = new Gazelle\Manager\Referral();
 $referralAccounts = $referralManager->getFullAccounts();
 
 $cookie = [];
diff --git a/sections/tools/tools.php b/sections/tools/tools.php
index d3bcd0d08..7e85c7358 100644
--- a/sections/tools/tools.php
+++ b/sections/tools/tools.php
@@ -7,7 +7,7 @@
 /** @var \Gazelle\User $Viewer phpstan is dense */
 echo $Twig->render('admin/toolbox.twig', [
     'applicant_viewer' => (bool)array_filter(
-        (new Gazelle\Manager\ApplicantRole)->publishedList(),
+        (new Gazelle\Manager\ApplicantRole())->publishedList(),
         fn($r) => $r->isStaffViewer($Viewer)
     ),
     'viewer' => $Viewer,
diff --git a/sections/top10/donors.php b/sections/top10/donors.php
index 46ad184bf..f8c2e45f0 100644
--- a/sections/top10/donors.php
+++ b/sections/top10/donors.php
@@ -6,5 +6,5 @@
 echo $Twig->render('top10/donor.twig', [
     'is_mod' => $Viewer->permitted("users_mod"),
     'limit'  => $limit,
-    'list'   => (new Gazelle\Manager\Donation)->topDonorList($limit, new Gazelle\Manager\User),
+    'list'   => (new Gazelle\Manager\Donation())->topDonorList($limit, new Gazelle\Manager\User()),
 ]);
diff --git a/sections/top10/history.php b/sections/top10/history.php
index b5953c13e..50bae6858 100644
--- a/sections/top10/history.php
+++ b/sections/top10/history.php
@@ -15,7 +15,7 @@
     if (!\Gazelle\Util\Time::validDate($date . ' 00:00:00')) {
         error('That does not look like a date');
     }
-    $list = (new Gazelle\Manager\Torrent)->topTenHistoryList($date, $isByDay);
+    $list = (new Gazelle\Manager\Torrent())->topTenHistoryList($date, $isByDay);
 }
 
 echo $Twig->render('top10/history.twig', [
diff --git a/sections/top10/lastfm.php b/sections/top10/lastfm.php
index 8651cf0e6..7046ae6e1 100644
--- a/sections/top10/lastfm.php
+++ b/sections/top10/lastfm.php
@@ -6,7 +6,7 @@
 $View = $_GET['view'] ?? 'tiles';
 $View = in_array($View, ['tiles', 'list']) ? $View : 'tiles';
 
-$lastFM = new Gazelle\Util\LastFM;
+$lastFM = new Gazelle\Util\LastFM();
 switch ($Category) {
     case 'weekly':
         $Artists = $lastFM->weeklyArtists();
diff --git a/sections/top10/tags.php b/sections/top10/tags.php
index 894bdd781..97f31abc6 100644
--- a/sections/top10/tags.php
+++ b/sections/top10/tags.php
@@ -7,7 +7,7 @@
 $limit = $_GET['limit'] ?? 10;
 $limit = in_array($limit, [10, 100, 250]) ? $limit : 10;
 
-$tag = new Gazelle\Manager\Tag;
+$tag = new Gazelle\Manager\Tag();
 
 View::show_header(TOP_TEN_HEADING . " – Tags");
 ?>
diff --git a/sections/top10/torrents.php b/sections/top10/torrents.php
index 52b88e399..97ae6b348 100644
--- a/sections/top10/torrents.php
+++ b/sections/top10/torrents.php
@@ -1,6 +1,6 @@
 <?php
 
-$torMan    = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$torMan    = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $reportMan = new Gazelle\Manager\Torrent\Report($torMan);
 $bookmark  = new Gazelle\User\Bookmark($Viewer);
 $snatcher  = $Viewer->snatch();
diff --git a/sections/top10/users.php b/sections/top10/users.php
index 6cc963e74..98bf0ff33 100644
--- a/sections/top10/users.php
+++ b/sections/top10/users.php
@@ -1,6 +1,6 @@
 <?php
 
-$top10 = new Gazelle\Top10\User;
+$top10 = new Gazelle\Top10\User();
 $tables = [
     'ul' => [
         'Title' => 'Uploaders',
diff --git a/sections/top10/votes.php b/sections/top10/votes.php
index 2db511df2..dc6a28fb4 100644
--- a/sections/top10/votes.php
+++ b/sections/top10/votes.php
@@ -1,7 +1,7 @@
 <?php
 
 $vote = new Gazelle\User\Vote($Viewer);
-$tagMan = new Gazelle\Manager\Tag;
+$tagMan = new Gazelle\Manager\Tag();
 
 $all = ($_GET['anyall'] ?? 'all') === 'all';
 
@@ -29,8 +29,8 @@
 $bookmark     = new Gazelle\User\Bookmark($Viewer);
 $snatcher     = $Viewer->snatch();
 $imgProxy     = new Gazelle\Util\ImageProxy($Viewer);
-$tgMan        = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$torMan       = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$tgMan        = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$torMan       = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $urlStem      = (new Gazelle\User\Stylesheet($Viewer))->imagePath();
 $topVotes     = $vote->topVotes();
 $number       = 0;
diff --git a/sections/torrents/add_alias.php b/sections/torrents/add_alias.php
index fc30c38fe..c0fda5b50 100644
--- a/sections/torrents/add_alias.php
+++ b/sections/torrents/add_alias.php
@@ -1,12 +1,12 @@
 <?php
 authorize();
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroup = $tgMan->findById((int)$_POST['groupid']);
 if (is_null($tgroup)) {
     error(404);
 }
 
-$tgroup->addArtists($_POST['importance'], $_POST['aliasname'], $Viewer, new Gazelle\Manager\Artist, new Gazelle\Log);
+$tgroup->addArtists($_POST['importance'], $_POST['aliasname'], $Viewer, new Gazelle\Manager\Artist(), new Gazelle\Log());
 
 header('Location: ' . redirectUrl($tgroup->location()));
diff --git a/sections/torrents/add_cover_art.php b/sections/torrents/add_cover_art.php
index 869b84fc7..9ba830ece 100644
--- a/sections/torrents/add_cover_art.php
+++ b/sections/torrents/add_cover_art.php
@@ -11,13 +11,13 @@
     error('Missing an image or a summary');
 }
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)($_POST['groupid'] ?? 0));
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)($_POST['groupid'] ?? 0));
 if (is_null($tgroup)) {
     error(404);
 }
 
 $imgProxy = new Gazelle\Util\ImageProxy($Viewer);
-$logger   = new Gazelle\Log;
+$logger   = new Gazelle\Log();
 
 foreach ($imageList as $n => $image) {
     $image = trim($image);
diff --git a/sections/torrents/autocomplete_tags.php b/sections/torrents/autocomplete_tags.php
index b81d4c3a7..79f651173 100644
--- a/sections/torrents/autocomplete_tags.php
+++ b/sections/torrents/autocomplete_tags.php
@@ -2,7 +2,7 @@
 
 header('Content-Type: application/json; charset=utf-8');
 
-$tagMan = new \Gazelle\Manager\Tag;
+$tagMan = new \Gazelle\Manager\Tag();
 $word = $tagMan->sanitize($_GET['query']);
 
 echo json_encode([
diff --git a/sections/torrents/browse.php b/sections/torrents/browse.php
index b24962f60..5d17de000 100644
--- a/sections/torrents/browse.php
+++ b/sections/torrents/browse.php
@@ -2,10 +2,10 @@
 
 use Gazelle\Util\SortableTableHeader;
 
-$torMan    = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$torMan    = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $reportMan = new Gazelle\Manager\Torrent\Report($torMan);
-$tagMan    = new Gazelle\Manager\Tag;
-$tgMan     = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
+$tagMan    = new Gazelle\Manager\Tag();
+$tgMan     = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
 $snatcher  = $Viewer->snatch();
 
 if (!empty($_GET['searchstr']) || !empty($_GET['groupname'])) {
@@ -53,8 +53,8 @@
 
 $paginator = new Gazelle\Util\Paginator(TORRENTS_PER_PAGE, (int)($_GET['page'] ?? 1));
 $Search = new Gazelle\Search\Torrent(
-    new Gazelle\Manager\TGroup,
-    new Gazelle\Manager\Torrent,
+    new Gazelle\Manager\TGroup(),
+    new Gazelle\Manager\Torrent(),
     $GroupResults,
     $header->getSortKey(),
     $header->getOrderDir(),
@@ -99,7 +99,7 @@
     'hide_remaster' => ($_GET['remastertitle'] ?? $_GET['remasteryear'] ?? $_GET['remastercataloguenumber'] ?? '') != ''
         ? '' : ' hidden',
     'hide_advanced' => $hideAdvanced,
-    'release_type'  => (new Gazelle\ReleaseType)->list(),
+    'release_type'  => (new Gazelle\ReleaseType())->list(),
     'results_total' => $RealNumResults,
     'results_shown' => $NumResults,
     'search_mode'   => $searchMode,
@@ -118,7 +118,7 @@
     exit;
 }
 
-$releaseTypes = (new Gazelle\ReleaseType)->list();
+$releaseTypes = (new Gazelle\ReleaseType())->list();
 $bookmark = new \Gazelle\User\Bookmark($Viewer);
 $imgProxy = new Gazelle\Util\ImageProxy($Viewer);
 
diff --git a/sections/torrents/collector.php b/sections/torrents/collector.php
index ad1e937fa..99191ce6e 100644
--- a/sections/torrents/collector.php
+++ b/sections/torrents/collector.php
@@ -15,7 +15,7 @@
         break;
     case 'seedbox':
         authorize();
-        $user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+        $user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
         if (is_null($user)) {
             error(404);
         }
@@ -34,7 +34,7 @@
     error(0);
 }
 
-$collector = new Gazelle\Collector\TList($Viewer, new Gazelle\Manager\Torrent, $title, 0);
+$collector = new Gazelle\Collector\TList($Viewer, new Gazelle\Manager\Torrent(), $title, 0);
 $collector->setList($ids);
 if (!$collector->prepare([])) {
     error("Nothing to gather, choose some encodings and bitrates!");
diff --git a/sections/torrents/delete.php b/sections/torrents/delete.php
index 0c4fdbc6d..36cc318b6 100644
--- a/sections/torrents/delete.php
+++ b/sections/torrents/delete.php
@@ -2,10 +2,10 @@
 
 use Gazelle\Util\Time;
 
-$torMan        = new Gazelle\Manager\Torrent;
+$torMan        = new Gazelle\Manager\Torrent();
 $reportMan     = new Gazelle\Manager\Torrent\Report($torMan);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
-$userMan       = new Gazelle\Manager\User;
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
+$userMan       = new Gazelle\Manager\User();
 
 $torrent = $torMan->findById((int)($_GET['torrentid'] ?? 0));
 if (is_null($torrent)) {
diff --git a/sections/torrents/delete_alias.php b/sections/torrents/delete_alias.php
index 51d81b85c..81d58f304 100644
--- a/sections/torrents/delete_alias.php
+++ b/sections/torrents/delete_alias.php
@@ -9,19 +9,19 @@
 if (!$role) {
     error(0);
 }
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroup = $tgMan->findById((int)$_GET['groupid']);
 if (is_null($tgroup)) {
     error(404);
 }
-$artist = (new Gazelle\Manager\Artist)->findById((int)$_GET['artistid']);
+$artist = (new Gazelle\Manager\Artist())->findById((int)$_GET['artistid']);
 if (is_null($artist)) {
     error(404);
 }
 $artistId = $artist->id();
 $artistName = $artist->name();
 
-$logger = new Gazelle\Log;
+$logger = new Gazelle\Log();
 if ($tgroup->removeArtist($artist, $role, $Viewer, $logger)) {
     $tgroup->refresh();
 }
diff --git a/sections/torrents/delete_handle.php b/sections/torrents/delete_handle.php
index 73710e7da..c5c52bf46 100644
--- a/sections/torrents/delete_handle.php
+++ b/sections/torrents/delete_handle.php
@@ -1,7 +1,7 @@
 <?php
 authorize();
 
-$torrent = (new Gazelle\Manager\Torrent)->setViewer($Viewer)->findById((int)$_POST['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->setViewer($Viewer)->findById((int)$_POST['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
@@ -29,7 +29,7 @@
     error($message);
 }
 
-(new Gazelle\Manager\User)->sendRemovalPm(
+(new Gazelle\Manager\User())->sendRemovalPm(
     $torrentId, $uploaderId, $fullName,
     "Torrent $torrentId $fullName (" . number_format($size / (1024 * 1024), 2) . ' MiB '
         . strtoupper($infohash) . ") was deleted by " . $Viewer->username() . ": $reason",
diff --git a/sections/torrents/details.php b/sections/torrents/details.php
index 11640bd64..fc7a5715b 100644
--- a/sections/torrents/details.php
+++ b/sections/torrents/details.php
@@ -4,7 +4,7 @@
 
 header('Access-Control-Allow-Origin: *');
 
-$tgMan  = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
+$tgMan  = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
 $tgroup = $tgMan->findById((int)($_GET['id'] ?? 0));
 if (is_null($tgroup)) {
     error(404);
@@ -19,18 +19,18 @@
 $paginator = new Gazelle\Util\Paginator(TORRENT_COMMENTS_PER_PAGE, $commentPage->pageNum());
 $paginator->setAnchor('comments')->setTotal($commentPage->total())->removeParam('postid');
 
-$artistMan     = new Gazelle\Manager\Artist;
-$collageMan    = new Gazelle\Manager\Collage;
-$torMan        = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$artistMan     = new Gazelle\Manager\Artist();
+$collageMan    = new Gazelle\Manager\Collage();
+$torMan        = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $reportMan     = new Gazelle\Manager\Torrent\Report($torMan);
-$reportTypeMan = new Gazelle\Manager\Torrent\ReportType;
-$requestMan    = new Gazelle\Manager\Request;
-$userMan       = new Gazelle\Manager\User;
+$reportTypeMan = new Gazelle\Manager\Torrent\ReportType();
+$requestMan    = new Gazelle\Manager\Request();
+$userMan       = new Gazelle\Manager\User();
 $snatcher      = $Viewer->snatch();
 $vote          = new Gazelle\User\Vote($Viewer);
 
 $isSubscribed   = (new Gazelle\User\Subscription($Viewer))->isSubscribedComments('torrents', $tgroupId);
-$releaseTypes   = (new Gazelle\ReleaseType)->list();
+$releaseTypes   = (new Gazelle\ReleaseType())->list();
 $urlStem        = (new Gazelle\User\Stylesheet($Viewer))->imagePath();
 
 $categoryId     = $tgroup->categoryId();
@@ -197,7 +197,7 @@
 
 echo $Twig->render('tgroup/stats.twig', [
     'stats'    => $tgroup->stats(),
-    'featured' => (new Gazelle\Manager\FeaturedAlbum)->findById($tgroupId),
+    'featured' => (new Gazelle\Manager\FeaturedAlbum())->findById($tgroupId),
 ]);
 
 echo $Twig->render('vote/box.twig', [
diff --git a/sections/torrents/download.php b/sections/torrents/download.php
index 91e17eff9..949e3008c 100644
--- a/sections/torrents/download.php
+++ b/sections/torrents/download.php
@@ -3,7 +3,7 @@
 use Gazelle\Enum\DownloadStatus;
 use Gazelle\Util\Irc;
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_REQUEST['id'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_REQUEST['id'] ?? 0));
 if (is_null($torrent)) {
     json_or_error('could not find torrent', 404);
 }
diff --git a/sections/torrents/downloadlist.php b/sections/torrents/downloadlist.php
index 4e688001b..fa87f583e 100644
--- a/sections/torrents/downloadlist.php
+++ b/sections/torrents/downloadlist.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('site_view_torrent_snatchlist')) {
     error(403);
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
diff --git a/sections/torrents/edit.php b/sections/torrents/edit.php
index d9fc7b73c..012336309 100644
--- a/sections/torrents/edit.php
+++ b/sections/torrents/edit.php
@@ -8,7 +8,7 @@
 // most members.                                                        //
 //**********************************************************************//
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_GET['id'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_GET['id'] ?? 0));
 if (is_null($torrent)) {
     error(404);
 }
@@ -22,7 +22,7 @@
 $categoryName = $tgroup->categoryName();
 $isMusic      = $categoryName === 'Music';
 $artist       = $isMusic ? $tgroup->primaryArtist() : null;
-$releaseTypes = (new Gazelle\ReleaseType)->list();
+$releaseTypes = (new Gazelle\ReleaseType())->list();
 
 View::show_header('Edit torrent', ['js' => 'upload,torrent']);
 
@@ -83,7 +83,7 @@
         'Applications', 'Comics', 'E-Books', 'E-Learning Videos' => $uploadForm->simple_form(),
         default => $uploadForm->music_form(
             [],
-            new Gazelle\Manager\TGroup,
+            new Gazelle\Manager\TGroup(),
         ),
     };
     echo $uploadForm->foot(false);
diff --git a/sections/torrents/edit_category_handle.php b/sections/torrents/edit_category_handle.php
index 21520370b..878f4e9ec 100644
--- a/sections/torrents/edit_category_handle.php
+++ b/sections/torrents/edit_category_handle.php
@@ -6,12 +6,12 @@
 
 authorize();
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error('Torrent does not exist!');
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $old = $tgMan->findById((int)($_POST['oldgroupid'] ?? 0));
 if (is_null($old)) {
     error('The source torrent group does not exist!');
@@ -23,7 +23,7 @@
 }
 
 $newCategoryId = (int)($_POST['newcategoryid'] ?? 0);
-$newName = (new Gazelle\Manager\Category)->findNameById($newCategoryId);
+$newName = (new Gazelle\Manager\Category())->findNameById($newCategoryId);
 if (!$newName) {
     error('Bad category');
 } elseif ($newName === $old->categoryName()) {
@@ -38,8 +38,8 @@
     name:        $title,
     releaseType: (int)($_POST['releasetype'] ?? 0),
     year:        (int)($_POST['year'] ?? 0),
-    artistMan:   new Gazelle\Manager\Artist,
-    logger:      new Gazelle\Log,
+    artistMan:   new Gazelle\Manager\Artist(),
+    logger:      new Gazelle\Log(),
     user:        $Viewer,
 );
 
diff --git a/sections/torrents/edit_group.php b/sections/torrents/edit_group.php
index 89ef70b10..f6ccaf2c4 100644
--- a/sections/torrents/edit_group.php
+++ b/sections/torrents/edit_group.php
@@ -1,14 +1,14 @@
 <?php
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_GET['id']);
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_GET['id']);
 if (is_null($tgroup)) {
     error(404);
 }
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 
 echo $Twig->render('tgroup/edit.twig', [
     'body'         => new Gazelle\Util\Textarea('body', $tgroup->description(), 80, 20),
-    'release_type' => (new Gazelle\ReleaseType)->list(),
+    'release_type' => (new Gazelle\ReleaseType())->list(),
     'tgroup'       => $tgroup->showFallbackImage(false),
     'viewer'       => $Viewer,
     'leech_type'   => $torMan->leechTypeList(),
diff --git a/sections/torrents/edit_group_handle.php b/sections/torrents/edit_group_handle.php
index e4857085f..84005c707 100644
--- a/sections/torrents/edit_group_handle.php
+++ b/sections/torrents/edit_group_handle.php
@@ -8,7 +8,7 @@
 if (!$Viewer->permitted('torrents_edit_vanityhouse') && isset($_POST['vanity_house'])) {
     error(403);
 }
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_REQUEST['groupid']);
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_REQUEST['groupid']);
 if (is_null($tgroup)) {
     error(404);
 }
@@ -37,7 +37,7 @@
 } else {
     // edit, variables are passed via POST
     $ReleaseType = (int)$_POST['releasetype'];
-    $rt = new Gazelle\ReleaseType;
+    $rt = new Gazelle\ReleaseType();
     $newReleaseTypeName = $rt->findNameById($ReleaseType);
     if ($tgroup->categoryId() == 1 && !$newReleaseTypeName || $tgroup->categoryId() != 1 && $ReleaseType) {
         error(403);
@@ -93,7 +93,7 @@
     $logInfo[] = "No cover art exception " . ($noCoverArt ? 'added' : 'removed');
 }
 if ($logInfo) {
-    (new Gazelle\Log)->group($tgroup, $Viewer, implode(', ', $logInfo));
+    (new Gazelle\Log())->group($tgroup, $Viewer, implode(', ', $logInfo));
 }
 
 header('Location: ' . $tgroup->location());
diff --git a/sections/torrents/edit_handle.php b/sections/torrents/edit_handle.php
index 357f126d7..5a8d111da 100644
--- a/sections/torrents/edit_handle.php
+++ b/sections/torrents/edit_handle.php
@@ -7,7 +7,7 @@
 
 authorize();
 
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $torrent = $torMan->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
@@ -79,7 +79,7 @@
     }
 }
 
-$Validate = new Gazelle\Util\Validator;
+$Validate = new Gazelle\Util\Validator();
 $Validate->setField('type', true, 'number', 'Not a valid category.', ['range' => [1, count(CATEGORY)]]);
 switch (CATEGORY[(int)($_POST['type'] ?? 0) - 1]) {
     case 'Music':
@@ -193,7 +193,7 @@
 $db->begin_transaction(); // It's all or nothing
 
 if ($logfileSummary->total()) {
-    $torrentLogManager = new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog, new Gazelle\File\RipLogHTML);
+    $torrentLogManager = new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog(), new Gazelle\File\RipLogHTML());
     $checkerVersion = Logchecker::getLogcheckerVersion();
     foreach ($logfileSummary->all() as $logfile) {
         $torrentLogManager->create($torrent, $logfile, $checkerVersion);
@@ -254,7 +254,7 @@
     $leechType = $torMan->lookupLeechType($_POST['leech_type'] ?? LeechType::Normal->value);
     if ($leechType != $torrent->leechType() || $reason != $torrent->leechReason()) {
         $torMan->setListFreeleech(
-            tracker:   new Gazelle\Tracker,
+            tracker:   new Gazelle\Tracker(),
             idList:    [$torrent->id()],
             leechType: $leechType,
             reason:    $reason,
@@ -267,7 +267,7 @@
 $torrent->group()->refresh();
 
 $changeLog = implode(', ', $change);
-(new Gazelle\Log)->torrent($torrent, $Viewer, $changeLog)
+(new Gazelle\Log())->torrent($torrent, $Viewer, $changeLog)
     ->general("Torrent $TorrentID ({$torrent->group()->name()}) in group {$current['GroupID']} was edited by "
         . $Viewer->username() . " ($changeLog)");
 
diff --git a/sections/torrents/edit_log.php b/sections/torrents/edit_log.php
index 17ba7b2b2..c97a6ee99 100644
--- a/sections/torrents/edit_log.php
+++ b/sections/torrents/edit_log.php
@@ -4,17 +4,17 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_GET['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_GET['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
 }
-$tlog = (new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog, new Gazelle\File\RipLogHTML))->findById($torrent, (int)($_GET['logid'] ?? 0));
+$tlog = (new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog(), new Gazelle\File\RipLogHTML()))->findById($torrent, (int)($_GET['logid'] ?? 0));
 if (is_null($tlog)) {
     error(404);
 }
 
 echo $Twig->render('torrent/edit-log.twig', [
-    'adjuster' => (new Gazelle\Manager\User)->findById($tlog->adjustedByUserId())?->link() ?? 'System',
+    'adjuster' => (new Gazelle\Manager\User())->findById($tlog->adjustedByUserId())?->link() ?? 'System',
     'tlog'     => $tlog,
     'torrent'  => $torrent,
 
diff --git a/sections/torrents/edit_log_handle.php b/sections/torrents/edit_log_handle.php
index f9b704db2..8f9759a5d 100644
--- a/sections/torrents/edit_log_handle.php
+++ b/sections/torrents/edit_log_handle.php
@@ -8,7 +8,7 @@
 if (!$LogID) {
     error(404);
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
 }
diff --git a/sections/torrents/edit_request.php b/sections/torrents/edit_request.php
index 10b29218c..c2e9488a3 100644
--- a/sections/torrents/edit_request.php
+++ b/sections/torrents/edit_request.php
@@ -1,6 +1,6 @@
 <?php
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)($_GET['id'] ?? 0));
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)($_GET['id'] ?? 0));
 if (!$tgroup) {
     error(404);
 }
diff --git a/sections/torrents/edit_request_handle.php b/sections/torrents/edit_request_handle.php
index 3c498f92e..276633d59 100644
--- a/sections/torrents/edit_request_handle.php
+++ b/sections/torrents/edit_request_handle.php
@@ -1,12 +1,12 @@
 <?php
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)($_POST['id'] ?? 0));
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)($_POST['id'] ?? 0));
 if (!$tgroup) {
     error(404);
 }
 authorize();
 
-$thread = (new Gazelle\Manager\ForumThread)->create(
+$thread = (new Gazelle\Manager\ForumThread())->create(
     forum: new Gazelle\Forum(EDITING_FORUM_ID),
     user:  new Gazelle\User(SYSTEM_USER_ID),
     title: "Editing request \xE2\x80\x93 Torrent Group: " . $tgroup->name(),
diff --git a/sections/torrents/grouplog.php b/sections/torrents/grouplog.php
index d67777857..50354c078 100644
--- a/sections/torrents/grouplog.php
+++ b/sections/torrents/grouplog.php
@@ -6,10 +6,10 @@
     // so the best we can hope for is something that looks like a positive integer
     error(404);
 }
-$tgroup = (new Gazelle\Manager\TGroup)->findById($tgroupId);
+$tgroup = (new Gazelle\Manager\TGroup())->findById($tgroupId);
 
 echo $Twig->render('tgroup/group-log.twig', [
     'id'     => $tgroupId,
     'tgroup' => $tgroup,
-    'log'    => (new Gazelle\Manager\SiteLog(new Gazelle\Manager\User))->tgroupLogList($tgroupId),
+    'log'    => (new Gazelle\Manager\SiteLog(new Gazelle\Manager\User()))->tgroupLogList($tgroupId),
 ]);
diff --git a/sections/torrents/history.php b/sections/torrents/history.php
index 8375a570e..0b3d926a9 100644
--- a/sections/torrents/history.php
+++ b/sections/torrents/history.php
@@ -1,6 +1,6 @@
 <?php
 
-$group = (new Gazelle\Manager\TGroup)->findById((int)($_GET['id'] ?? 0));
+$group = (new Gazelle\Manager\TGroup())->findById((int)($_GET['id'] ?? 0));
 if (is_null($group)) {
     error(404);
 }
diff --git a/sections/torrents/index.php b/sections/torrents/index.php
index 31ff6403b..8328e4045 100644
--- a/sections/torrents/index.php
+++ b/sections/torrents/index.php
@@ -135,7 +135,7 @@
             if (!empty($_GET['id'])) {
                 require_once('details.php');
             } elseif (isset($_GET['torrentid'])) {
-                $torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+                $torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
                 if ($torrent) {
                     header('Location: ' . $torrent->location());
                 } else {
@@ -147,7 +147,7 @@
             break;
     }
 } else {
-    $manager = new \Gazelle\Manager\TGroup;
+    $manager = new \Gazelle\Manager\TGroup();
     if (!empty($_GET['id'])) {
         require_once('details.php');
     } elseif (isset($_GET['torrentid'])) {
diff --git a/sections/torrents/log_ajax.php b/sections/torrents/log_ajax.php
index eb4938aab..f69dc6674 100644
--- a/sections/torrents/log_ajax.php
+++ b/sections/torrents/log_ajax.php
@@ -1,6 +1,6 @@
 <?php
 
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $torrent = $torMan->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     $torrent = $torMan->findDeletedById((int)$_GET['torrentid']);
@@ -11,7 +11,7 @@
 
 echo $Twig->render('torrent/riplog.twig', [
     'id'        => $torrent->id(),
-    'list'      => $torrent->logfileList(new Gazelle\File\RipLog, new Gazelle\File\RipLogHTML),
+    'list'      => $torrent->logfileList(new Gazelle\File\RipLog(), new Gazelle\File\RipLogHTML()),
     'log_score' => $torrent->logScore(),
     'viewer'    => $Viewer,
 ]);
diff --git a/sections/torrents/manage_artists.php b/sections/torrents/manage_artists.php
index 55fa80f7c..eee3de8a2 100644
--- a/sections/torrents/manage_artists.php
+++ b/sections/torrents/manage_artists.php
@@ -9,7 +9,7 @@
     error(0);
 }
 
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)($_POST['groupid'] ?? 0));
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)($_POST['groupid'] ?? 0));
 if (is_null($tgroup)) {
     error(404);
 }
@@ -38,7 +38,7 @@
     );
     $ArtistNames = $db->to_array('ArtistID', MYSQLI_ASSOC, false);
     if ($_POST['manager_action'] == 'delete') {
-        $logger = new Gazelle\Log;
+        $logger = new Gazelle\Log();
         foreach ($CleanArtists as $Artist) {
             [$Importance, $ArtistID] = $Artist;
             $db->prepared_query("
@@ -67,7 +67,7 @@
         );
         $Items = $db->collect('ArtistID');
         $EmptyArtists = array_diff($ArtistIDs, $Items);
-        $logger = new Gazelle\Log;
+        $logger = new Gazelle\Log();
         foreach ($EmptyArtists as $ArtistID) {
             (new Gazelle\Artist($ArtistID))->remove($Viewer, $logger);
         }
@@ -83,7 +83,7 @@
                 AND ArtistID IN ($placeholders)
             ", $NewImportance, $tgroup->id(), ...$ArtistIDs
         );
-        $logger = new Gazelle\Log;
+        $logger = new Gazelle\Log();
         foreach ($CleanArtists as $Artist) {
             [$Importance, $ArtistID] = $Artist;
             // Don't bother logging artists whose importance hasn't changed
diff --git a/sections/torrents/masspm.php b/sections/torrents/masspm.php
index 29934ab07..7592a7bff 100644
--- a/sections/torrents/masspm.php
+++ b/sections/torrents/masspm.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('site_moderate_requests')) {
     error(403);
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
diff --git a/sections/torrents/masspm_handle.php b/sections/torrents/masspm_handle.php
index b2260488c..fbf306182 100644
--- a/sections/torrents/masspm_handle.php
+++ b/sections/torrents/masspm_handle.php
@@ -5,7 +5,7 @@
 if (!$Viewer->permitted('site_moderate_requests')) {
     error(403);
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_POST['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_POST['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
@@ -13,7 +13,7 @@
 $subject = trim($_POST['subject']);
 $message = trim($_POST['message']);
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setFields([
     ['subject', false, 'string', 'Invalid subject.', ['maxlength' => 1000]],
     ['message', false, 'string', 'Invalid message.', ['maxlength' => 10000]],
@@ -22,5 +22,5 @@
     error($validator->errorMessage());
 }
 
-(new Gazelle\Manager\User)->sendSnatchPm($Viewer, $torrent, $subject, $message);
+(new Gazelle\Manager\User())->sendSnatchPm($Viewer, $torrent, $subject, $message);
 header("Location: " . $torrent->location());
diff --git a/sections/torrents/merge.php b/sections/torrents/merge.php
index 88a523153..aec7c08c0 100644
--- a/sections/torrents/merge.php
+++ b/sections/torrents/merge.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $old = $tgMan->findById((int)($_POST['groupid'] ?? 0));
 if (is_null($old)) {
     error(404);
@@ -36,9 +36,9 @@
     $old,
     $new,
     $Viewer,
-    new \Gazelle\Manager\User,
-    new \Gazelle\Manager\Vote,
-    new Gazelle\Log
+    new \Gazelle\Manager\User(),
+    new \Gazelle\Manager\Vote(),
+    new Gazelle\Log()
 );
 
 header('Location: ' . $new->location());
diff --git a/sections/torrents/new_group_handle.php b/sections/torrents/new_group_handle.php
index 4a4b168fc..3f30057f5 100644
--- a/sections/torrents/new_group_handle.php
+++ b/sections/torrents/new_group_handle.php
@@ -17,7 +17,7 @@
     error(0);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error('Torrent does not exist!');
 }
@@ -34,16 +34,16 @@
     exit;
 }
 
-$new = (new Gazelle\Manager\TGroup)->createFromTorrent(
+$new = (new Gazelle\Manager\TGroup())->createFromTorrent(
     $torrent,
     $artistName,
     $title,
     $year,
-    new Gazelle\Manager\Artist,
-    new Gazelle\Manager\Bookmark,
-    new Gazelle\Manager\Comment,
-    new Gazelle\Manager\Vote,
-    new Gazelle\Log,
+    new Gazelle\Manager\Artist(),
+    new Gazelle\Manager\Bookmark(),
+    new Gazelle\Manager\Comment(),
+    new Gazelle\Manager\Vote(),
+    new Gazelle\Log(),
     $Viewer,
 );
 
diff --git a/sections/torrents/new_groupid.php b/sections/torrents/new_groupid.php
index 9387a7ea0..b62eb22f2 100644
--- a/sections/torrents/new_groupid.php
+++ b/sections/torrents/new_groupid.php
@@ -6,12 +6,12 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_POST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_POST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error('Torrent does not exist!');
 }
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $new = $tgMan->findById((int)($_POST['groupid'] ?? 0));
 if (is_null($new)) {
     error('The destination torrent group does not exist!');
@@ -36,6 +36,6 @@
 
 authorize();
 
-$new->absorb($torrent, $Viewer, new Gazelle\Log);
+$new->absorb($torrent, $Viewer, new Gazelle\Log());
 
 header('Location: ' . $new->location());
diff --git a/sections/torrents/nonwikiedit.php b/sections/torrents/nonwikiedit.php
index 901d57d23..b9d32ebd9 100644
--- a/sections/torrents/nonwikiedit.php
+++ b/sections/torrents/nonwikiedit.php
@@ -5,7 +5,7 @@
 
 authorize();
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 $tgroup = $tgMan->findById((int)($_POST['groupid']));
 if (is_null($tgroup)) {
     error(404);
@@ -17,12 +17,12 @@
 
 $log = [];
 if (isset($_POST['leech_type']) && $Viewer->permitted('torrents_freeleech')) {
-    $torMan    = new Gazelle\Manager\Torrent;
+    $torMan    = new Gazelle\Manager\Torrent();
     $reason    = $torMan->lookupLeechReason($_POST['leech_reason'] ?? LeechReason::Normal->value);
     $leechType = $torMan->lookupLeechType($_POST['leech_type'] ?? LeechType::Normal->value);
     $tgroup->setFreeleech(
         torMan:    $torMan,
-        tracker:   new Gazelle\Tracker,
+        tracker:   new Gazelle\Tracker(),
         user:      $Viewer,
         leechType: $leechType,
         reason:    $reason,
@@ -50,7 +50,7 @@
 }
 
 if ($tgroup->dirty()) {
-    (new Gazelle\Log)->group($tgroup, $Viewer, ucfirst(implode(", ", $log)));
+    (new Gazelle\Log())->group($tgroup, $Viewer, ucfirst(implode(", ", $log)));
     $tgroup->modify();
     $tgroup->refresh();
 }
diff --git a/sections/torrents/notify.php b/sections/torrents/notify.php
index 915dcf311..c51ec14de 100644
--- a/sections/torrents/notify.php
+++ b/sections/torrents/notify.php
@@ -7,7 +7,7 @@
 }
 
 if ($Viewer->permitted('users_mod') && (int)($_GET['userid'] ?? 0)) {
-    $user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+    $user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
     if (is_null($user)) {
         error(404);
     }
@@ -30,7 +30,7 @@
 $header = new SortableTableHeader('time', $headerMap);
 $headerIcons = new SortableTableHeader('time', $headerMap, ['asc' => '', 'desc' => '']);
 
-$torMan   = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$torMan   = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $notifier = new Gazelle\User\NotificationSearch($user, $header->getOrderBy(), $header->getOrderDir(), $torMan);
 if (isset($_GET['filterid'])) {
     $notifier->setFilter((int)$_GET['filterid']);
diff --git a/sections/torrents/peerlist.php b/sections/torrents/peerlist.php
index f73249f00..e9e9053c8 100644
--- a/sections/torrents/peerlist.php
+++ b/sections/torrents/peerlist.php
@@ -1,6 +1,6 @@
 <?php
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
diff --git a/sections/torrents/redownload.php b/sections/torrents/redownload.php
index 12db286c9..85340680e 100644
--- a/sections/torrents/redownload.php
+++ b/sections/torrents/redownload.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('zip_downloader')) {
     error(403);
 }
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
@@ -40,7 +40,7 @@
 }
 
 $title = "{$user->username()}-$label";
-$collector = new Gazelle\Collector\TList($Viewer, new Gazelle\Manager\Torrent, $title, 0);
+$collector = new Gazelle\Collector\TList($Viewer, new Gazelle\Manager\Torrent(), $title, 0);
 
 $db = Gazelle\DB::DB();
 $db->prepared_query("
diff --git a/sections/torrents/regen.php b/sections/torrents/regen.php
index b42465228..75c3a8e8a 100644
--- a/sections/torrents/regen.php
+++ b/sections/torrents/regen.php
@@ -4,13 +4,13 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_REQUEST['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_REQUEST['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
 }
 $torrent->regenerateFilelist(
-    new Gazelle\File\Torrent,
-    new OrpheusNET\BencodeTorrent\BencodeTorrent
+    new Gazelle\File\Torrent(),
+    new OrpheusNET\BencodeTorrent\BencodeTorrent()
 );
 
 header("Location: " . $torrent->location());
diff --git a/sections/torrents/remove_log.php b/sections/torrents/remove_log.php
index 6d9471c03..f15abc061 100644
--- a/sections/torrents/remove_log.php
+++ b/sections/torrents/remove_log.php
@@ -5,14 +5,14 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 $logId = (int)$_GET['logid'];
 if (is_null($torrent) || !$logId) {
     error(404);
 }
 
-(new Gazelle\File\RipLog)->remove([$torrent->id(), $logId]);
-(new Gazelle\Log)->torrent($torrent, $Viewer, "Riplog ID $logId removed from torrent {$torrent->id()}");
+(new Gazelle\File\RipLog())->remove([$torrent->id(), $logId]);
+(new Gazelle\Log())->torrent($torrent, $Viewer, "Riplog ID $logId removed from torrent {$torrent->id()}");
 $torrent->clearLog($logId);
 
 header('Location: ' . $torrent->location());
diff --git a/sections/torrents/remove_logs.php b/sections/torrents/remove_logs.php
index 7ecaedd75..261fb06aa 100644
--- a/sections/torrents/remove_logs.php
+++ b/sections/torrents/remove_logs.php
@@ -5,15 +5,15 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)($_GET['torrentid'] ?? 0));
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)($_GET['torrentid'] ?? 0));
 if (is_null($torrent)) {
     error(404);
 }
 
 $torrent->removeAllLogs(
     $Viewer,
-    new Gazelle\File\RipLog,
-    new Gazelle\File\RipLogHTML,
-    new Gazelle\Log,
+    new Gazelle\File\RipLog(),
+    new Gazelle\File\RipLogHTML(),
+    new Gazelle\Log(),
 );
 header('Location: ' . $torrent->location());
diff --git a/sections/torrents/rename.php b/sections/torrents/rename.php
index 852b78df8..1c8e230ca 100644
--- a/sections/torrents/rename.php
+++ b/sections/torrents/rename.php
@@ -11,11 +11,11 @@
     error('Torrent groups must have a name');
 }
 
-$tgMan = new \Gazelle\Manager\TGroup;
+$tgMan = new \Gazelle\Manager\TGroup();
 $tgroup = $tgMan->findById((int)($_POST['groupid'] ?? 0));
 if (is_null($tgroup)) {
     error(404);
 }
 
-$tgroup->rename($name, $Viewer, $tgMan, new Gazelle\Log);
+$tgroup->rename($name, $Viewer, $tgMan, new Gazelle\Log());
 header("Location: {$tgroup->location()}");
diff --git a/sections/torrents/rescore_log.php b/sections/torrents/rescore_log.php
index 133a92282..11e3ea759 100644
--- a/sections/torrents/rescore_log.php
+++ b/sections/torrents/rescore_log.php
@@ -6,15 +6,15 @@
     error(403);
 }
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 $logId = (int)$_GET['logid'];
 if (is_null($torrent) || !$logId) {
     error(404);
 }
 
-$logpath = (new Gazelle\File\RipLog)->path([$torrent->id(), $logId]);
+$logpath = (new Gazelle\File\RipLog())->path([$torrent->id(), $logId]);
 $logfile = new Gazelle\Logfile($logpath, basename($logpath));
-(new Gazelle\File\RipLogHTML)->put($logfile->text(), [$torrent->id(), $logId]);
+(new Gazelle\File\RipLogHTML())->put($logfile->text(), [$torrent->id(), $logId]);
 
 $torrent->rescoreLog($logId, $logfile, Logchecker::getLogcheckerVersion());
 
diff --git a/sections/torrents/reseed.php b/sections/torrents/reseed.php
index d9f72c22c..8a372a1be 100644
--- a/sections/torrents/reseed.php
+++ b/sections/torrents/reseed.php
@@ -1,6 +1,6 @@
 <?php
 
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
@@ -15,5 +15,5 @@
 
 echo $Twig->render('torrent/reseed-result.twig', [
     'torrent' => $torrent,
-    'total'   => $torrent->issueReseedRequest($Viewer, new \Gazelle\Manager\User),
+    'total'   => $torrent->issueReseedRequest($Viewer, new \Gazelle\Manager\User()),
 ]);
diff --git a/sections/torrents/snatchlist.php b/sections/torrents/snatchlist.php
index 74e746cc5..bb2f14032 100644
--- a/sections/torrents/snatchlist.php
+++ b/sections/torrents/snatchlist.php
@@ -3,7 +3,7 @@
 if (!$Viewer->permitted('site_view_torrent_snatchlist')) {
     error(403);
 }
-$torrent = (new Gazelle\Manager\Torrent)->findById((int)$_GET['torrentid']);
+$torrent = (new Gazelle\Manager\Torrent())->findById((int)$_GET['torrentid']);
 if (is_null($torrent)) {
     error(404);
 }
diff --git a/sections/torrents/user.php b/sections/torrents/user.php
index 1ad398096..572973691 100644
--- a/sections/torrents/user.php
+++ b/sections/torrents/user.php
@@ -9,7 +9,7 @@
 if ($_GET['userid'] == 'me') {
     $_GET['userid'] = $Viewer->id();
 }
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
@@ -66,7 +66,7 @@
     $args[] = $_GET['media'];
 }
 
-$releaseMan = new Gazelle\ReleaseType;
+$releaseMan = new Gazelle\ReleaseType();
 if (!empty($_GET['releasetype'])) {
     $releaseType = (int)$_GET['releasetype'];
     if ($releaseMan->findNameById($releaseType)) {
@@ -123,7 +123,7 @@
 }
 
 if (!empty($_GET['tags'])) {
-    $tagMan = new Gazelle\Manager\Tag;
+    $tagMan = new Gazelle\Manager\Tag();
     $tags = explode(',', $_GET['tags']);
     $includeTags = [];
     $excludeTags = [];
@@ -321,7 +321,7 @@
 $action       = display_str($_GET['type']);
 $urlStem      = "torrents.php?userid={$userId}&amp;type=";
 
-$torMan   = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$torMan   = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $imgProxy = new Gazelle\Util\ImageProxy($Viewer);
 $snatcher = $Viewer->snatch();
 
diff --git a/sections/torrents/vote_tag.php b/sections/torrents/vote_tag.php
index 3b72db713..f8cd97df3 100644
--- a/sections/torrents/vote_tag.php
+++ b/sections/torrents/vote_tag.php
@@ -1,7 +1,7 @@
 <?php
 
 authorize();
-$tgroup = (new Gazelle\Manager\TGroup)->findById((int)$_GET['groupid']);
+$tgroup = (new Gazelle\Manager\TGroup())->findById((int)$_GET['groupid']);
 $tagId  = (int)$_GET['tagid'];
 $way    = $_GET['way'];
 
diff --git a/sections/upload/upload.php b/sections/upload/upload.php
index c23f097de..8e5d76119 100644
--- a/sections/upload/upload.php
+++ b/sections/upload/upload.php
@@ -11,7 +11,7 @@
 
 ini_set('max_file_uploads', '100');
 
-$tgMan = new Gazelle\Manager\TGroup;
+$tgMan = new Gazelle\Manager\TGroup();
 if (!isset($Properties)) {
     $requestId = (int)($_GET['requestid'] ?? 0);
     if ((int)($_GET['groupid'] ?? 0)) {
@@ -40,7 +40,7 @@
             }
         }
     } elseif ($requestId) {
-        $request = (new Gazelle\Manager\Request)->findById($requestId);
+        $request = (new Gazelle\Manager\Request())->findById($requestId);
         if ($request) {
             $categoryId = $request->categoryId();
             $Properties = [
@@ -72,7 +72,7 @@
     $Err = false;
 }
 
-$dnu     = new Gazelle\Manager\DNU;
+$dnu     = new Gazelle\Manager\DNU();
 $dnuNew  = $dnu->hasNewForUser($Viewer);
 $dnuHide = !$dnuNew && $Viewer->permitted('torrents_hide_dnu');
 
@@ -116,7 +116,7 @@
     'Audiobooks', 'Comedy'                                   => $uploadForm->audiobook_form(),
     'Applications', 'Comics', 'E-Books', 'E-Learning Videos' => $uploadForm->simple_form(),
     default => $uploadForm->music_form(
-        (new Gazelle\Manager\Tag)->genreList(),
+        (new Gazelle\Manager\Tag())->genreList(),
         $tgMan,
     ),
 };
diff --git a/sections/upload/upload_handle.php b/sections/upload/upload_handle.php
index feca90752..73e3ef68b 100644
--- a/sections/upload/upload_handle.php
+++ b/sections/upload/upload_handle.php
@@ -138,7 +138,7 @@ function reportError(string $message): never {
 //--------------- Validate data in upload form ---------------------------------//
 
 // common to all types
-$Validate = new Gazelle\Util\Validator;
+$Validate = new Gazelle\Util\Validator();
 $Validate->setFields([
     ['type', true, 'inarray', 'Please select a valid category.', ['inarray' => array_keys(CATEGORY)]],
     ['release_desc', false, 'string','The release description you entered is too long.', ['maxlength' => 1_000_000]],
@@ -174,7 +174,7 @@ function reportError(string $message): never {
     }
 }
 
-$releaseTypes = (new Gazelle\ReleaseType)->list();
+$releaseTypes = (new Gazelle\ReleaseType())->list();
 switch ($categoryName) {
     case 'Audiobooks':
         $Validate->setField('year', true, 'number', 'The year of the release must be entered.');
@@ -232,8 +232,8 @@ function reportError(string $message): never {
     reportError('No torrent file uploaded, or file is empty.');
 }
 
-$torMan   = new Gazelle\Manager\Torrent;
-$bencoder = new OrpheusNET\BencodeTorrent\BencodeTorrent;
+$torMan   = new Gazelle\Manager\Torrent();
+$bencoder = new OrpheusNET\BencodeTorrent\BencodeTorrent();
 try {
     $bencoder->decodeFile($TorrentName);
 } catch (\RuntimeException $e) {
@@ -252,7 +252,7 @@ function reportError(string $message): never {
     reportError('This torrent is not a V1 torrent. V2 and Hybrid torrents are not supported here.');
 }
 
-$checker     = new Gazelle\Util\FileChecker;
+$checker     = new Gazelle\Util\FileChecker();
 $DirName     = (isset($TorData['info']['files']) ? make_utf8($bencoder->getName()) : '');
 $checkName   = $checker->checkName($DirName); // check the folder name against the blacklist
 if ($checkName) {
@@ -265,7 +265,7 @@ function reportError(string $message): never {
     'new'   => [], // list of newly created Torrent objects
 ];
 
-$torrentFiler = new Gazelle\File\Torrent;
+$torrentFiler = new Gazelle\File\Torrent();
 $torrent      = $torMan->findByInfohash(bin2hex($bencoder->getHexInfoHash()));
 if ($torrent) {
     $torrentId = $torrent->id();
@@ -314,7 +314,7 @@ function reportError(string $message): never {
                 reportError('Missing encoding/bitrate for extra torrent.');
             }
 
-            $xbencoder = new OrpheusNET\BencodeTorrent\BencodeTorrent;
+            $xbencoder = new OrpheusNET\BencodeTorrent\BencodeTorrent();
             try {
                 $xbencoder->decodeFile($fileTmpName);
             } catch (\RuntimeException $e) {
@@ -473,7 +473,7 @@ function reportError(string $message): never {
 }
 $Debug->set_flag('upload: torrent decoded');
 
-$tgMan      = new Gazelle\Manager\TGroup;
+$tgMan      = new Gazelle\Manager\TGroup();
 $tgroup     = null;
 $NoRevision = false;
 
@@ -517,7 +517,7 @@ function reportError(string $message): never {
 //******************************************************************************//
 //--------------- Start database stuff -----------------------------------------//
 
-$log = new Gazelle\Log;
+$log = new Gazelle\Log();
 $Debug->set_flag('upload: database begin transaction');
 $db = Gazelle\DB::DB();
 $db->begin_transaction();
@@ -537,7 +537,7 @@ function reportError(string $message): never {
         showcase:        $Viewer->permitted('torrents_edit_vanityhouse') && isset($_POST['vanity_house']),
     );
     if ($isMusicUpload) {
-        $tgroup->addArtists($ArtistRoleList, $ArtistNameList, $Viewer, new Gazelle\Manager\Artist, $log);
+        $tgroup->addArtists($ArtistRoleList, $ArtistNameList, $Viewer, new Gazelle\Manager\Artist(), $log);
         $Cache->increment_value('stats_album_count', count($ArtistNameList));
     }
     $Viewer->stats()->increment('unique_group_total');
@@ -551,7 +551,7 @@ function reportError(string $message): never {
 }
 
 // Tags
-$tagMan = new Gazelle\Manager\Tag;
+$tagMan = new Gazelle\Manager\Tag();
 if (!$Properties['GroupID']) {
     foreach ($Properties['TagList'] as $tag) {
         $tag = $tagMan->resolve($tagMan->sanitize($tag));
@@ -622,7 +622,7 @@ function reportError(string $message): never {
 //--------------- Write Files To Disk ------------------------------------------//
 
 if ($logfileSummary?->total()) {
-    $torrentLogManager = new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog, new Gazelle\File\RipLogHTML);
+    $torrentLogManager = new Gazelle\Manager\TorrentLog(new Gazelle\File\RipLog(), new Gazelle\File\RipLogHTML());
     $checkerVersion = Logchecker::getLogcheckerVersion();
     foreach ($logfileSummary->all() as $logfile) {
         $torrentLogManager->create($torrent, $logfile, $checkerVersion);
@@ -644,7 +644,7 @@ function reportError(string $message): never {
 
 $bonusTotal  = 0;
 $bonus       = new Gazelle\User\Bonus($Viewer);
-$tracker     = new Gazelle\Tracker;
+$tracker     = new Gazelle\Tracker();
 $folderCheck = [];
 foreach ($upload['new'] as $t) {
     $t->flush()->unlockUpload();
@@ -652,7 +652,7 @@ function reportError(string $message): never {
     $tracker->addTorrent($t);
     $folderCheck[] = $t->path();
 }
-(new Gazelle\Manager\NotificationTicket)->create($torrent);
+(new Gazelle\Manager\NotificationTicket())->create($torrent);
 
 if (!$Viewer->disableBonusPoints()) {
     $bonus->addPoints($bonusTotal);
diff --git a/sections/user/2fa/complete.php b/sections/user/2fa/complete.php
index 33efb38b5..c649e5c5a 100644
--- a/sections/user/2fa/complete.php
+++ b/sections/user/2fa/complete.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findById((int)($_REQUEST['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_REQUEST['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
@@ -15,7 +15,7 @@
     error(404);
 }
 
-$user->create2FA(new Gazelle\Manager\UserToken, $_SESSION['private_key']);
+$user->create2FA(new Gazelle\Manager\UserToken(), $_SESSION['private_key']);
 
 if (session_status() === PHP_SESSION_NONE) {
     session_start();
diff --git a/sections/user/2fa/configure.php b/sections/user/2fa/configure.php
index 314ecf4d4..4e5ec1a95 100644
--- a/sections/user/2fa/configure.php
+++ b/sections/user/2fa/configure.php
@@ -11,7 +11,7 @@
 }
 
 $valid = true;
-$auth = new RobThree\Auth\TwoFactorAuth;
+$auth = new RobThree\Auth\TwoFactorAuth();
 if (!empty($_SESSION['private_key'])) {
     $secret = $_SESSION['private_key'];
     if (isset($_POST['2fa'])) {
diff --git a/sections/user/2fa/index.php b/sections/user/2fa/index.php
index 3547f9437..b07d733d4 100644
--- a/sections/user/2fa/index.php
+++ b/sections/user/2fa/index.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findById((int)($_REQUEST['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_REQUEST['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/user/2fa/remove.php b/sections/user/2fa/remove.php
index dfdb5c342..f3acb4ae1 100644
--- a/sections/user/2fa/remove.php
+++ b/sections/user/2fa/remove.php
@@ -1,7 +1,7 @@
 <?php
 
 // Remove 2FA. Users have to enter their password, moderators skip this step.
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/user/advancedsearch.php b/sections/user/advancedsearch.php
index 173398c4f..0521001b4 100644
--- a/sections/user/advancedsearch.php
+++ b/sections/user/advancedsearch.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 if (isset($_GET['search'])) {
     $_GET['search'] = trim($_GET['search']);
@@ -113,7 +113,7 @@ function option(string $field, string $value, string $label): string {
 $trackerLiveSource = true;
 
 $paginator = new Gazelle\Util\Paginator(USERS_PER_PAGE, (int)($_GET['page'] ?? 1));
-$Stylesheets = (new \Gazelle\Manager\Stylesheet)->list();
+$Stylesheets = (new \Gazelle\Manager\Stylesheet())->list();
 
 $matchMode = ($_GET['matchtype'] ?? 'fuzzy');
 $searchDisabledInvites = (isset($_GET['disabled_invites']) && $_GET['disabled_invites'] != '');
@@ -140,7 +140,7 @@ function option(string $field, string $value, string $label): string {
         }
     }
 
-    $validator = new Gazelle\Util\Validator;
+    $validator = new Gazelle\Util\Validator();
     $validator->setFields([
         ['avatar', false, 'string', 'Avatar URL too long', ['maxlength' => 512]],
         ['bounty', false, 'inarray', "Invalid bounty field", $OffNumberChoices],
diff --git a/sections/user/delete_invite.php b/sections/user/delete_invite.php
index 3291dfe59..6c2936b1b 100644
--- a/sections/user/delete_invite.php
+++ b/sections/user/delete_invite.php
@@ -3,7 +3,7 @@
 authorize();
 
 $inviteKey = trim($_GET['invite'] ?? '');
-$user = (new Gazelle\Manager\Invite)->findUserByKey($inviteKey, new Gazelle\Manager\User);
+$user = (new Gazelle\Manager\Invite())->findUserByKey($inviteKey, new Gazelle\Manager\User());
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/user/edit.php b/sections/user/edit.php
index a646b5790..055a3ea1d 100644
--- a/sections/user/edit.php
+++ b/sections/user/edit.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 
 $user = $userMan->findById(($_REQUEST['id'] ?? '') === 'me' ? $Viewer->id() : (int)($_REQUEST['id'] ?? 0));
 if (is_null($user)) {
@@ -24,19 +24,19 @@
         ];
     }
 }
-$navList = (new Gazelle\Manager\UserNavigation)->fullList();
+$navList = (new Gazelle\Manager\UserNavigation())->fullList();
 
 echo $Twig->render('user/setting.twig', [
     'donor'           => $donor,
-    'js'              => (new Gazelle\Util\Validator)->generateJS('userform'),
-    'lastfm_username' => (new Gazelle\Util\LastFM)->username($user),
+    'js'              => (new Gazelle\Util\Validator())->generateJS('userform'),
+    'lastfm_username' => (new Gazelle\Util\LastFM())->username($user),
     'nav_items'       => $navList,
     'nav_items_user'  => $user->navigationList(),
     'notify_config'   => (new Gazelle\User\Notification($user))->config(),
     'profile'         => $profile,
-    'release_order'   => $user->releaseOrder((new Gazelle\ReleaseType)->extendedList()),
+    'release_order'   => $user->releaseOrder((new Gazelle\ReleaseType())->extendedList()),
     'stylesheet'      => new Gazelle\User\Stylesheet($user),
-    'stylesheets'     => (new Gazelle\Manager\Stylesheet)->list(),
+    'stylesheets'     => (new Gazelle\Manager\Stylesheet())->list(),
     'user'            => $user,
     'viewer'          => $Viewer,
 ]);
diff --git a/sections/user/edit_handle.php b/sections/user/edit_handle.php
index 9b6cbc143..7ef0e1520 100644
--- a/sections/user/edit_handle.php
+++ b/sections/user/edit_handle.php
@@ -2,8 +2,8 @@
 
 authorize();
 
-$irc     = new Gazelle\Util\Irc;
-$userMan = new Gazelle\Manager\User;
+$irc     = new Gazelle\Util\Irc();
+$userMan = new Gazelle\Manager\User();
 if (!isset($_REQUEST['id'])) {
     $ownProfile = true;
     $user = $Viewer;
@@ -21,7 +21,7 @@
 $db     = Gazelle\DB::DB();
 $userId = $user->id();
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setFields([
     ['stylesheet', true, "number", "You forgot to select a stylesheet."],
     ['styleurl', false, "regex", "You did not enter a valid stylesheet URL.", ['regex' => CSS_REGEXP]],
@@ -196,14 +196,14 @@
 $user->setField('option_list', $option);
 
 $navList = [];
-foreach ((new Gazelle\Manager\UserNavigation)->fullList() as $n) {
+foreach ((new Gazelle\Manager\UserNavigation())->fullList() as $n) {
     if ($n['mandatory'] || isset($_POST["n_{$n['id']}"])) {
         $navList[] = (int)$n['id'];
     }
 }
 $user->setField('nav_list', $navList);
 
-(new Gazelle\Util\LastFM)->modifyUsername($user, trim($_POST['lastfm_username'] ?? ''));
+(new Gazelle\Util\LastFM())->modifyUsername($user, trim($_POST['lastfm_username'] ?? ''));
 
 /* transform
  *   'notifications_News_popup'
@@ -250,7 +250,7 @@
 
 $history = new \Gazelle\User\History($user);
 if ($NewEmail) {
-    $history->registerNewEmail($NewEmail, $Viewer->ipaddr(), new \Gazelle\Manager\IPv4, $irc, new \Gazelle\Util\Mail);
+    $history->registerNewEmail($NewEmail, $Viewer->ipaddr(), new \Gazelle\Manager\IPv4(), $irc, new \Gazelle\Util\Mail());
 }
 
 if (isset($_POST['resetpasskey'])) {
@@ -259,7 +259,7 @@
     $ipaddr = $Viewer->ipaddr();
     $user->setField('torrent_pass', $newPasskey);
     $user->modifyAnnounceKeyHistory($oldPasskey, $newPasskey, $ipaddr);
-    (new Gazelle\Tracker)->modifyPasskey(old: $oldPasskey, new: $newPasskey);
+    (new Gazelle\Tracker())->modifyPasskey(old: $oldPasskey, new: $newPasskey);
 }
 
 $user->modify();
diff --git a/sections/user/index.php b/sections/user/index.php
index 5e86764f7..b542f4d86 100644
--- a/sections/user/index.php
+++ b/sections/user/index.php
@@ -74,7 +74,7 @@
         if (!$Viewer->permittedAny('admin_clear_cache', 'users_override_paranoia')) {
             error(403);
         }
-        (new Gazelle\Manager\User)->findById((int)$_REQUEST['id'])?->flush();
+        (new Gazelle\Manager\User())->findById((int)$_REQUEST['id'])?->flush();
         require_once('user.php');
         break;
 
diff --git a/sections/user/invite.php b/sections/user/invite.php
index 39e03d749..3f3d91439 100644
--- a/sections/user/invite.php
+++ b/sections/user/invite.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['id'])) {
     $user = $Viewer;
 } else {
@@ -16,7 +16,7 @@
 }
 
 $inviteSourceMan = $Viewer->permitted('users_view_invites') || $Viewer->isRecruiter()
-    ? new Gazelle\Manager\InviteSource
+    ? new Gazelle\Manager\InviteSource()
     : null;
 
 if ($inviteSourceMan && isset($_GET['edit'])) {
@@ -84,7 +84,7 @@
             $heading->getOrderBy(), $heading->getOrderDir(), $paginator->limit(), $paginator->offset()
         )
     ),
-    'invites_open'      => (new Gazelle\Stats\Users)->newUsersAllowed($user),
+    'invites_open'      => (new Gazelle\Stats\Users())->newUsersAllowed($user),
     'invite_source'     => $inviteSourceMan,
     'notes'             => new Gazelle\Util\Textarea('notes', '', 60, 4),
     'own_profile'       => $ownProfile,
diff --git a/sections/user/invite_handle.php b/sections/user/invite_handle.php
index 9160c9772..64569f40d 100644
--- a/sections/user/invite_handle.php
+++ b/sections/user/invite_handle.php
@@ -7,7 +7,7 @@
 }
 
 // Can the site allow an invite to be spent?
-if (!(new Gazelle\Stats\Users)->newUsersAllowed($Viewer) || !$Viewer->canInvite()) {
+if (!(new Gazelle\Stats\Users())->newUsersAllowed($Viewer) || !$Viewer->canInvite()) {
     error(403);
 }
 $email = trim($_POST['email'] ?? '');
@@ -15,7 +15,7 @@
     error('Invalid email.');
 }
 
-$manager = new Gazelle\Manager\Invite;
+$manager = new Gazelle\Manager\Invite();
 if ($manager->emailExists($Viewer, $email)) {
     error('You already have a pending invite to that address!');
 }
@@ -31,7 +31,7 @@
     error(403);
 }
 
-(new \Gazelle\Util\Mail)->send($email, 'You have been invited to ' . SITE_NAME,
+(new \Gazelle\Util\Mail())->send($email, 'You have been invited to ' . SITE_NAME,
     $Twig->render('email/invite-member.twig', [
         'email'    => $email,
         'key'      => $invite->key(),
diff --git a/sections/user/invitetree.php b/sections/user/invitetree.php
index 71f5c2664..a284ea47d 100644
--- a/sections/user/invitetree.php
+++ b/sections/user/invitetree.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['userid'])) {
     $user = $Viewer;
 } else {
diff --git a/sections/user/lastfm.php b/sections/user/lastfm.php
index 7e1bb1409..792117cfb 100644
--- a/sections/user/lastfm.php
+++ b/sections/user/lastfm.php
@@ -2,7 +2,7 @@
 
 header('Content-Type: application/json; charset=utf-8');
 
-$lastfm   = new Gazelle\Util\LastFM;
+$lastfm   = new Gazelle\Util\LastFM();
 $username = $_GET['username'] ?? null;
 $mode     = $_REQUEST['mode'] ?? '';
 if (!$username && $mode != 'weekly') {
diff --git a/sections/user/manage_linked.php b/sections/user/manage_linked.php
index c3806e5cf..7d257b772 100644
--- a/sections/user/manage_linked.php
+++ b/sections/user/manage_linked.php
@@ -22,7 +22,7 @@
 
         if ($_REQUEST['target']) {
             $username = trim($_REQUEST['target']);
-            $target = (new Gazelle\Manager\User)->findByUsername($username);
+            $target = (new Gazelle\Manager\User())->findByUsername($username);
             if (is_null($target)) {
                 error("User '" . display_str($username) . "' not found.");
             } elseif ($source->id() === $target->id()) {
diff --git a/sections/user/moderate_handle.php b/sections/user/moderate_handle.php
index dd1a5f307..848c744c9 100644
--- a/sections/user/moderate_handle.php
+++ b/sections/user/moderate_handle.php
@@ -23,7 +23,7 @@ function revoked(bool $state): string {
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $user = $userMan->findById((int)$_POST['userid']);
 if (is_null($user)) {
     header("Location: log.php?search=User+" . (int)$_POST['userid']);
@@ -100,13 +100,13 @@ function revoked(bool $state): string {
     error("Do not transfer buffer and edit upload/download in the same operation.");
 }
 
-$tracker = new Gazelle\Tracker;
+$tracker = new Gazelle\Tracker();
 $needTrackerAdd     = false;
 $needTrackerRefresh = false;
 
 // If we're deleting the user, we can ignore all the other crap
 if ($_POST['UserStatus'] === 'delete' && $Viewer->permitted('users_delete_users')) {
-    (new Gazelle\Log)->general("User account {$user->label()} was deleted by " . $Viewer->username());
+    (new Gazelle\Log())->general("User account {$user->label()} was deleted by " . $Viewer->username());
     $tracker->removeUser($user);
     $user->remove();
     header("Location: log.php?search=User+$userId");
@@ -303,7 +303,7 @@ function revoked(bool $state): string {
     if ($value > 0.0) {
         $donor->donate(
             amount:   $value,
-            xbtRate:  (new Gazelle\Manager\XBT)->latestRate('EUR'),
+            xbtRate:  (new Gazelle\Manager\XBT())->latestRate('EUR'),
             currency: $_POST['donation_currency'],
             reason:   trim($_POST['donation_reason']),
             source:   'Add Points',
@@ -347,7 +347,7 @@ function revoked(bool $state): string {
     }
 }
 
-$fMan = new Gazelle\Manager\Forum;
+$fMan = new Gazelle\Manager\Forum();
 $restricted = array_map('intval', array_unique(explode(',', trim($_POST['RestrictedForums']))));
 sort($restricted);
 $restrictedIds = [];
@@ -512,7 +512,7 @@ function revoked(bool $state): string {
 }
 
 if ($sendHackedMail && $Viewer->permitted('users_disable_any')) {
-    (new Mail)->send($hackedEmail, 'Your ' . SITE_NAME . ' account',
+    (new Mail())->send($hackedEmail, 'Your ' . SITE_NAME . ' account',
         $Twig->render('email/hacked.twig')
     );
     $userMan->disableUserList($tracker, [$userId], "Disabled via hacked email", Gazelle\Manager\User::DISABLE_MANUAL);
@@ -588,7 +588,7 @@ function revoked(bool $state): string {
 if (isset($_POST['invite_source_update'])) {
     $idList = array_key_extract_suffix('source-', $_POST);
     if ($idList) {
-        (new Gazelle\Manager\InviteSource)->modifyInviterConfiguration($user, $idList);
+        (new Gazelle\Manager\InviteSource())->modifyInviterConfiguration($user, $idList);
         header("Location: tools.php?action=invite_source");
         exit;
     }
diff --git a/sections/user/notify_edit.php b/sections/user/notify_edit.php
index 868ef6b6f..945527d19 100644
--- a/sections/user/notify_edit.php
+++ b/sections/user/notify_edit.php
@@ -6,7 +6,7 @@
 
 echo $Twig->render('user/edit-notification-filter.twig', [
     'list' => [
-        ...(new Gazelle\User\Notification($Viewer))->filterList(new Gazelle\Manager\User),
+        ...(new Gazelle\User\Notification($Viewer))->filterList(new Gazelle\Manager\User()),
         [
             'ID'            => false,
             'Label'         => '',
@@ -26,6 +26,6 @@
             'Users'         => '',
         ]
     ],
-    'release_type' => (new Gazelle\ReleaseType)->list(),
+    'release_type' => (new Gazelle\ReleaseType())->list(),
     'viewer'       => $Viewer,
 ]);
diff --git a/sections/user/notify_handle.php b/sections/user/notify_handle.php
index bcc5b7162..e12207ea9 100644
--- a/sections/user/notify_handle.php
+++ b/sections/user/notify_handle.php
@@ -5,13 +5,13 @@
 }
 authorize();
 
-$releaseTypes = (new Gazelle\ReleaseType)->list();
+$releaseTypes = (new Gazelle\ReleaseType())->list();
 
 $formId = (int)$_POST['formid'];
 
-$filter = (new Gazelle\Notification\Filter)
+$filter = (new Gazelle\Notification\Filter())
     ->setYears((int)$_POST['fromyear' . $formId], (int)$_POST['toyear' . $formId])
-    ->setUsers(new Gazelle\Manager\User, $_POST['users' . $formId])
+    ->setUsers(new Gazelle\Manager\User(), $_POST['users' . $formId])
     ->setBoolean('exclude_va', isset($_POST['excludeva' . $formId]))
     ->setBoolean('new_groups_only', isset($_POST['newgroupsonly' . $formId]))
     ->setMultiLine('artist', $_POST['artists' . $formId])
diff --git a/sections/user/permissions.php b/sections/user/permissions.php
index ca6a7eadb..f47d8f360 100644
--- a/sections/user/permissions.php
+++ b/sections/user/permissions.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $user = $userMan->findById((int)($_REQUEST['userid']));
 if (is_null($user)) {
     error(404);
diff --git a/sections/user/push_handle.php b/sections/user/push_handle.php
index c3b7eb44d..d0129d7bd 100644
--- a/sections/user/push_handle.php
+++ b/sections/user/push_handle.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(403);
 }
@@ -9,7 +9,7 @@
 }
 authorize();
 
-(new Gazelle\Manager\Notification)->push([$user->id()],
+(new Gazelle\Manager\Notification())->push([$user->id()],
     'Push!', 'You have been pushed by ' . $Viewer->username());
 
 header('Location: ' . $user->location() . '&action=edit');
diff --git a/sections/user/search.php b/sections/user/search.php
index fa2964d42..0c0f83b1c 100644
--- a/sections/user/search.php
+++ b/sections/user/search.php
@@ -1,6 +1,6 @@
 <?php
 
-$user = (new Gazelle\Manager\User)->findByUsername($_GET['search'] ?? $_GET['username'] ?? '');
+$user = (new Gazelle\Manager\User())->findByUsername($_GET['search'] ?? $_GET['username'] ?? '');
 if (!is_null($user)) {
     header('Location: ' . $user->location());
 }
diff --git a/sections/user/seedbox_edit.php b/sections/user/seedbox_edit.php
index 8914f2839..34bbba01b 100644
--- a/sections/user/seedbox_edit.php
+++ b/sections/user/seedbox_edit.php
@@ -10,7 +10,7 @@
     authorize();
     $userId = (int)$_POST['userid'];
 }
-$user = (new Gazelle\Manager\User)->findById($userId);
+$user = (new Gazelle\Manager\User())->findById($userId);
 if (!$user) {
     error(404);
 }
diff --git a/sections/user/seedbox_view.php b/sections/user/seedbox_view.php
index d7d9e8075..7e66e9711 100644
--- a/sections/user/seedbox_view.php
+++ b/sections/user/seedbox_view.php
@@ -10,7 +10,7 @@
     authorize();
     $userId = (int)$_POST['userid'];
 }
-$user = (new Gazelle\Manager\User)->findById($userId);
+$user = (new Gazelle\Manager\User())->findById($userId);
 if (!$user) {
     error(404);
 }
@@ -59,7 +59,7 @@
 if ($source && $target) {
     echo $Twig->render('seedbox/report.twig', [
         'list' => $seedbox->torrentList(
-            new Gazelle\Manager\Torrent,
+            new Gazelle\Manager\Torrent(),
             $paginator->limit(),
             $paginator->offset()
         ),
diff --git a/sections/user/sessions.php b/sections/user/sessions.php
index 02ef814c2..b369338e7 100644
--- a/sections/user/sessions.php
+++ b/sections/user/sessions.php
@@ -7,7 +7,7 @@
     if ($userId !== $Viewer->id() && !$Viewer->permittedAny('users_logout', 'users_view_ips')) {
         error(403);
     }
-    $user = (new Gazelle\Manager\User)->findById($userId);
+    $user = (new Gazelle\Manager\User())->findById($userId);
     if (is_null($user)) {
         error(404);
     }
diff --git a/sections/user/user.php b/sections/user/user.php
index 6386ec229..161ada066 100644
--- a/sections/user/user.php
+++ b/sections/user/user.php
@@ -3,7 +3,7 @@
 use Gazelle\Enum\UserTokenType;
 use Gazelle\User\Vote;
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $User = $userMan->findById((int)$_GET['id']);
 if (is_null($User)) {
     header("Location: log.php?search=User+" . (int)$_GET['id']);
@@ -18,11 +18,11 @@
 $viewerBonus = new Gazelle\User\Bonus($Viewer);
 $history     = new Gazelle\User\History($User);
 $limiter     = new Gazelle\User\UserclassRateLimit($User);
-$donorMan    = new Gazelle\Manager\Donation;
-$ipv4        = new Gazelle\Manager\IPv4;
-$tgMan       = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
+$donorMan    = new Gazelle\Manager\Donation();
+$ipv4        = new Gazelle\Manager\IPv4();
+$tgMan       = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
 $resetToken  = $Viewer->permitted('users_mod')
-    ? (new Gazelle\Manager\UserToken)->findByUser($User, UserTokenType::password)
+    ? (new Gazelle\Manager\UserToken())->findByUser($User, UserTokenType::password)
     : false;
 
 if (!empty($_POST)) {
@@ -91,16 +91,16 @@ function check_paranoia_here(?string $Setting): int|false {
 ]);
 
 echo $Twig->render('user/sidebar.twig', [
-    'applicant'     => new Gazelle\Manager\Applicant,
+    'applicant'     => new Gazelle\Manager\Applicant(),
     'invite_source' => $Viewer->permitted('admin_manage_invite_source')
-        ? (new Gazelle\Manager\InviteSource)->findSourceNameByUser($User) : null,
+        ? (new Gazelle\Manager\InviteSource())->findSourceNameByUser($User) : null,
     'next_class'    => $nextClass = $User->nextClass($userMan),
     'user'          => $User,
     'viewer'        => $Viewer,
 ]);
 
 // Last.fm statistics and comparability
-$lastfmInfo = (new Gazelle\Util\LastFM)->userInfo($User);
+$lastfmInfo = (new Gazelle\Util\LastFM())->userInfo($User);
 if ($lastfmInfo) {
     echo $Twig->render('user/lastfm.twig', [
         'can_reload'  => ($OwnProfile && $Cache->get_value("lastfm_clear_cache_$UserID") === false) || $Viewer->permitted('users_mod'),
@@ -315,7 +315,7 @@ function check_paranoia_here(?string $Setting): int|false {
 }
 
 echo $Twig->render('user/collage-list.twig', [
-    'list'    => (new Gazelle\Manager\Collage)->findPersonalByUser($User),
+    'list'    => (new Gazelle\Manager\Collage())->findPersonalByUser($User),
     'manager' => $tgMan,
 ]);
 
@@ -365,7 +365,7 @@ function check_paranoia_here(?string $Setting): int|false {
 
 if (!$Viewer->disableRequests() && $User->propertyVisible($previewer, 'requestsvoted_list')) {
     echo $Twig->render('request/user-unfilled.twig', [
-        'list'   => (new Gazelle\Manager\Request)->findUnfilledByUser($User, 100),
+        'list'   => (new Gazelle\Manager\Request())->findUnfilledByUser($User, 100),
         'viewer' => $Viewer,
     ]);
 }
@@ -525,9 +525,9 @@ class="brackets">Toggle edit</a>
 
 <?php
     if ($Viewer->permitted('users_disable_posts') || $Viewer->permitted('users_disable_any')) {
-        $fm = new Gazelle\Manager\Forum;
+        $fm = new Gazelle\Manager\Forum();
         echo $Twig->render('user/edit-privileges.twig', [
-            'asn'     => new Gazelle\Search\ASN,
+            'asn'     => new Gazelle\Search\ASN(),
             'history' => $history,
             'user'    => $User,
             'viewer'  => $Viewer,
@@ -540,7 +540,7 @@ class="brackets">Toggle edit</a>
 
     if ($User->isInterviewer() || $User->isRecruiter() || $User->isStaff()) {
         echo $Twig->render('user/edit-invite-sources.twig', [
-            'list' => (new \Gazelle\Manager\InviteSource)->inviterConfiguration($User),
+            'list' => (new \Gazelle\Manager\InviteSource())->inviterConfiguration($User),
         ]);
     }
 
diff --git a/sections/user/user_stats.php b/sections/user/user_stats.php
index 553fb613f..a6bd8afb8 100644
--- a/sections/user/user_stats.php
+++ b/sections/user/user_stats.php
@@ -1,6 +1,6 @@
 <?php
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 if (!isset($_GET['userid'])) {
     $user = $Viewer;
 } else {
diff --git a/sections/user/vote_history.php b/sections/user/vote_history.php
index 0969ee334..984e110c5 100644
--- a/sections/user/vote_history.php
+++ b/sections/user/vote_history.php
@@ -2,7 +2,7 @@
 
 use Gazelle\User\Vote;
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['id']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['id']);
 if (is_null($user)) {
     error(404);
 }
@@ -24,7 +24,7 @@
 $paginator->setTotal($vote->userTotal($mask));
 
 echo $Twig->render('user/vote-history.twig', [
-    'page'      => $vote->userPage(new Gazelle\Manager\TGroup, $mask, $paginator->limit(), $paginator->offset()),
+    'page'      => $vote->userPage(new Gazelle\Manager\TGroup(), $mask, $paginator->limit(), $paginator->offset()),
     'paginator' => $paginator,
     'show_down' => isset($_GET['down']),
     'show_up'   => isset($_GET['up']),
diff --git a/sections/userhistory/announce_key_history.php b/sections/userhistory/announce_key_history.php
index 66ed6f428..84e0c14bb 100644
--- a/sections/userhistory/announce_key_history.php
+++ b/sections/userhistory/announce_key_history.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/userhistory/email_history.php b/sections/userhistory/email_history.php
index 04fbb2c95..9d510bb07 100644
--- a/sections/userhistory/email_history.php
+++ b/sections/userhistory/email_history.php
@@ -4,13 +4,13 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(404);
 }
 
 echo $Twig->render('user/email-history.twig', [
-    'asn'     => new Gazelle\Search\ASN,
+    'asn'     => new Gazelle\Search\ASN(),
     'history' => new Gazelle\User\History($user),
     'user'    => $user,
 ]);
diff --git a/sections/userhistory/ip_history.php b/sections/userhistory/ip_history.php
index c9e49ec20..c1a02a949 100644
--- a/sections/userhistory/ip_history.php
+++ b/sections/userhistory/ip_history.php
@@ -4,11 +4,11 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(404);
 }
-$ipMan = new Gazelle\Manager\IPv4;
+$ipMan = new Gazelle\Manager\IPv4();
 if (trim($_GET['ip'] ?? '') !== '') {
     $ipMan->setFilterIpaddrRegexp(trim($_GET['ip']));
 }
diff --git a/sections/userhistory/ip_tracker_history.php b/sections/userhistory/ip_tracker_history.php
index ae1298479..3333f1f14 100644
--- a/sections/userhistory/ip_tracker_history.php
+++ b/sections/userhistory/ip_tracker_history.php
@@ -4,13 +4,13 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)($_GET['userid'] ?? 0));
+$user = (new Gazelle\Manager\User())->findById((int)($_GET['userid'] ?? 0));
 $ipaddr = $_GET['ip'] ?? null;
 if (is_null($user) && !preg_match(IP_REGEXP, $ipaddr)) {
     error(403);
 }
 
-$snatchInfo = new Gazelle\SnatchInfo;
+$snatchInfo = new Gazelle\SnatchInfo();
 if ($user) {
     $snatchInfo->setContextUser($user);
 } else {
diff --git a/sections/userhistory/password_history.php b/sections/userhistory/password_history.php
index 96984f7a7..69e4de753 100644
--- a/sections/userhistory/password_history.php
+++ b/sections/userhistory/password_history.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/userhistory/post_history.php b/sections/userhistory/post_history.php
index 5d992ae45..5cd1971d1 100644
--- a/sections/userhistory/post_history.php
+++ b/sections/userhistory/post_history.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$userMan = new Gazelle\Manager\User;
+$userMan = new Gazelle\Manager\User();
 $user = empty($_GET['userid']) ? $Viewer : $userMan->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(404);
diff --git a/sections/userhistory/subscribed_collages.php b/sections/userhistory/subscribed_collages.php
index 19991119d..a2895168d 100644
--- a/sections/userhistory/subscribed_collages.php
+++ b/sections/userhistory/subscribed_collages.php
@@ -5,12 +5,12 @@
 }
 
 $viewAll = (bool)($_GET['showall'] ?? 0);
-$collMan = new Gazelle\Manager\Collage;
+$collMan = new Gazelle\Manager\Collage();
 $groupSubs  = $collMan->subscribedTGroupCollageList($Viewer, $viewAll);
 $artistSubs = $collMan->subscribedArtistCollageList($Viewer, $viewAll);
 
-$tgMan    = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$torMan   = (new Gazelle\Manager\Torrent)->setViewer($Viewer);
+$tgMan    = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$torMan   = (new Gazelle\Manager\Torrent())->setViewer($Viewer);
 $imgProxy = new Gazelle\Util\ImageProxy($Viewer);
 $snatcher = $Viewer->snatch();
 $urlStem  = (new Gazelle\User\Stylesheet($Viewer))->imagePath();
diff --git a/sections/userhistory/subscriptions.php b/sections/userhistory/subscriptions.php
index 2d32b5ff2..a036df27a 100644
--- a/sections/userhistory/subscriptions.php
+++ b/sections/userhistory/subscriptions.php
@@ -1,12 +1,12 @@
 <?php
 
-$artistMan  = new Gazelle\Manager\Artist;
-$collageMan = new Gazelle\Manager\Collage;
-$forumMan   = new Gazelle\Manager\Forum;
-$threadMan  = new Gazelle\Manager\ForumThread;
-$requestMan = new Gazelle\Manager\Request;
-$tgMan      = (new Gazelle\Manager\TGroup)->setViewer($Viewer);
-$userMan    = new Gazelle\Manager\User;
+$artistMan  = new Gazelle\Manager\Artist();
+$collageMan = new Gazelle\Manager\Collage();
+$forumMan   = new Gazelle\Manager\Forum();
+$threadMan  = new Gazelle\Manager\ForumThread();
+$requestMan = new Gazelle\Manager\Request();
+$tgMan      = (new Gazelle\Manager\TGroup())->setViewer($Viewer);
+$userMan    = new Gazelle\Manager\User();
 $subscriber = new Gazelle\User\Subscription($Viewer);
 $showUnread = (bool)($_GET['showunread'] ?? true);
 
diff --git a/sections/userhistory/thread_subscribe.php b/sections/userhistory/thread_subscribe.php
index a379c0826..d83a59140 100644
--- a/sections/userhistory/thread_subscribe.php
+++ b/sections/userhistory/thread_subscribe.php
@@ -6,7 +6,7 @@
 }
 authorize();
 
-$thread = (new Gazelle\Manager\ForumThread)->findById((int)($_GET['threadid'] ?? 0));
+$thread = (new Gazelle\Manager\ForumThread())->findById((int)($_GET['threadid'] ?? 0));
 if (is_null($thread)) {
     error(404);
 }
diff --git a/sections/userhistory/token_history.php b/sections/userhistory/token_history.php
index 49a9ca4c7..c9b3d87b9 100644
--- a/sections/userhistory/token_history.php
+++ b/sections/userhistory/token_history.php
@@ -3,7 +3,7 @@
 if (!isset($_GET['userid'])) {
     $user = $Viewer;
 } else {
-    $user = (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+    $user = (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
     if (is_null($user)) {
         error(0);
     }
@@ -12,7 +12,7 @@
     }
 }
 
-$torMan = new Gazelle\Manager\Torrent;
+$torMan = new Gazelle\Manager\Torrent();
 $torMan->setViewer($Viewer);
 
 if ($_GET['expire'] ?? 0) {
diff --git a/sections/userhistory/topic_history.php b/sections/userhistory/topic_history.php
index 0595b0de0..d69d1cc18 100644
--- a/sections/userhistory/topic_history.php
+++ b/sections/userhistory/topic_history.php
@@ -4,7 +4,7 @@
     error(403);
 }
 
-$user = empty($_GET['userid']) ? $Viewer : (new Gazelle\Manager\User)->findById((int)$_GET['userid']);
+$user = empty($_GET['userid']) ? $Viewer : (new Gazelle\Manager\User())->findById((int)$_GET['userid']);
 if (is_null($user)) {
     error(404);
 }
diff --git a/sections/view/index.php b/sections/view/index.php
index 6cdd3562a..5b3117310 100644
--- a/sections/view/index.php
+++ b/sections/view/index.php
@@ -9,7 +9,7 @@
         if (preg_match('/^(\d+)\D(\d+)$/', $_GET['id'], $m)) {
             header('Content-type: text/plain');
             header('Content-Disposition: inline; filename="' . $m[1] . '_' . $m[2] . '.txt"');
-            $file = new \Gazelle\File\RipLog;
+            $file = new \Gazelle\File\RipLog();
             echo $file->get([$m[1], $m[2]]);
         } else {
             error(404);
diff --git a/sections/wiki/add_alias.php b/sections/wiki/add_alias.php
index ab2c99120..856fae34d 100644
--- a/sections/wiki/add_alias.php
+++ b/sections/wiki/add_alias.php
@@ -1,7 +1,7 @@
 <?php
 authorize();
 
-$article = (new Gazelle\Manager\Wiki)->findById((int)$_POST['article']);
+$article = (new Gazelle\Manager\Wiki())->findById((int)$_POST['article']);
 if (is_null($article)) {
     error(404);
 }
diff --git a/sections/wiki/article.php b/sections/wiki/article.php
index c7d62085e..acbbe81c5 100644
--- a/sections/wiki/article.php
+++ b/sections/wiki/article.php
@@ -1,7 +1,7 @@
 <?php
 Text::$TOC = true;
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $article = false;
 $error = false;
 if (isset($_GET['id'])) {
@@ -22,7 +22,7 @@
 if (!$article->readable($Viewer)) {
     error(403);
 }
-$classList = (new Gazelle\Manager\User)->classLevelList();
+$classList = (new Gazelle\Manager\User())->classLevelList();
 
 echo $Twig->render('wiki/article.twig', [
     'article' => $article,
diff --git a/sections/wiki/compare.php b/sections/wiki/compare.php
index 867b77976..de414b367 100644
--- a/sections/wiki/compare.php
+++ b/sections/wiki/compare.php
@@ -58,7 +58,7 @@ function diff(string $OldText, string $NewText): array {
     error("Selected older revision is more recent than selected newer revision.");
 }
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $article = $wikiMan->findById((int)$_GET['id']);
 if (is_null($article)) {
     error(404);
diff --git a/sections/wiki/create.php b/sections/wiki/create.php
index 76f4b0322..e1c5a35bc 100644
--- a/sections/wiki/create.php
+++ b/sections/wiki/create.php
@@ -3,7 +3,7 @@
 echo $Twig->render('wiki/create.twig', [
     'action'     => 'create',
     'body'       => new Gazelle\Util\Textarea('body', '', 92, 20),
-    'class_list' => (new Gazelle\Manager\User)->classList(),
+    'class_list' => (new Gazelle\Manager\User())->classList(),
     'edit'       => 0,
     'read'       => 0,
     'viewer'     => $Viewer,
diff --git a/sections/wiki/create_handle.php b/sections/wiki/create_handle.php
index ba389ef89..73fcca1bd 100644
--- a/sections/wiki/create_handle.php
+++ b/sections/wiki/create_handle.php
@@ -2,13 +2,13 @@
 
 authorize();
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setField('title', true, 'string', 'The title must be between 3 and 100 characters', ['range' => [3, 100]]);
 if (!$validator->validate($_POST)) {
     error($validator->errorMessage());
 }
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $title = trim($_POST['title']);
 $article = $wikiMan->findByTitle($title);
 if ($article) {
@@ -24,6 +24,6 @@
 }
 
 $article = $wikiMan->create($title, $_POST['body'], $minRead, $minEdit, $Viewer);
-(new Gazelle\Log)->general("Wiki article {$article->id()} \"$title\" was created by {$Viewer->username()}");
+(new Gazelle\Log())->general("Wiki article {$article->id()} \"$title\" was created by {$Viewer->username()}");
 
 header('Location: ' . $article->location());
diff --git a/sections/wiki/delete.php b/sections/wiki/delete.php
index ce1a1ff5d..b1e5dc528 100644
--- a/sections/wiki/delete.php
+++ b/sections/wiki/delete.php
@@ -5,7 +5,7 @@
     error(403);
 }
 
-$article = (new Gazelle\Manager\Wiki)->findById((int)$_GET['id']);
+$article = (new Gazelle\Manager\Wiki())->findById((int)$_GET['id']);
 if (is_null($article)) {
     error(404);
 }
@@ -16,7 +16,7 @@
     error('You cannot delete the main wiki article.');
 }
 
-(new Gazelle\Log)->general("Wiki article " . $article->id() . ' "' . $article->title() . '" was deleted by ' . $Viewer->username());
+(new Gazelle\Log())->general("Wiki article " . $article->id() . ' "' . $article->title() . '" was deleted by ' . $Viewer->username());
 $article->remove();
 
 header("location: wiki.php");
diff --git a/sections/wiki/delete_alias.php b/sections/wiki/delete_alias.php
index fd1b5ec66..100a15300 100644
--- a/sections/wiki/delete_alias.php
+++ b/sections/wiki/delete_alias.php
@@ -3,7 +3,7 @@
 authorize();
 
 $alias = $_GET['alias'] ?? '';
-$article = (new Gazelle\Manager\Wiki)->findByAlias($alias);
+$article = (new Gazelle\Manager\Wiki())->findByAlias($alias);
 if (is_null($article)) {
     error(404);
 }
diff --git a/sections/wiki/delete_handle.php b/sections/wiki/delete_handle.php
index af8151c37..49bc2826b 100644
--- a/sections/wiki/delete_handle.php
+++ b/sections/wiki/delete_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $article = $wikiMan->findById((int)$_POST['id']);
 if (is_null($article)) {
     error(404);
@@ -15,6 +15,6 @@
 $id    = $article->id();
 $title = $article->title();
 $article->remove();
-(new Gazelle\Log)->general("Wiki article $id \"$title\" was removed by {$Viewer->username()}");
+(new Gazelle\Log())->general("Wiki article $id \"$title\" was removed by {$Viewer->username()}");
 
 header('Location: wiki.php');
diff --git a/sections/wiki/edit.php b/sections/wiki/edit.php
index e790bf56b..33a0b4a5b 100644
--- a/sections/wiki/edit.php
+++ b/sections/wiki/edit.php
@@ -1,6 +1,6 @@
 <?php
 
-$article = (new Gazelle\Manager\Wiki)->findById((int)$_GET['id']);
+$article = (new Gazelle\Manager\Wiki())->findById((int)$_GET['id']);
 if (is_null($article)) {
     error(404);
 }
@@ -13,6 +13,6 @@
     'action'     => 'edit',
     'article'    => $article,
     'body'       => new Gazelle\Util\Textarea('body', $article->body(), 92, 20),
-    'class_list' => (new Gazelle\Manager\User)->classList(),
+    'class_list' => (new Gazelle\Manager\User())->classList(),
     'viewer'     => $Viewer,
 ]);
diff --git a/sections/wiki/edit_handle.php b/sections/wiki/edit_handle.php
index 2f85cfe0d..5075c73fc 100644
--- a/sections/wiki/edit_handle.php
+++ b/sections/wiki/edit_handle.php
@@ -2,7 +2,7 @@
 
 authorize();
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $article = $wikiMan->findById((int)$_POST['id']);
 if (is_null($article)) {
     error(404);
@@ -12,7 +12,7 @@
     error(403);
 }
 
-$validator = new Gazelle\Util\Validator;
+$validator = new Gazelle\Util\Validator();
 $validator->setField('title', true, 'string', 'The title must be between 3 and 100 characters', ['range' => [3, 100]]);
 if (!$validator->validate($_POST)) {
     error($validator->errorMessage());
diff --git a/sections/wiki/index.php b/sections/wiki/index.php
index 62e5ca9c3..acb8c2442 100644
--- a/sections/wiki/index.php
+++ b/sections/wiki/index.php
@@ -3,7 +3,7 @@
 function class_list(int $Selected = 0): string {
     global $Viewer;
     $Return = '';
-    $Classes = (new Gazelle\Manager\User)->classList();
+    $Classes = (new Gazelle\Manager\User())->classList();
     foreach ($Classes as $Class) {
         if ($Class['Level'] <= $Viewer->privilege()->effectiveClassLevel()) {
             $Return .= '<option value="' . $Class['Level'] . '"';
diff --git a/sections/wiki/revisions.php b/sections/wiki/revisions.php
index 2fefae0e2..62765012f 100644
--- a/sections/wiki/revisions.php
+++ b/sections/wiki/revisions.php
@@ -1,6 +1,6 @@
 <?php
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 $article = $wikiMan->findById((int)$_GET['id']);
 if (is_null($article)) {
     error(404);
diff --git a/sections/wiki/search.php b/sections/wiki/search.php
index b86c324a9..d9243ffba 100644
--- a/sections/wiki/search.php
+++ b/sections/wiki/search.php
@@ -1,6 +1,6 @@
 <?php
 
-$wikiMan = new Gazelle\Manager\Wiki;
+$wikiMan = new Gazelle\Manager\Wiki();
 
 if (empty($_GET['nojump'])) {
     $article = $wikiMan->findByAlias($_GET['search'] ?? '');
diff --git a/sections/wiki/wiki_browse.php b/sections/wiki/wiki_browse.php
index a5df943de..b97c82385 100644
--- a/sections/wiki/wiki_browse.php
+++ b/sections/wiki/wiki_browse.php
@@ -3,6 +3,6 @@
 $letter = isset($_GET['letter']) ? strtoupper(substr($_GET['letter'], 0, 1)) : '1';
 
 echo $Twig->render('wiki/browse.twig', [
-    'articles' => (new Gazelle\Manager\Wiki)->articles($Viewer->privilege()->effectiveClassLevel(), $letter),
+    'articles' => (new Gazelle\Manager\Wiki())->articles($Viewer->privilege()->effectiveClassLevel(), $letter),
     'letter'   => $letter,
 ]);
diff --git a/tests/helper.php b/tests/helper.php
index a93f7a277..2f7563547 100644
--- a/tests/helper.php
+++ b/tests/helper.php
@@ -15,7 +15,7 @@ public static function makeForum(
         bool                   $autoLock       = false,
         int                    $autoLockWeeks  = 42,
     ): \Gazelle\Forum {
-        return (new Gazelle\Manager\Forum)->create(
+        return (new Gazelle\Manager\Forum())->create(
             user:           $user,
             sequence:       $sequence,
             categoryId:     $category->id(),
@@ -42,10 +42,10 @@ public static function makeRequestMusic(
         string        $logCue          = 'Log (100%) + Cue',
         bool          $checksum        = true,
     ): \Gazelle\Request {
-        return (new \Gazelle\Manager\Request)->create(
+        return (new \Gazelle\Manager\Request())->create(
             user:            $user,
             bounty:          100 * 1024 ** 3,
-            categoryId:      (new \Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new \Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           $title,
             image:           '',
@@ -66,8 +66,8 @@ public static function makeTGroupEBook(
         string        $name,
         \Gazelle\User $user,
     ): \Gazelle\TGroup {
-        return (new \Gazelle\Manager\TGroup)->create(
-            categoryId:      (new \Gazelle\Manager\Category)->findIdByName('E-Books'),
+        return (new \Gazelle\Manager\TGroup())->create(
+            categoryId:      (new \Gazelle\Manager\Category())->findIdByName('E-Books'),
             name:            $name,
             description:     'phpunit ebook description',
             image:           '',
@@ -85,8 +85,8 @@ public static function makeTGroupMusic(
         array $tagName,
         int $releaseType = 1
     ): \Gazelle\TGroup {
-        $tgroup = (new \Gazelle\Manager\TGroup)->create(
-            categoryId:      (new \Gazelle\Manager\Category)->findIdByName('Music'),
+        $tgroup = (new \Gazelle\Manager\TGroup())->create(
+            categoryId:      (new \Gazelle\Manager\Category())->findIdByName('Music'),
             releaseType:     $releaseType,
             name:            $name,
             description:     'phpunit music description',
@@ -95,8 +95,8 @@ public static function makeTGroupMusic(
             recordLabel:     'Unitest Artists Corporation',
             catalogueNumber: 'UA-' . random_int(10000, 99999),
         );
-        $tgroup->addArtists($artistName[0], $artistName[1], $user, new Gazelle\Manager\Artist, new Gazelle\Log);
-        $tagMan = new \Gazelle\Manager\Tag;
+        $tgroup->addArtists($artistName[0], $artistName[1], $user, new Gazelle\Manager\Artist(), new Gazelle\Log());
+        $tagMan = new \Gazelle\Manager\Tag();
         foreach ($tagName as $tag) {
             $tagMan->createTorrentTag($tagMan->create($tag, $user), $tgroup, $user, 10);
         }
@@ -109,7 +109,7 @@ public static function makeTorrentEBook(
         \Gazelle\User   $user,
         string          $description,
     ): \Gazelle\Torrent {
-        return (new \Gazelle\Manager\Torrent)->create(
+        return (new \Gazelle\Manager\Torrent())->create(
             tgroup:                  $tgroup,
             user:                    $user,
             description:             $description,
@@ -143,7 +143,7 @@ public static function makeTorrentMusic(
         if (empty($catalogueNumber)) {
             $catalogueNumber = 'UA-REM-' . random_int(10000, 99999);
         }
-        return (new \Gazelle\Manager\Torrent)->create(
+        return (new \Gazelle\Manager\Torrent())->create(
             tgroup:                  $tgroup,
             user:                    $user,
             description:             'phpunit release description',
@@ -165,7 +165,7 @@ public static function makeTorrentMusic(
 
     public static function makeUser(string $username, string $tag, bool $enable = false, bool $clearInbox = false): \Gazelle\User {
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
-        $user = (new Gazelle\UserCreator)
+        $user = (new Gazelle\UserCreator())
             ->setUsername($username)
             ->setEmail(randomString(6) . "@{$tag}.example.com")
             ->setPassword(randomString())
@@ -191,7 +191,7 @@ public static function clearInbox(\Gazelle\User $user): \Gazelle\User {
 
     public static function makeUserByInvite(string $username, string $key): \Gazelle\User {
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
-        return (new Gazelle\UserCreator)
+        return (new Gazelle\UserCreator())
             ->setUsername($username)
             ->setEmail(randomString(6) . "@key.invite.example.com")
             ->setPassword(randomString())
@@ -202,7 +202,7 @@ public static function makeUserByInvite(string $username, string $key): \Gazelle
     }
 
     public static function removeTGroup(\Gazelle\TGroup $tgroup, \Gazelle\User $user): void {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         foreach ($tgroup->torrentIdList() as $torrentId) {
             $torMan->findById($torrentId)?->remove($user, 'phpunit teardown');
         }
diff --git a/tests/phpunit/ApplicantTest.php b/tests/phpunit/ApplicantTest.php
index 28363cd49..5f2812ca9 100644
--- a/tests/phpunit/ApplicantTest.php
+++ b/tests/phpunit/ApplicantTest.php
@@ -31,7 +31,7 @@ public function tearDown(): void {
     }
 
     public function testRoleApply(): void {
-        $roleManager = new \Gazelle\Manager\ApplicantRole;
+        $roleManager = new \Gazelle\Manager\ApplicantRole();
         $this->assertIsArray($roleManager->publishedList(), 'role-manager-list-published-is-array');
         $total = count($roleManager->list());
         $totalPublished = count($roleManager->publishedList());
@@ -52,7 +52,7 @@ public function testRoleApply(): void {
         $this->assertCount($total + 1, $roleManager->list(), 'applicant-role-total-all');
 
         $this->userList['user'] = Helper::makeUser('user.' . randomString(10), 'applicant');
-        $manager = new \Gazelle\Manager\Applicant;
+        $manager = new \Gazelle\Manager\Applicant();
         // YUCK
         global $Viewer;
         $Viewer = $this->userList['user'];
@@ -78,13 +78,13 @@ public function testRoleApply(): void {
     public function testApplicantNote(): void {
         $this->userList['mod'] = Helper::makeUser('mod.' . randomString(10), 'applicant');
         $this->userList['mod']->setField('PermissionID', MOD)->modify();
-        $manager = new \Gazelle\Manager\Applicant;
+        $manager = new \Gazelle\Manager\Applicant();
         $new = [
             'admin' => $manager->newReplyTotal($this->userList['admin']),
             'mod'   => $manager->newReplyTotal($this->userList['mod']),
         ];
 
-        $roleManager = new \Gazelle\Manager\ApplicantRole;
+        $roleManager = new \Gazelle\Manager\ApplicantRole();
         $this->roleList[] = $role =
             $roleManager->create('phpunit ' . randomString(6), 'this is a phpunit role', true, $this->userList['admin']);
 
@@ -112,12 +112,12 @@ public function testRoleViewer(): void {
         $this->userList['mod'] = Helper::makeUser('mod.' . randomString(10), 'applicant');
         $this->userList['mod']->setField('PermissionID', MOD)->modify();
 
-        $manager = new \Gazelle\Manager\Applicant;
+        $manager = new \Gazelle\Manager\Applicant();
         $new = [
             'admin' => $manager->newTotal($this->userList['admin']),
             'mod'   => $manager->newTotal($this->userList['mod']),
         ];
-        $roleManager = new \Gazelle\Manager\ApplicantRole;
+        $roleManager = new \Gazelle\Manager\ApplicantRole();
         $this->roleList[] = $basic =
             $roleManager->create('phpunit ' . randomString(6), 'this is a phpunit basic role', true, $this->userList['admin']);
         $basic->setField('viewer_list', '@' . $this->userList['mod']->username());
@@ -150,7 +150,7 @@ public function testRoleViewer(): void {
     }
 
     public function testUnpublishedRole(): void {
-        $roleManager = new \Gazelle\Manager\ApplicantRole;
+        $roleManager = new \Gazelle\Manager\ApplicantRole();
         $total = count($roleManager->list());
         $totalPublished = count($roleManager->publishedList());
 
diff --git a/tests/phpunit/ArtistTest.php b/tests/phpunit/ArtistTest.php
index adee72c28..751678e63 100644
--- a/tests/phpunit/ArtistTest.php
+++ b/tests/phpunit/ArtistTest.php
@@ -20,8 +20,8 @@ public function setUp(): void {
     }
 
     public function tearDown(): void {
-        $logger  = new \Gazelle\Log;
-        $manager = new \Gazelle\Manager\Artist;
+        $logger  = new \Gazelle\Log();
+        $manager = new \Gazelle\Manager\Artist();
         foreach ($this->artistIdList as $artistId) {
             $artist = $manager->findById($artistId);
             if ($artist) {
@@ -44,7 +44,7 @@ public function tearDown(): void {
     }
 
     public function testArtistCreate(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         $this->assertNull($manager->findById(-666), 'artist-find-fail');
 
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
@@ -74,7 +74,7 @@ public function testArtistCreate(): void {
     }
 
     public function testArtistInfo(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -89,7 +89,7 @@ public function testArtistInfo(): void {
     }
 
     public function testArtistRevision(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -129,15 +129,15 @@ public function testArtistRevision(): void {
     }
 
     public function testArtistAlias(): void {
-        $manager = new \Gazelle\Manager\Artist;
-        $logger  = new \Gazelle\Log;
+        $manager = new \Gazelle\Manager\Artist();
+        $logger  = new \Gazelle\Log();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findByAliasId($aliasId);
         $this->artistIdList[] = $artist->id();
 
         $this->assertEquals($artistId, $artist->id(), 'artist-find-by-alias');
         $this->assertEquals(1, $manager->aliasUseTotal($aliasId), 'artist-sole-alias');
-        $this->assertCount(0, $manager->tgroupList($aliasId, new Gazelle\Manager\TGroup), 'artist-no-tgroup');
+        $this->assertCount(0, $manager->tgroupList($aliasId, new Gazelle\Manager\TGroup()), 'artist-no-tgroup');
 
         $aliasName = $artist->name() . '-alias';
         $newId = $artist->addAlias($aliasName, 0, $this->user, $logger);
@@ -152,8 +152,8 @@ public function testArtistAlias(): void {
     }
 
     public function testArtistNonRedirAlias(): void {
-        $manager = new \Gazelle\Manager\Artist;
-        $logger  = new \Gazelle\Log;
+        $manager = new \Gazelle\Manager\Artist();
+        $logger  = new \Gazelle\Log();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findByAliasId($aliasId);
         $this->artistIdList[] = $artist->id();
@@ -164,7 +164,7 @@ public function testArtistNonRedirAlias(): void {
     }
 
     public function testArtistMerge(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         $oldName = 'phpunit.artist.' . randomString(12);
         [$oldArtistId, $oldAliasId] = $manager->create($oldName);
         $old = $manager->findById($oldArtistId);
@@ -178,7 +178,7 @@ public function testArtistMerge(): void {
         $userBk = new Gazelle\User\Bookmark($this->user);
         $userBk->create('artist', $oldArtistId);
 
-        $commentMan = new \Gazelle\Manager\Comment;
+        $commentMan = new \Gazelle\Manager\Comment();
         $postList = [
             $commentMan->create($this->user, 'artist', $old->id(), 'phpunit merge ' . randomString(6)),
             $commentMan->create($this->user, 'artist', $new->id(), 'phpunit merge ' . randomString(6)),
@@ -189,8 +189,8 @@ public function testArtistMerge(): void {
         $extraBk->create('artist', $oldArtistId);
         $extraBk->create('artist', $newArtistId);
 
-        $log = new Gazelle\Log;
-        $collMan = new Gazelle\Manager\Collage;
+        $log = new Gazelle\Log();
+        $collMan = new Gazelle\Manager\Collage();
         $this->collage = $collMan->create(
             user:        $this->user,
             categoryId:  CollageType::artist->value,
@@ -221,10 +221,10 @@ public function testArtistMerge(): void {
             $new->merge(
                 $old,
                 $this->user,
-                new Gazelle\Manager\Collage,
-                new Gazelle\Manager\Comment,
-                new Gazelle\Manager\Request,
-                new Gazelle\Manager\TGroup,
+                new Gazelle\Manager\Collage(),
+                new Gazelle\Manager\Comment(),
+                new Gazelle\Manager\Request(),
+                new Gazelle\Manager\TGroup(),
                 $log,
             ),
             'artist-merge-n',
@@ -259,7 +259,7 @@ public function testArtistMerge(): void {
     }
 
     public function testArtistModify(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -286,7 +286,7 @@ public function testArtistModify(): void {
     }
 
     public function testArtistRename(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -294,26 +294,26 @@ public function testArtistRename(): void {
         $rename = $artist->name() . '-rename';
         $this->assertEquals(
             $aliasId + 1,
-            $artist->rename($aliasId, $rename, new Gazelle\Manager\Request, $this->user),
+            $artist->rename($aliasId, $rename, new Gazelle\Manager\Request(), $this->user),
             'artist-rename'
         );
         $this->assertEquals($rename, $artist->name(), 'artist-is-renamed');
     }
 
     public function testArtistRenameHarder(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
 
-        $commentMan = new \Gazelle\Manager\Comment;
+        $commentMan = new \Gazelle\Manager\Comment();
         $post = $commentMan->create($this->user, 'artist', $artist->id(), 'phpunit smart rename ' . randomString(6));
 
-        $requestMan = new Gazelle\Manager\Request;
+        $requestMan = new Gazelle\Manager\Request();
         $request = $requestMan->create(
             user:            $this->user,
             bounty:          100 * 1024 ** 2,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit smart rename ' . randomString(6),
             image:           '',
@@ -330,7 +330,7 @@ public function testArtistRenameHarder(): void {
         );
         $request->artistRole()->set(
             [ARTIST_MAIN => [$artist->name()]],
-            new Gazelle\Manager\Artist,
+            new Gazelle\Manager\Artist(),
         );
 
         $this->tgroupList = [
@@ -348,14 +348,14 @@ public function testArtistRenameHarder(): void {
             $manager,
             $commentMan,
             $requestMan,
-            new \Gazelle\Manager\TGroup,
+            new \Gazelle\Manager\TGroup(),
             $this->user,
         );
         $this->assertEquals($name, $renamed->name(), 'artist-is-smart-renamed');
 
         $commentPage = new Gazelle\Comment\Artist($renamed->id(), 1, 0);
         $commentPage->load();
-        $threadList = $commentPage->threadList(new Gazelle\Manager\User);
+        $threadList = $commentPage->threadList(new Gazelle\Manager\User());
         $this->assertCount(1, $threadList, 'artist-renamed-comments');
         $this->assertEquals($post->id(), $threadList[0]['postId'], 'artist-renamed-comments');
 
@@ -367,11 +367,10 @@ public function testArtistRenameHarder(): void {
         $this->tgroupList[0]->flush();
         $idList = $this->tgroupList[0]->artistRole()->idList();
         $this->assertEquals($renamed->id(), $idList[ARTIST_MAIN][0]['id'], 'artist-renamed-tgroup');
-
     }
 
     public function testArtistSimilar(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.artsim.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -387,7 +386,7 @@ public function testArtistSimilar(): void {
 
         $this->assertFalse($artist->similar()->voteSimilar($this->extra, $artist, true), 'artist-vote-self');
 
-        $logger  = new \Gazelle\Log;
+        $logger  = new \Gazelle\Log();
         $this->assertEquals(1, $artist->similar()->addSimilar($other1, $this->user, $logger), 'artist-add-other1');
         $this->assertEquals(0, $artist->similar()->addSimilar($other1, $this->user, $logger), 'artist-read-other1');
         $this->assertEquals(1, $artist->similar()->addSimilar($other2, $this->user, $logger), 'artist-add-other2');
@@ -426,14 +425,14 @@ public function testArtistSimilar(): void {
         $this->assertEquals($other2Id, $graph[$other1Id]['related'][0], 'artist-sim-related');
         $this->assertLessThan($graph[$other1Id]['proportion'], $graph[$other2Id]['proportion'], 'artist-sim-proportion');
 
-        $requestMan = new \Gazelle\Manager\Request;
+        $requestMan = new \Gazelle\Manager\Request();
         $this->assertFalse($artist->similar()->removeSimilar($artist, $this->extra, $logger), 'artist-remove-similar-self');
         $this->assertTrue($artist->similar()->removeSimilar($other2, $this->extra, $logger), 'artist-remove-other');
         $this->assertFalse($artist->similar()->removeSimilar($other2, $this->extra, $logger), 'artist-re-remove-other');
     }
 
     public function testArtistJson(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -442,9 +441,9 @@ public function testArtistJson(): void {
             $artist,
             $this->user,
             new Gazelle\User\Bookmark($this->user),
-            new Gazelle\Manager\Request,
-            new Gazelle\Manager\TGroup,
-            new Gazelle\Manager\Torrent,
+            new Gazelle\Manager\Request(),
+            new Gazelle\Manager\TGroup(),
+            new Gazelle\Manager\Torrent(),
         ));
         $this->assertInstanceOf(\Gazelle\Json\Artist::class, $json->setReleasesOnly(true), 'artist-json-set-releases');
         $payload = $json->payload();
@@ -460,7 +459,7 @@ public function testArtistJson(): void {
 
     public function testArtistBookmark(): void {
         $name = 'phpunit.' . randomString(12);
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create($name);
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
@@ -478,7 +477,7 @@ public function testArtistBookmark(): void {
     }
 
     public function testArtistDiscogs(): void {
-        $manager = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $manager->create('phpunit.' . randomString(12));
         $artist = $manager->findById($artistId);
         $this->artistIdList[] = $artist->id();
diff --git a/tests/phpunit/BonusTest.php b/tests/phpunit/BonusTest.php
index 67a25a752..cac5e70c4 100644
--- a/tests/phpunit/BonusTest.php
+++ b/tests/phpunit/BonusTest.php
@@ -19,7 +19,7 @@ public function tearDown(): void {
     }
 
     public function testBonus(): void {
-        $creator = new Gazelle\UserCreator;
+        $creator = new Gazelle\UserCreator();
         $this->userList['giver'] = $creator
             ->setUsername('bonusg.' . randomString(6))
             ->setEmail(randomString(6) . "@bonus.example.com")
@@ -63,7 +63,7 @@ public function testBonus(): void {
         $giver->setPoints($startingPoints);
         $this->assertEquals($startingPoints, $giver->user()->bonusPointsTotal(), 'bonus-set-points');
 
-        $itemList = (new Gazelle\Manager\Bonus)->itemList();
+        $itemList = (new Gazelle\Manager\Bonus())->itemList();
         $this->assertArrayHasKey('token-1', $itemList, 'item-token-1');
         $token = $giver->item('token-1');
         $price = $token['Price'];
@@ -133,13 +133,13 @@ public function testBonus(): void {
     }
 
     public function testStats(): void {
-        $eco = new \Gazelle\Stats\Economic;
+        $eco = new \Gazelle\Stats\Economic();
         $eco->flush();
 
         $total    = $eco->bonusTotal();
         $stranded = $eco->bonusStrandedTotal();
 
-        $this->userList['bonus'] = (new Gazelle\UserCreator)
+        $this->userList['bonus'] = (new Gazelle\UserCreator())
             ->setUsername('bonusstat.' . randomString(6))
             ->setEmail(randomString(6) . "@bonus.example.com")
             ->setPassword(randomString())
diff --git a/tests/phpunit/CacheTest.php b/tests/phpunit/CacheTest.php
index 7d39a0e29..96f8a8fe7 100644
--- a/tests/phpunit/CacheTest.php
+++ b/tests/phpunit/CacheTest.php
@@ -6,7 +6,7 @@
 
 class CacheTest extends TestCase {
     public function testCache(): void {
-        $cache = new Gazelle\Cache;
+        $cache = new Gazelle\Cache();
         $this->assertCount(0, $cache->hitList(), 'cache-hit-list-empty');
         $this->assertCount(0, $cache->deleteList(), 'cache-del-list-empty');
 
diff --git a/tests/phpunit/CategoryTest.php b/tests/phpunit/CategoryTest.php
index 433697181..d0bf7d65a 100644
--- a/tests/phpunit/CategoryTest.php
+++ b/tests/phpunit/CategoryTest.php
@@ -7,7 +7,7 @@
 
 class CategoryTest extends TestCase {
     public function testCategory(): void {
-        $manager = new Gazelle\Manager\Category;
+        $manager = new Gazelle\Manager\Category();
 
         $this->assertEquals(1, $manager->findIdByName('Music'), 'cat-name-comics');
         $this->assertEquals(7, $manager->findIdByName('Comics'), 'cat-name-comics');
@@ -22,8 +22,8 @@ public function testCategory(): void {
     }
 
     public function testChangeCategory(): void {
-        $tgMan  = new Gazelle\Manager\TGroup;
-        $torMan = new Gazelle\Manager\Torrent;
+        $tgMan  = new Gazelle\Manager\TGroup();
+        $torMan = new Gazelle\Manager\Torrent();
         $user   = Helper::makeUser('tgcat.' . randomString(10), 'tgroup-cat');
         $tgroup = Helper::makeTGroupEBook(
             name: 'phpunit category change ' . randomString(6),
@@ -47,18 +47,18 @@ public function testChangeCategory(): void {
         $new = $tgMan->changeCategory(
             old:         $tgroup,
             torrent:     $torrentList[1],
-            categoryId:  (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:  (new Gazelle\Manager\Category())->findIdByName('Music'),
             name:        'phpunit category new ' . randomString(6),
             year:        (int)date('Y'),
             artistName:  $artistName,
-            releaseType: (new Gazelle\ReleaseType)->findIdByName('EP'),
-            artistMan:   new Gazelle\Manager\Artist,
-            logger:      new Gazelle\Log,
+            releaseType: (new Gazelle\ReleaseType())->findIdByName('EP'),
+            artistMan:   new Gazelle\Manager\Artist(),
+            logger:      new Gazelle\Log(),
             user:        $user,
         );
         $this->assertInstanceOf(Gazelle\TGroup::class, $new, 'cat-change-to-music');
         $this->assertTrue($new->hasArtistRole(), 'tgroup-cat-is-music');
-        $artist = (new Gazelle\Manager\Artist)->findByName($artistName);
+        $artist = (new Gazelle\Manager\Artist())->findByName($artistName);
         $this->assertEquals($artistName, $artist->name(), 'cat-new-artist');
         $this->assertEquals(
             [
@@ -86,9 +86,9 @@ public function testChangeCategory(): void {
             name:        'phpunit category new ' . randomString(6),
             year:        (int)date('Y'),
             artistName:  'new artist ' . randomString(6),
-            releaseType: (new Gazelle\ReleaseType)->findIdByName('EP'),
-            artistMan:   new Gazelle\Manager\Artist,
-            logger:      new Gazelle\Log,
+            releaseType: (new Gazelle\ReleaseType())->findIdByName('EP'),
+            artistMan:   new Gazelle\Manager\Artist(),
+            logger:      new Gazelle\Log(),
             user:        $user,
         );
         $this->assertNull($new, 'cat-change-to-same');
@@ -98,13 +98,13 @@ public function testChangeCategory(): void {
         $new = $tgMan->changeCategory(
             old:         $tgroup,
             torrent:     $torrentList[0],
-            categoryId:  (new Gazelle\Manager\Category)->findIdByName('Comedy'),
+            categoryId:  (new Gazelle\Manager\Category())->findIdByName('Comedy'),
             name:        'phpunit category new ' . randomString(6),
             year:        (int)date('Y'),
             artistName:  null,
             releaseType: null,
-            artistMan:   new Gazelle\Manager\Artist,
-            logger:      new Gazelle\Log,
+            artistMan:   new Gazelle\Manager\Artist(),
+            logger:      new Gazelle\Log(),
             user:        $user,
         );
         $this->assertInstanceOf(Gazelle\TGroup::class, $new, 'cat-change-to-comedy');
diff --git a/tests/phpunit/ClientWhitelistTest.php b/tests/phpunit/ClientWhitelistTest.php
index 539e5fd33..8b4066839 100644
--- a/tests/phpunit/ClientWhitelistTest.php
+++ b/tests/phpunit/ClientWhitelistTest.php
@@ -6,7 +6,7 @@
 
 class ClientWhitelistTest extends TestCase {
     public function testWhitelist(): void {
-        $manager = new Gazelle\Manager\ClientWhitelist;
+        $manager = new Gazelle\Manager\ClientWhitelist();
         $initial = $manager->list();
         $this->assertIsArray($initial, 'cwl-initial');
 
diff --git a/tests/phpunit/CollageTest.php b/tests/phpunit/CollageTest.php
index c1cbcb202..14fb05b4b 100644
--- a/tests/phpunit/CollageTest.php
+++ b/tests/phpunit/CollageTest.php
@@ -38,8 +38,8 @@ public function setUp(): void {
         ];
 
         $this->tgroupList = [];
-        $artistMan = new Gazelle\Manager\Artist;
-        $log       = new Gazelle\Log;
+        $artistMan = new Gazelle\Manager\Artist();
+        $log       = new Gazelle\Log();
         $user      = $this->userList['u1'];
         $this->tgroupList = [
             Helper::makeTGroupMusic(
@@ -89,13 +89,13 @@ public function tearDown(): void {
     }
 
     public function testArgParse(): void {
-        $this->collageList[] = (new Gazelle\Manager\Collage)->create(
+        $this->collageList[] = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::theme->value,
             name:        'phpunit collage lock ' . randomString(20),
             description: 'phpunit collage lock description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
         // NB: These objects should never be instantiated directly
@@ -128,8 +128,8 @@ public function testArgParse(): void {
     }
 
     public function test00CollageCreate(): void {
-        $manager     = new Gazelle\Manager\Collage;
-        $stats       = new Gazelle\Stats\Collage;
+        $manager     = new Gazelle\Manager\Collage();
+        $stats       = new Gazelle\Stats\Collage();
         $total       = $stats->collageTotal();
         $name        = 'phpunit collage create ' . randomString(20);
         $description = 'phpunit collage create description';
@@ -140,7 +140,7 @@ public function test00CollageCreate(): void {
             name:        $name,
             description: $description,
             tagList:     implode(' ', $tagList),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
 
@@ -177,14 +177,14 @@ public function test00CollageCreate(): void {
     }
 
     public function testCollageAdd(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $this->collageList[] = $manager->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::theme->value,
             name:        'phpunit collage add ' . randomString(20),
             description: 'phpunit collage add description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
 
@@ -225,8 +225,8 @@ public function testCollageAdd(): void {
     }
 
     public function testCollageArtist(): void {
-        $manager = new Gazelle\Manager\Collage;
-        $logger = new Gazelle\Log;
+        $manager = new Gazelle\Manager\Collage();
+        $logger = new Gazelle\Log();
         $this->collageList = [
             $manager->create(
                 user:        $this->userList['u1'],
@@ -254,7 +254,7 @@ public function testCollageArtist(): void {
             ),
         ];
 
-        $artistMan = new Gazelle\Manager\Artist;
+        $artistMan = new Gazelle\Manager\Artist();
         $artistList = [];
         foreach ($this->artistName as $artistName) {
             $artist = $artistMan->findByName($artistName);
@@ -294,14 +294,14 @@ public function testCollageArtist(): void {
     }
 
     public function testCollageContribute(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $this->collageList[] = $manager->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::label->value,
             name:        'phpunit collage contrib ' . randomString(20),
             description: 'phpunit collage contrib description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
         $this->assertEquals(0, $collage->numContributors(), 'collage-no-contributors');
@@ -373,7 +373,7 @@ public function testCollageContribute(): void {
     }
 
     public function testCollageFeature(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $user    = $this->userList['u1'];
         $this->collageList = [
             $manager->create(
@@ -382,7 +382,7 @@ public function testCollageFeature(): void {
                 name:        'phpunit collage feat 001 ' . randomString(20),
                 description: 'phpunit collage feature description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $user,
@@ -390,7 +390,7 @@ public function testCollageFeature(): void {
                 name:        'phpunit collage feat 002 ' . randomString(20),
                 description: 'phpunit collage feature description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $user,
@@ -398,7 +398,7 @@ public function testCollageFeature(): void {
                 name:        'phpunit collage feat 003 ' . randomString(20),
                 description: 'phpunit collage feature description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $user,
@@ -406,7 +406,7 @@ public function testCollageFeature(): void {
                 name:        'phpunit collage feat 004 ' . randomString(20),
                 description: 'phpunit collage feature description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
         ];
         $personal = $manager->findPersonalByUser($user);
@@ -434,13 +434,13 @@ public function testCollageFeature(): void {
     }
 
     public function testCollageJson(): void {
-        $this->collageList[] = (new Gazelle\Manager\Collage)->create(
+        $this->collageList[] = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::staffPick->value,
             name:        'phpunit collage json ' . randomString(20),
             description: 'phpunit collage json description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
         foreach (range(0, 3) as $n) {
@@ -451,8 +451,8 @@ public function testCollageJson(): void {
         $payload = (new Gazelle\Json\Collage(
                 $collage,
                 $this->userList['u1'],
-                new Gazelle\Manager\TGroup,
-                new Gazelle\Manager\Torrent,
+                new Gazelle\Manager\TGroup(),
+                new Gazelle\Manager\Torrent(),
             ))->payload();
         $this->assertEquals($collage->id(), $payload['id'], 'collage-json-id');
         $this->assertEquals('Staff picks', $payload['collageCategoryName'], 'collage-json-cat-name');
@@ -461,13 +461,13 @@ public function testCollageJson(): void {
     }
 
     public function testCollageLock(): void {
-        $this->collageList[] = (new Gazelle\Manager\Collage)->create(
+        $this->collageList[] = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::chart->value,
             name:        'phpunit collage lock ' . randomString(20),
             description: 'phpunit collage lock description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
 
@@ -480,7 +480,7 @@ public function testCollageLock(): void {
     }
 
     public function testCollageManager(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $this->assertEquals(
             $this->userList['u1']->username() . "'s personal collage",
             $manager->personalCollageName($this->userList['u1']->username()),
@@ -495,7 +495,7 @@ public function testCollageManager(): void {
                 name:        $stem . randomString(20),
                 description: 'phpunit collage man description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $this->userList['u1'],
@@ -503,7 +503,7 @@ public function testCollageManager(): void {
                 name:        $stem . randomString(20),
                 description: 'phpunit collage man description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $this->userList['u1'],
@@ -511,7 +511,7 @@ public function testCollageManager(): void {
                 name:        $stem . randomString(20),
                 description: 'phpunit collage man description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $this->userList['u2'],
@@ -519,7 +519,7 @@ public function testCollageManager(): void {
                 name:        $stem . randomString(20),
                 description: 'phpunit collage man description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
             $manager->create(
                 user:        $this->userList['u2'],
@@ -527,7 +527,7 @@ public function testCollageManager(): void {
                 name:        $stem . randomString(20),
                 description: 'phpunit collage man description',
                 tagList:     implode(' ', $this->tagList(3)),
-                logger:      new Gazelle\Log,
+                logger:      new Gazelle\Log(),
             ),
         ];
         $this->assertCount(
@@ -551,13 +551,13 @@ public function testCollageManager(): void {
     }
 
     public function testCollagePersonal(): void {
-        $this->collageList[] = (new Gazelle\Manager\Collage)->create(
+        $this->collageList[] = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList['u1'],
             categoryId:  CollageType::personal->value,
             name:        'phpunit collage personal ' . randomString(20),
             description: 'phpunit collage personal description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
         // $this->userList['u1']->addCustomPrivilege('site_collages_manage');
@@ -619,7 +619,7 @@ public function testCollagePersonal(): void {
     }
 
     public function testCollageRemove(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $name    = 'phpunit collage remove ' . randomString(20);
         $this->collageList[] = $manager->create(
             user:        $this->userList['u1'],
@@ -627,7 +627,7 @@ public function testCollageRemove(): void {
             name:        $name,
             description: 'phpunit collage remove description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $collage = $this->collageList[0];
 
@@ -642,7 +642,7 @@ public function testCollageRemove(): void {
     }
 
     public function testCollageAjaxAdd(): void {
-        $manager = new Gazelle\Manager\Collage;
+        $manager = new Gazelle\Manager\Collage();
         $name    = 'phpunit collage ajax ' . randomString(20);
         $collage = $this->collageList[] = $manager->create(
             user:        $this->userList['u1'],
@@ -650,10 +650,10 @@ public function testCollageAjaxAdd(): void {
             name:        $name,
             description: 'phpunit collage ajax description',
             tagList:     implode(' ', $this->tagList(3)),
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
-        $artMan    = new Gazelle\Manager\Artist;
-        $tgMan     = new Gazelle\Manager\TGroup;
+        $artMan    = new Gazelle\Manager\Artist();
+        $tgMan     = new Gazelle\Manager\TGroup();
 
         $fail = new Gazelle\Json\Ajax\CollageAdd(
             collageId:     0,
diff --git a/tests/phpunit/CommentTest.php b/tests/phpunit/CommentTest.php
index f1ac88923..d2b85aeb8 100644
--- a/tests/phpunit/CommentTest.php
+++ b/tests/phpunit/CommentTest.php
@@ -18,7 +18,7 @@ public function setUp(): void {
 
     public function tearDown(): void {
         if (isset($this->artist)) {
-            $this->artist->remove($this->user, new \Gazelle\Log);
+            $this->artist->remove($this->user, new \Gazelle\Log());
         }
         if (isset($this->collage)) {
             $this->collage->hardRemove();
@@ -33,8 +33,8 @@ public function tearDown(): void {
     }
 
     public function testCommentArtist(): void {
-        $manager = new \Gazelle\Manager\Comment;
-        $artMan  = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Comment();
+        $artMan  = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $artMan->create('phpunit.' . randomString(12));
         $this->artist = $artMan->findById($artistId);
 
@@ -53,7 +53,7 @@ public function testCommentArtist(): void {
         $this->assertInstanceOf(\Gazelle\Comment\Artist::class, $comment->load(), 'comment-artist-load');
         $thread = $comment->thread();
         $this->assertCount(2, $thread, 'comment-artist-thread');
-        $this->assertCount(2, $comment->threadList(new \Gazelle\Manager\User), 'comment-artist-threadlist');
+        $this->assertCount(2, $comment->threadList(new \Gazelle\Manager\User()), 'comment-artist-threadlist');
         $this->assertEquals(2, $comment->total(), 'comment-artist-total');
         $this->assertEquals($this->user->id(), $reply->userId(), 'comment-artist-user-id');
         $this->assertEquals(0, $comment->handleSubscription($this->user), 'comment-artist-handle-subscription');
@@ -66,16 +66,16 @@ public function testCommentArtist(): void {
     }
 
     public function testCommentCollage(): void {
-        $this->collage = (new Gazelle\Manager\Collage)->create(
+        $this->collage = (new Gazelle\Manager\Collage())->create(
             user:        $this->user,
             categoryId:  1, /* Theme */
             name:        'phpunit collage comment ' . randomString(20),
             description: 'phpunit collage comment description',
             tagList:     'acoustic electronic',
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
 
-        $manager = new \Gazelle\Manager\Comment;
+        $manager = new \Gazelle\Manager\Comment();
         $body    = 'phpunit comment ' . randomString(10);
         $comment = $manager->create($this->user, 'collages', $this->collage->id(), $body);
         $this->assertEquals($body, $manager->findBodyById($comment->id()), 'comment-find-body');
@@ -90,10 +90,10 @@ public function testCommentCollage(): void {
     }
 
     public function testCommentRequest(): void {
-        $this->request = (new Gazelle\Manager\Request)->create(
+        $this->request = (new Gazelle\Manager\Request())->create(
             user:            $this->user,
             bounty:          REQUEST_MIN * 1024 * 1024,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit request comment',
             image:           '',
@@ -109,7 +109,7 @@ public function testCommentRequest(): void {
             oclc:            '',
         );
 
-        $manager = new \Gazelle\Manager\Comment;
+        $manager = new \Gazelle\Manager\Comment();
         $comment = $manager->create($this->user, 'requests', $this->request->id(), 'phpunit comment ' . randomString(10));
         $this->assertInstanceOf(\Gazelle\Comment\Request::class, $comment, 'comment-request-create');
         $this->assertEquals('requests', $comment->page(), 'comment-request-page');
@@ -121,7 +121,7 @@ public function testCommentRequest(): void {
     }
 
     public function testCommentTGroup(): void {
-        $manager = new \Gazelle\Manager\Comment;
+        $manager = new \Gazelle\Manager\Comment();
         $this->torrent = Helper::makeTorrentMusic(
             tgroup: Helper::makeTGroupMusic(
                 name:       'phpunit comment ' . randomString(6),
@@ -157,8 +157,8 @@ public function testCommentTGroup(): void {
     }
 
     public function testCommentMerge(): void {
-        $manager = new \Gazelle\Manager\Comment;
-        $artMan  = new \Gazelle\Manager\Artist;
+        $manager = new \Gazelle\Manager\Comment();
+        $artMan  = new \Gazelle\Manager\Artist();
         [$artistId, $aliasId] = $artMan->create('phpunit.' . randomString(12));
         $this->artist = $artMan->findById($artistId);
 
@@ -171,6 +171,6 @@ public function testCommentMerge(): void {
         $manager->merge('artist', $artistExtraId, $this->artist->id());
         $this->assertInstanceOf(\Gazelle\Comment\Artist::class, $comment->load(), 'comment-merge-load');
         $this->assertCount(2, $comment->thread(), 'comment-artist-merged-thread');
-        $artistExtra->remove($this->user, new \Gazelle\Log);
+        $artistExtra->remove($this->user, new \Gazelle\Log());
     }
 }
diff --git a/tests/phpunit/CounterTest.php b/tests/phpunit/CounterTest.php
index e527acd82..32b5060bd 100644
--- a/tests/phpunit/CounterTest.php
+++ b/tests/phpunit/CounterTest.php
@@ -7,7 +7,7 @@
 class CounterTest extends TestCase {
     public function testCounter(): void {
         $name    = "phpunit-" . randomString(10);
-        $manager = new Gazelle\Manager\Counter;
+        $manager = new Gazelle\Manager\Counter();
         $counter = $manager->create($name, 'phpunit description');
 
         $this->assertEquals($name, $counter->name(), 'counter-name');
diff --git a/tests/phpunit/DbTest.php b/tests/phpunit/DbTest.php
index 3a9e4cf20..daa1ab3b5 100644
--- a/tests/phpunit/DbTest.php
+++ b/tests/phpunit/DbTest.php
@@ -17,7 +17,7 @@ public function testTableCoherency(): void {
             ", SQLDB
         );
 
-        $dbMan = new Gazelle\DB;
+        $dbMan = new Gazelle\DB();
         foreach ($db->collect(0, false) as $tableName) {
             [$ok, $message] = $dbMan->checkStructureMatch(SQLDB, $tableName, "deleted_$tableName");
             $this->assertTrue($ok, "mismatch -- $message");
@@ -25,19 +25,19 @@ public function testTableCoherency(): void {
     }
 
     public function testGlobalStatus(): void {
-        $status = (new Gazelle\DB)->globalStatus();
+        $status = (new Gazelle\DB())->globalStatus();
         $this->assertGreaterThan(500, count($status), 'db-global-status');
         $this->assertEquals('server-cert.pem', $status['Current_tls_cert']['Value'], 'db-current-tls-cert');
     }
 
     public function testGlobalVariables(): void {
-        $list = (new Gazelle\DB)->globalVariables();
+        $list = (new Gazelle\DB())->globalVariables();
         $this->assertGreaterThan(500, count($list), 'db-global-variables');
         $this->assertEquals('ON', $list['foreign_key_checks']['Value'], 'db-foreign-key-checks-on');
     }
 
     public function testLongRunning(): void {
-        $this->assertEquals(0, (new Gazelle\DB)->longRunning(), 'db-long-running');
+        $this->assertEquals(0, (new Gazelle\DB())->longRunning(), 'db-long-running');
     }
 
     public function testPg(): void {
diff --git a/tests/phpunit/DnuTest.php b/tests/phpunit/DnuTest.php
index cea429f73..8960661ed 100644
--- a/tests/phpunit/DnuTest.php
+++ b/tests/phpunit/DnuTest.php
@@ -17,7 +17,7 @@ public function tearDown(): void {
     }
 
     public function testDnu(): void {
-        $manager = new Gazelle\Manager\DNU;
+        $manager = new Gazelle\Manager\DNU();
 
         $initial = $manager->dnuList();
         $dnu = $manager->create('phpunit ' . randomString(10), 'phpunit description', $this->user);
@@ -51,7 +51,7 @@ public function testDnu(): void {
     }
 
     public function testReorder(): void {
-        $manager = new Gazelle\Manager\DNU;
+        $manager = new Gazelle\Manager\DNU();
         $idList = array_map(fn ($x) => $x['id'], $manager->dnuList());
 
         $first  = $manager->create('phpunit first ' . randomString(10), 'phpunit description', $this->user);
diff --git a/tests/phpunit/DonorTest.php b/tests/phpunit/DonorTest.php
index 051dbcf6f..60ed98e3f 100644
--- a/tests/phpunit/DonorTest.php
+++ b/tests/phpunit/DonorTest.php
@@ -319,7 +319,7 @@ public function testDonorRank(): void {
         );
         $this->assertEquals(1, $db->affected_rows(), 'donor-found-expirable');
 
-        $manager = new Gazelle\Manager\Donation;
+        $manager = new Gazelle\Manager\Donation();
         $this->assertEquals(1, $manager->expireRanks(), 'donor-expiry');
         $donor->flush();
         $this->assertEquals(5, $donor->rank(), 'donor-rank-now-5');
@@ -387,7 +387,7 @@ public function testDonorSpecial(): void {
     }
 
     public function testDonorManager(): void {
-        $manager = new Gazelle\Manager\Donation;
+        $manager = new Gazelle\Manager\Donation();
         $initial = $manager->rewardTotal();
         $initialGrand = $manager->grandTotal();
 
@@ -411,7 +411,7 @@ public function testDonorManager(): void {
             'donor-manager-grand-total'
         );
 
-        $this->assertGreaterThan(0, $manager->topDonorList(100, new Gazelle\Manager\User), 'donor-top-donor');
+        $this->assertGreaterThan(0, $manager->topDonorList(100, new Gazelle\Manager\User()), 'donor-top-donor');
         $this->assertGreaterThan($initial + DONOR_RANK_PRICE, $manager->totalMonth(1), 'donor-manager-month');
         $username = $this->donor->user()->username();
         $entry = array_values(array_filter($manager->rewardPage(null, 100, 0), fn($d) => $d['user_id'] == $this->donor->id()))[0];
@@ -435,7 +435,7 @@ public function testDonorManager(): void {
                'BrowserVersion'         => '1.0',
                'OperatingSystem'        => 'phpunit/OS',
                'OperatingSystemVersion' => '1.0',
-           ],
+            ],
             'ipaddr'      => '127.0.0.1',
             'useragent'   => 'phpunit',
         ]);
diff --git a/tests/phpunit/DownloadTest.php b/tests/phpunit/DownloadTest.php
index 2b5c8b0dd..3ecbdf946 100644
--- a/tests/phpunit/DownloadTest.php
+++ b/tests/phpunit/DownloadTest.php
@@ -102,7 +102,7 @@ public function testRedownload(): void {
         $this->assertEquals(DownloadStatus::ok, $redownload->status(), 'redown-redownload');
         $this->assertFalse($this->torrent->isFreeleechPersonal(), 'redown-torrent-is-still-not-pfl');
 
-        (new Gazelle\Stats\Users)->refresh();
+        (new Gazelle\Stats\Users())->refresh();
         $this->assertEquals(2, $user->stats()->downloadTotal(), 'redown-user-download-total');
         $this->assertEquals(1, $user->stats()->downloadUnique(), 'redown-user-download-unique');
     }
diff --git a/tests/phpunit/FileStorageTest.php b/tests/phpunit/FileStorageTest.php
index 7258fd716..4bf05b408 100644
--- a/tests/phpunit/FileStorageTest.php
+++ b/tests/phpunit/FileStorageTest.php
@@ -6,7 +6,7 @@
 
 class FileStorageTest extends TestCase {
     public function testTorrentPath(): void {
-        $filer = new Gazelle\File\Torrent;
+        $filer = new Gazelle\File\Torrent();
         $this->assertEquals(STORAGE_PATH_TORRENT . '/10/00/1.torrent',     $filer->path(1),     'file-torrent-00001');
         $this->assertEquals(STORAGE_PATH_TORRENT . '/01/00/10.torrent',    $filer->path(10),    'file-torrent-00010');
         $this->assertEquals(STORAGE_PATH_TORRENT . '/00/10/100.torrent',   $filer->path(100),   'file-torrent-00100');
@@ -21,21 +21,21 @@ public function testTorrentPath(): void {
     }
 
     public function testRipLogPath(): void {
-        $filer = new Gazelle\File\RipLog;
+        $filer = new Gazelle\File\RipLog();
         $this->assertEquals(STORAGE_PATH_RIPLOG  . '/71/00/17_34.log',     $filer->path([17, 34]), 'file-riplog-17-14');
         $this->assertEquals(STORAGE_PATH_RIPLOG  . '/73/16/16137_707.log', $filer->path([16137, 707]), 'file-riplog-16137-707');
         $this->assertEquals(STORAGE_PATH_RIPLOG  . '/73/16/16137_708.log', $filer->path([16137, 708]), 'file-riplog-16137-708');
     }
 
     public function testRipLogHTMLPath(): void {
-        $filer = new Gazelle\File\RipLogHTML;
+        $filer = new Gazelle\File\RipLogHTML();
         $this->assertEquals(STORAGE_PATH_RIPLOGHTML  . '/72/00/27_44.html',     $filer->path([27, 44]), 'file-html-27-44');
         $this->assertEquals(STORAGE_PATH_RIPLOGHTML  . '/73/16/26137_807.html', $filer->path([26137, 807]), 'file-html-26137-807');
         $this->assertEquals(STORAGE_PATH_RIPLOGHTML  . '/73/16/26137_808.html', $filer->path([26137, 808]), 'file-html-26137-808');
     }
 
     public function testContestsRipLogHTML(): void {
-        $filer = new Gazelle\File\RipLogHTML;
+        $filer = new Gazelle\File\RipLogHTML();
         $id    = [2651337, 306];
         $this->assertFalse($filer->exists($id), 'file-h-not-exists');
         $this->assertFalse($filer->get($id),    'file-h-not-get');
@@ -57,7 +57,7 @@ public function testContestsRipLog(): void {
          * uploads and there is no easy way to mock it.
          */
         $id    = [0, 0];
-        $filer = new Gazelle\File\RipLog;
+        $filer = new Gazelle\File\RipLog();
         $this->assertFalse($filer->exists($id), 'file-r-exists-nok');
         $this->assertFalse($filer->get($id),    'file-r-get-nok');
 
@@ -69,7 +69,7 @@ public function testContestsRipLog(): void {
     }
 
     public function testContestsTorrent(): void {
-        $filer = new Gazelle\File\Torrent;
+        $filer = new Gazelle\File\Torrent();
         $text  = "This is a phpunit torrent file";
         $id    = 906622;
         $this->assertTrue($filer->put($text, $id),   'file-t-put-ok');
diff --git a/tests/phpunit/ForumSearchTest.php b/tests/phpunit/ForumSearchTest.php
index a05412e11..3c2b16a49 100644
--- a/tests/phpunit/ForumSearchTest.php
+++ b/tests/phpunit/ForumSearchTest.php
@@ -23,7 +23,7 @@ public function tearDown(): void {
     }
 
     public function testForumSearchThread(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10001);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10001);
         $this->forum  = Helper::makeForum(
             user:        $this->user,
             sequence:    250,
@@ -33,7 +33,7 @@ public function testForumSearchThread(): void {
         );
         $title        = 'search thread ' . randomString(10);
         $body         = 'search body ' . randomString(10);
-        $threadMan    = new \Gazelle\Manager\ForumThread;
+        $threadMan    = new \Gazelle\Manager\ForumThread();
         $this->thread = $threadMan->create($this->forum, $this->user, $title, $body);
 
         $search = new \Gazelle\Search\Forum($this->user);
@@ -66,7 +66,7 @@ public function testForumSearchThread(): void {
     }
 
     public function testForumSearchAuthor(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10001);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10001);
         $this->forum  = Helper::makeForum(
             user:        $this->user,
             sequence:    250,
@@ -76,7 +76,7 @@ public function testForumSearchAuthor(): void {
         );
         $title        = 'search thread ' . randomString(10);
         $body         = 'search body ' . randomString(10);
-        $threadMan    = new \Gazelle\Manager\ForumThread;
+        $threadMan    = new \Gazelle\Manager\ForumThread();
         $this->thread = $threadMan->create($this->forum, $this->user, $title, $body);
 
         $search = new \Gazelle\Search\Forum($this->user);
diff --git a/tests/phpunit/ForumTest.php b/tests/phpunit/ForumTest.php
index 23b9be9bc..5b74997a4 100644
--- a/tests/phpunit/ForumTest.php
+++ b/tests/phpunit/ForumTest.php
@@ -44,7 +44,7 @@ public function tearDown(): void {
 
     public function testForumCreate(): void {
         // Forum Categories
-        $fcatMan = new \Gazelle\Manager\ForumCategory;
+        $fcatMan = new \Gazelle\Manager\ForumCategory();
         $initial = count($fcatMan->forumCategoryList()); // from phinx seeds
 
         // If you hit a duplicate key error here it is due to an aborted previous test run
@@ -66,7 +66,7 @@ public function testForumCreate(): void {
         $this->assertCount($initial + 1, $fcatMan->usageList(), 'forum-cat-usage-removed');
 
         // Forums
-        $forumMan     = new \Gazelle\Manager\Forum;
+        $forumMan     = new \Gazelle\Manager\Forum();
         $initial      = count($forumMan->nameList());
         $tocTotal     = count($forumMan->tableOfContentsMain());
         $admin        = $this->userList['admin'];
@@ -135,7 +135,7 @@ public function testForumCreate(): void {
         $this->assertEquals(0, $forumMan->subscribedForumTotal($user), 'forum-subscribed-total-user');
 
         // Forum Threads
-        $threadMan = new \Gazelle\Manager\ForumThread;
+        $threadMan = new \Gazelle\Manager\ForumThread();
         $thread    = $threadMan->create($this->forum, $admin, 'thread title', 'this is a new thread');
         $this->assertEquals(1, $thread->postTotal(), 'fthread-post-total');
         $this->assertEquals(0, $thread->lastPage(), 'fthread-last-page');
@@ -217,7 +217,7 @@ public function testForumCreate(): void {
         $this->assertEquals(2, $admin->stats()->flush()->forumPostTotal(), 'fpost-first-user-reply');
 
         /* post first reply */
-        $postMan = new \Gazelle\Manager\ForumPost;
+        $postMan = new \Gazelle\Manager\ForumPost();
         $this->assertEquals($message, $post->body(), 'fpost-first-post');
         $this->assertEquals(1, $this->forum->numPosts(), 'fpost-forum-post-total');
 
@@ -231,13 +231,13 @@ public function testForumCreate(): void {
         $reply = $thread->addPost($user, $body);
         // Should the following actions (quote and subscription handling) be performed by the addPost() method?
         (new Gazelle\User\Notification\Quote($admin))->create(
-            new Gazelle\Manager\User,
+            new Gazelle\Manager\User(),
             $body,
             $reply->id(),
             'forums',
             $thread->id(),
         );
-        (new Gazelle\Manager\Subscription)->flushPage('forums', $thread->id());
+        (new Gazelle\Manager\Subscription())->flushPage('forums', $thread->id());
 
         $this->assertEquals(1, $forumMan->unreadSubscribedForumTotal($admin), 'fpost-subscriptions-admin-forum-man-unread');
         $this->assertEquals(1, $adminSub->flush()->unread(), 'fpost-subscriptions-admin-new-unread');
@@ -281,7 +281,7 @@ public function testForumCreate(): void {
     }
 
     public function testForumAutoSub(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10010);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10010);
         $this->forum    = Helper::makeForum(
             user:        $this->userList['admin'],
             sequence:    151,
@@ -301,7 +301,7 @@ public function testForumAutoSub(): void {
         $user->addCustomPrivilege('site_forum_autosub');
         $this->assertEquals([$this->forum->id()], $this->forum->autoSubscribeForUserList($user), 'forum-autosub-forum-list');
 
-        $threadMan = new \Gazelle\Manager\ForumThread;
+        $threadMan = new \Gazelle\Manager\ForumThread();
         $this->threadList[] = $threadMan->create($this->forum, $this->userList['admin'], 'phpunit thread title', 'this is a new thread');
         $this->threadList[] = $threadMan->create($this->forum, $this->userList['admin'], 'phpunit thread title 2', 'this is also a new thread');
         $this->assertEquals(2, $this->forum->userCatchup($user), 'forum-user-autosub-catchup');
@@ -312,8 +312,8 @@ public function testForumAutoSub(): void {
     }
 
     public function testForumForbidden(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10002);
-        $forumMan       = new \Gazelle\Manager\Forum;
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10002);
+        $forumMan       = new \Gazelle\Manager\Forum();
         $user           = $this->userList['user'];
         $this->forum    = $forumMan->create(
             user:           $this->userList['admin'],
@@ -344,8 +344,8 @@ public function testForumForbidden(): void {
     }
 
     public function testForumWarn(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10002);
-        $forumMan       = new \Gazelle\Manager\Forum;
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10002);
+        $forumMan       = new \Gazelle\Manager\Forum();
         $admin          = $this->userList['admin'];
         $user           = $this->userList['user'];
         $this->forum    = Helper::makeForum(
@@ -362,8 +362,8 @@ public function testForumWarn(): void {
 
         // TODO: move more warning functionality out of sections/...
         $this->threadList[] = $thread
-            = (new \Gazelle\Manager\ForumThread)->create($this->forum, $user, 'user thread title', 'this is a new thread by a user');
-        $thread  = (new \Gazelle\Manager\ForumThread)->create($this->forum, $user, 'user thread title', 'this is a new thread by a user');
+            = (new \Gazelle\Manager\ForumThread())->create($this->forum, $user, 'user thread title', 'this is a new thread by a user');
+        $thread  = (new \Gazelle\Manager\ForumThread())->create($this->forum, $user, 'user thread title', 'this is a new thread by a user');
         $post    = $thread->addPost($user, 'offensive content');
         $week    = 2;
         $message = "phpunit forum warn test " . randomString(10);
@@ -390,7 +390,7 @@ public function testForumWarn(): void {
     }
 
     public function testForumPoll(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10002);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10002);
         $admin          = $this->userList['admin'];
         $user           = $this->userList['user'];
         $this->forum    = Helper::makeForum(
@@ -402,10 +402,10 @@ public function testForumPoll(): void {
         );
 
         $this->threadList[] = $thread
-            = (new \Gazelle\Manager\ForumThread)->create($this->forum, $user, 'phpunit post pin', 'this is a new thread for post pins');
+            = (new \Gazelle\Manager\ForumThread())->create($this->forum, $user, 'phpunit post pin', 'this is a new thread for post pins');
 
         $answer  = ['apple', 'banana', 'carrot'];
-        $pollMan = new \Gazelle\Manager\ForumPoll;
+        $pollMan = new \Gazelle\Manager\ForumPoll();
         $poll    = $pollMan->create($thread->id(), 'Best food', $answer);
         $this->assertInstanceOf(\Gazelle\ForumPoll::class, $poll, 'forum-poll-is-forum-poll');
         $this->assertFalse($poll->isClosed(), 'forum-poll-is-not-closed');
@@ -441,7 +441,7 @@ public function testForumPoll(): void {
     }
 
     public function testPostPin(): void {
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit category', 10002);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit category', 10002);
         $admin          = $this->userList['admin'];
         $user           = $this->userList['user'];
         $this->forum    = Helper::makeForum(
@@ -453,7 +453,7 @@ public function testPostPin(): void {
         );
 
         $this->threadList[] = $thread
-            = (new \Gazelle\Manager\ForumThread)->create($this->forum, $user, 'unittest post pin', 'this is a new thread for post pins');
+            = (new \Gazelle\Manager\ForumThread())->create($this->forum, $user, 'unittest post pin', 'this is a new thread for post pins');
         $post = $thread->addPost($user, 'pinnable content');
 
         $this->assertFalse($post->isPinned(), 'forum-post-is-not-pinned');
@@ -465,7 +465,7 @@ public function testPostPin(): void {
 
     public function testForumRender(): void {
         $name = 'phpunit category ' . randomString(6);
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create($name, 10002);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create($name, 10002);
         $admin          = $this->userList['admin'];
         $this->forum    = Helper::makeForum(
             user:           $admin,
@@ -496,7 +496,7 @@ public function testForumRender(): void {
     public function testForumTransition(): void {
         $admin = $this->userList['admin'];
         $user  = $this->userList['user'];
-        $this->category = (new \Gazelle\Manager\ForumCategory)->create('phpunit forum transition', 10005);
+        $this->category = (new \Gazelle\Manager\ForumCategory())->create('phpunit forum transition', 10005);
         $this->forum = Helper::makeForum(
             user:           $admin,
             sequence:       153,
@@ -511,7 +511,7 @@ public function testForumTransition(): void {
             name:           'phpunit forum transition b',
             description:    'This is where it also transitions',
         );
-        $manager = new Gazelle\Manager\ForumTransition;
+        $manager = new Gazelle\Manager\ForumTransition();
         $transition = $manager->create(
            source:           $this->forum,
            destination:      $this->extra,
diff --git a/tests/phpunit/FriendTest.php b/tests/phpunit/FriendTest.php
index 6f225cf6e..0f50b097c 100644
--- a/tests/phpunit/FriendTest.php
+++ b/tests/phpunit/FriendTest.php
@@ -15,7 +15,7 @@ public function tearDown(): void {
     }
 
     public function testFriend(): void {
-        $manager = new Gazelle\Manager\User;
+        $manager = new Gazelle\Manager\User();
         $this->friend = [
             new Gazelle\User\Friend(Helper::makeUser('friend1.' . randomString(6), 'friend1')),
             new Gazelle\User\Friend(Helper::makeUser('friend2.' . randomString(6), 'friend2')),
diff --git a/tests/phpunit/InboxTest.php b/tests/phpunit/InboxTest.php
index 6167d813b..5a9a4b4a9 100644
--- a/tests/phpunit/InboxTest.php
+++ b/tests/phpunit/InboxTest.php
@@ -85,7 +85,7 @@ public function testInbox(): void {
         // It could be as simple as $pm->reply('body');
 
         // reply
-        $userMan  = new Gazelle\Manager\User;
+        $userMan  = new Gazelle\Manager\User();
         $replyBody = 'reply two ' . randomString(10);
         $replyId = $userMan->replyPM($senderId, $receiverId, $subject, 'reply one', $pmSent->id());
         $replyId = $userMan->replyPM($senderId, $receiverId, $subject, $replyBody, $pmSent->id());
diff --git a/tests/phpunit/InviteTest.php b/tests/phpunit/InviteTest.php
index 1af0c4858..0644c1100 100644
--- a/tests/phpunit/InviteTest.php
+++ b/tests/phpunit/InviteTest.php
@@ -53,8 +53,8 @@ public function testInvite(): void {
         $this->user->setField('Invites', 1)->modify();
 
         // invite someone
-        $this->assertTrue((new Gazelle\Stats\Users)->newUsersAllowed($this->user), 'invite-new-users-allowed');
-        $manager = new Gazelle\Manager\Invite;
+        $this->assertTrue((new Gazelle\Stats\Users())->newUsersAllowed($this->user), 'invite-new-users-allowed');
+        $manager = new Gazelle\Manager\Invite();
         $email = randomString(10) . "@invitee.example.com";
         $this->assertFalse($manager->emailExists($this->user, $email), 'invitee-email-not-pending');
         $invite = $manager->create($this->user, $email, 'unittest notes', 'unittest reason', '');
@@ -76,10 +76,10 @@ public function testInvite(): void {
         $this->assertEquals($this->invitee->id(), $inviteList[0], 'invite-list-has-invitee');
 
         $this->assertTrue($this->invitee->isUnconfirmed(), 'invitee-unconfirmed');
-        $this->assertInstanceOf(Gazelle\User::class, (new Gazelle\Manager\User)->findByAnnounceKey($this->invitee->announceKey()), 'invitee-confirmable');
+        $this->assertInstanceOf(Gazelle\User::class, (new Gazelle\Manager\User())->findByAnnounceKey($this->invitee->announceKey()), 'invitee-confirmable');
 
         // invite tree functionality
-        $inviteTree = new \Gazelle\User\InviteTree($this->user, new Gazelle\Manager\User);
+        $inviteTree = new \Gazelle\User\InviteTree($this->user, new Gazelle\Manager\User());
         $this->assertInstanceOf(\Gazelle\User\InviteTree::class, $inviteTree, 'invite-tree-ctor');
         $this->assertGreaterThan(0, $inviteTree->treeId(), 'invite-tree-new-id');
         $this->assertTrue($inviteTree->hasInvitees(), 'invite-tree-has-invitees');
@@ -91,8 +91,8 @@ public function testInvite(): void {
     }
 
     public function testInviteSource(): void {
-        $inviteSourceMan = new Gazelle\Manager\InviteSource;
-        $userMan = new Gazelle\Manager\User;
+        $inviteSourceMan = new Gazelle\Manager\InviteSource();
+        $userMan = new Gazelle\Manager\User();
         $this->user = Helper::makeUser('invite.' . randomString(6), 'invite');
         $this->user->setField('PermissionID', MEMBER)->modify();
         $this->user->addClasses([
@@ -131,7 +131,7 @@ public function testInviteSource(): void {
 
         // now invite a user from a designated source
         $profile = 'https://example.com/user/' . random_int(1000, 9999);
-        $manager = new Gazelle\Manager\Invite;
+        $manager = new Gazelle\Manager\Invite();
         $invite = $manager->create(
             user: $this->user,
             email: randomString(10) . "@invitee.src.example.com",
@@ -146,7 +146,7 @@ public function testInviteSource(): void {
         );
 
         // create auser from the invite
-        $this->invitee = (new \Gazelle\UserCreator)
+        $this->invitee = (new \Gazelle\UserCreator())
             ->setUsername('create.' . randomString(6))
             ->setEmail(randomString(6) . '@example.com')
             ->setPassword(randomString(10))
@@ -236,7 +236,7 @@ public function testInviteSource(): void {
     public function testRevokeInvite(): void {
         $this->user->setField('Invites', 1)->modify();
 
-        $manager = new Gazelle\Manager\Invite;
+        $manager = new Gazelle\Manager\Invite();
         $email = randomString(10) . "@invitee.example.com";
         $this->assertFalse($manager->emailExists($this->user, $email), 'invitee-email-not-pending');
         $invite = $manager->create($this->user, $email, 'unittest notes', 'unittest reason', '');
@@ -251,10 +251,10 @@ public function testEtm(): void {
         $this->assertEquals('Elite TM', $this->user->userclassName(),              'etm-userclass-check');
         $this->assertTrue($this->user->permitted('site_send_unlimited_invites'),   'etm-site-send-unlimited-invites');
         $this->assertFalse($this->user->permitted('site_can_invite_always'),       'etm-site-can-invite-always');
-        $this->assertTrue((new Gazelle\Stats\Users)->newUsersAllowed($this->user), 'etm-new-users-allowed');
+        $this->assertTrue((new Gazelle\Stats\Users())->newUsersAllowed($this->user), 'etm-new-users-allowed');
         $this->assertTrue($this->user->canPurchaseInvite(),                        'etm-can-purchase-invites');
 
-        $invite = (new Gazelle\Manager\Invite)->create($this->user, randomString(10) . "@etm.example.com", 'unittest notes', 'unittest reason', '');
+        $invite = (new Gazelle\Manager\Invite())->create($this->user, randomString(10) . "@etm.example.com", 'unittest notes', 'unittest reason', '');
         $this->assertInstanceOf(Gazelle\Invite::class, $invite, 'etm-issued-invite');
     }
 }
diff --git a/tests/phpunit/LogTest.php b/tests/phpunit/LogTest.php
index 952b1034e..6c50c6d8c 100644
--- a/tests/phpunit/LogTest.php
+++ b/tests/phpunit/LogTest.php
@@ -34,11 +34,11 @@ public function tearDown(): void {
     }
 
     public function testGeneralLog(): void {
-        $logger = new \Gazelle\Log;
+        $logger = new \Gazelle\Log();
         $message = self::PREFIX . "general " . randomString();
         $logger->general($message);
 
-        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User);
+        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User());
         $this->assertInstanceOf(\Gazelle\Manager\SiteLog::class, $sitelog, 'sitelog-manager');
         $result = $sitelog->page(1, 0, '');
         $latest = current($result);
@@ -48,7 +48,7 @@ public function testGeneralLog(): void {
     }
 
     public function testGroupLog(): void {
-        $logger = new \Gazelle\Log;
+        $logger = new \Gazelle\Log();
         $this->user = Helper::makeUser('sitelog.' . randomString(6), 'sitelog');
         $this->tgroup = Helper::makeTGroupMusic(
             $this->user,
@@ -59,7 +59,7 @@ public function testGroupLog(): void {
         $tgroupId = $this->tgroup->id();
         $logger->group($this->tgroup, $this->user, self::PREFIX . "group first " . randomString());
 
-        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User);
+        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User());
         $this->assertCount(2, $sitelog->tgroupLogList($tgroupId), 'grouplog-intial');
         $result = $sitelog->tgroupLogList($tgroupId);
         $latest = current($result);
@@ -94,7 +94,7 @@ public function testGroupLog(): void {
     }
 
     public function testTorrentlLog(): void {
-        $logger = new \Gazelle\Log;
+        $logger = new \Gazelle\Log();
         $this->user = Helper::makeUser('sitelog.' . randomString(6), 'sitelog');
         $this->tgroup = Helper::makeTGroupMusic(
             $this->user,
@@ -109,7 +109,7 @@ public function testTorrentlLog(): void {
         );
         $logger->torrent($torrent, $this->user, self::PREFIX . "torrent " . randomString());
 
-        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User);
+        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User());
         $this->assertCount(2, $sitelog->tgroupLogList($this->tgroup->id()), 'torrentlog-has-log');
 
         $torrent->remove($this->user, 'phpunit log delete');
@@ -122,9 +122,9 @@ public function testTorrentlLog(): void {
 
     public function testRenderLog(): void {
         $message = self::PREFIX . "general " . randomString();
-        (new \Gazelle\Log)->general($message);
+        (new \Gazelle\Log())->general($message);
 
-        $sitelog   = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User);
+        $sitelog   = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User());
         $paginator = new \Gazelle\Util\Paginator(LOG_ENTRIES_PER_PAGE, 1);
         $page      = $sitelog->page($paginator->page(), $paginator->offset(), '');
         $paginator->setTotal($sitelog->totalMatches());
diff --git a/tests/phpunit/NotificationUploadTest.php b/tests/phpunit/NotificationUploadTest.php
index 114207edb..1904b682e 100644
--- a/tests/phpunit/NotificationUploadTest.php
+++ b/tests/phpunit/NotificationUploadTest.php
@@ -15,9 +15,9 @@ class NotificationUploadTest extends TestCase {
 
     public function setUp(): void {
         $user = Helper::makeUser('uploader.' . randomString(10), 'notification-ticket');
-        $tgroup = (new Gazelle\Manager\TGroup)->create(
+        $tgroup = (new Gazelle\Manager\TGroup())->create(
             categoryId:      1,
-            releaseType:     (new Gazelle\ReleaseType)->findIdByName('Compilation'),
+            releaseType:     (new Gazelle\ReleaseType())->findIdByName('Compilation'),
             name:            'phpunit notify ' . randomString(6),
             description:     'phpunit notify description',
             image:           '',
@@ -26,15 +26,15 @@ public function setUp(): void {
             catalogueNumber: 'UA-246',
             showcase:        false,
         );
-        $tgroup->addArtists([ARTIST_MAIN], ['Notify Man ' . randomString(12)], $user, new Gazelle\Manager\Artist, new Gazelle\Log);
+        $tgroup->addArtists([ARTIST_MAIN], ['Notify Man ' . randomString(12)], $user, new Gazelle\Manager\Artist(), new Gazelle\Log());
 
-        $tagMan = new Gazelle\Manager\Tag;
+        $tagMan = new Gazelle\Manager\Tag();
         $tagMan->createTorrentTag($tagMan->create('electronic', $user), $tgroup, $user, 10);
         $tagMan->createTorrentTag($tagMan->create('funk', $user), $tgroup, $user, 10);
         $tagMan->createTorrentTag($tagMan->create('jazz', $user), $tgroup, $user, 10);
         $tgroup->refresh();
 
-        $this->torMan = new \Gazelle\Manager\Torrent;
+        $this->torMan = new \Gazelle\Manager\Torrent();
         $this->torrent = $this->torMan->create(
             tgroup:                  $tgroup,
             user:                    $user,
@@ -84,7 +84,7 @@ public function testNotificationUpload(): void {
 
         // create some notification filters for the users
         $artistName = $this->torrent->group()->artistRole()->idList()[ARTIST_MAIN][0]['name'];
-        $artistFilter = (new Gazelle\Notification\Filter)
+        $artistFilter = (new Gazelle\Notification\Filter())
             ->setLabel('Artists')
             ->setMultiLine('artist', $artistName);
         $this->assertTrue($artistFilter->isConfigured(), 'filter-artist-configured');
@@ -94,7 +94,7 @@ public function testNotificationUpload(): void {
 
         // encoding+media
         $this->assertEquals($nextFilter++,
-            $filter['enc.med'] = (new Gazelle\Notification\Filter)
+            $filter['enc.med'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Format+Media')
                 ->setMultiLine('artist', '') // TODO: INSERT fails on not null assertion
                 ->setMultiValue('encoding', ['Lossless', '24bit Lossless'])
@@ -105,7 +105,7 @@ public function testNotificationUpload(): void {
 
         // exclude VA (Compilation)
         $this->assertEquals($nextFilter++,
-            $filter['xva'] = (new Gazelle\Notification\Filter)
+            $filter['xva'] = (new Gazelle\Notification\Filter())
                 ->setLabel('No compilations')
                 ->setMultiLine('artist', '')
                 ->setBoolean('exclude_va', true)
@@ -115,7 +115,7 @@ public function testNotificationUpload(): void {
 
         // release type Album
         $this->assertEquals($nextFilter++,
-            $filter['release'] = (new Gazelle\Notification\Filter)
+            $filter['release'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Release')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('release_type', "Single")
@@ -125,7 +125,7 @@ public function testNotificationUpload(): void {
 
         // one tag present
         $this->assertEquals($nextFilter++,
-            $filter['tag'] = (new Gazelle\Notification\Filter)
+            $filter['tag'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Tags')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('tag', "electronic\n\n")
@@ -135,7 +135,7 @@ public function testNotificationUpload(): void {
 
         // two tags present
         $this->assertEquals($nextFilter++,
-            $filter['tag2yes'] = (new Gazelle\Notification\Filter)
+            $filter['tag2yes'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Two Tags')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('tag', "jazz\nelectronic\n")
@@ -145,7 +145,7 @@ public function testNotificationUpload(): void {
 
         // no tags present
         $this->assertEquals($nextFilter++,
-            $filter['tag2no'] = (new Gazelle\Notification\Filter)
+            $filter['tag2no'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Two Tags+')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('tag', "jazz.rock\nhard.bop\n")
@@ -155,7 +155,7 @@ public function testNotificationUpload(): void {
 
         // these are not the tags you are looking for
         $this->assertEquals($nextFilter++,
-            $filter['tagno'] = (new Gazelle\Notification\Filter)
+            $filter['tagno'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Not these tags')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('not_tag', "funk\nfolk\n")
@@ -165,17 +165,17 @@ public function testNotificationUpload(): void {
 
         // uploads by user
         $this->assertEquals($nextFilter++,
-            $filter['user'] = (new Gazelle\Notification\Filter)
+            $filter['user'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Users')
                 ->setMultiLine('artist', '')
-                ->setUsers(new Gazelle\Manager\User, $this->torrent->uploader()->username())
+                ->setUsers(new Gazelle\Manager\User(), $this->torrent->uploader()->username())
                 ->create($this->userList['user']->id()),
             'filter-users-created'
         );
 
         // category Music
         $this->assertEquals($nextFilter++,
-            $filter['user.self'] = (new Gazelle\Notification\Filter)
+            $filter['user.self'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Tags')
                 ->setMultiLine('artist', '')
                 ->setMultiLine('category', "Music")
@@ -185,7 +185,7 @@ public function testNotificationUpload(): void {
 
         // in some year
         $this->assertEquals($nextFilter++,
-            $filter['year'] = (new Gazelle\Notification\Filter)
+            $filter['year'] = (new Gazelle\Notification\Filter())
                 ->setLabel('Year')
                 ->setMultiLine('artist', '')
                 ->setYears(2020, 2022)
@@ -194,7 +194,7 @@ public function testNotificationUpload(): void {
         );
 
         // create a ticket for this new torrent
-        $ticketManager = new Gazelle\Manager\NotificationTicket;
+        $ticketManager = new Gazelle\Manager\NotificationTicket();
         $ticket = $ticketManager->create($this->torrent);
         $this->assertInstanceOf(Gazelle\NotificationTicket::class, $ticket, 'we-haz-notification-ticket');
         $this->assertEquals($ticket->created(), $ticket->modified(), 'ntick-new');
@@ -206,7 +206,7 @@ public function testNotificationUpload(): void {
         $this->assertEquals($this->torrent->id(), $ticket->torrentId(), 'ntick-pending-torrent-id');
         $ticket->setActive();
         $this->assertEquals($ticket->state(), NotificationTicketState::Active, 'ntick-active-value');
-        $this->assertEquals(1, (new Gazelle\Manager\Notification)->ticketStats()['active']['total'], 'notifier-ticket-stats-now-active');
+        $this->assertEquals(1, (new Gazelle\Manager\Notification())->ticketStats()['active']['total'], 'notifier-ticket-stats-now-active');
 
         // send the IRC notification
         $notification = new Gazelle\Notification\Upload($this->torMan->findById($ticket->torrentId()));
@@ -286,14 +286,14 @@ public function testHandle(): void {
         $this->userList = [
             'record.label' => Helper::makeUser('reclab.' . randomString(10), 'notification-ticket'),
         ];
-        $filter = (new Gazelle\Notification\Filter)
+        $filter = (new Gazelle\Notification\Filter())
             ->setLabel('Record Labels')
             ->setMultiLine('artist', '') // TODO: INSERT fails on not null assertion
             ->setMultiLine('record.label', "Unitest Artists Corporation")
             ->create($this->userList['record.label']->id());
 
         // create the ticket and pretend it is seeding
-        $ticketManager = new Gazelle\Manager\NotificationTicket;
+        $ticketManager = new Gazelle\Manager\NotificationTicket();
         $ticket = $ticketManager->create($this->torrent);
         Gazelle\DB::DB()->prepared_query("
             INSERT INTO xbt_files_users
@@ -303,7 +303,7 @@ public function testHandle(): void {
         );
 
         // handle the ticket
-        $manager = new Gazelle\Manager\Notification;
+        $manager = new Gazelle\Manager\Notification();
         $this->assertTrue($manager->handleTicket($ticket, $this->torMan), 'ntick-is-handled');
 
         // ticket has been handled
@@ -316,13 +316,13 @@ public function testProcessBacklog(): void {
         $this->userList = [
             'backlog' => Helper::makeUser('backlog.' . randomString(10), 'notification-ticket'),
         ];
-        $filter = (new Gazelle\Notification\Filter)
+        $filter = (new Gazelle\Notification\Filter())
             ->setLabel('Backlog')
             ->setMultiLine('artist', '') // TODO: INSERT fails on not null assertion
             ->setMultiLine('record.label', "Unitest Artists Corporation")
             ->create($this->userList['backlog']->id());
 
-        $ticketManager = new Gazelle\Manager\NotificationTicket;
+        $ticketManager = new Gazelle\Manager\NotificationTicket();
         $ticket = $ticketManager->create($this->torrent);
         Gazelle\DB::DB()->prepared_query("
             INSERT INTO xbt_files_users
@@ -332,7 +332,7 @@ public function testProcessBacklog(): void {
         );
 
         // look at the pending stats
-        $manager = new Gazelle\Manager\Notification;
+        $manager = new Gazelle\Manager\Notification();
         $pending = $manager->ticketPendingStats();
         $lastHour = end($pending);
         $this->assertEquals(1, $lastHour['total'], 'notif-stats-pending');
@@ -345,7 +345,7 @@ public function testProcessBacklog(): void {
         $ticket = $ticketManager->findById($this->torrent->id());
         $this->assertTrue($ticket->isDone(), 'backlog-is-done');
 
-        $rss  = (new Gazelle\Feed)->byFeedName($this->userList['backlog'], 'torrents_music');
+        $rss  = (new Gazelle\Feed())->byFeedName($this->userList['backlog'], 'torrents_music');
         $link = SITE_URL . "/torrents.php?id={$this->torrent->groupId()}&amp;torrentid={$this->torrent->id()}&amp;action=download&amp;torrent_pass={$this->userList['backlog']->announceKey()}";
         $tags = implode(',', $this->torrent->group()->tagNameList());
         $this->assertStringContainsString("<guid>$link</guid>", $rss, 'notif-rss-guid');
@@ -357,15 +357,15 @@ public function testStale(): void {
         $this->userList = [
             'backlog' => Helper::makeUser('backlog.' . randomString(10), 'notification-ticket'),
         ];
-        $filter = (new Gazelle\Notification\Filter)
+        $filter = (new Gazelle\Notification\Filter())
             ->setLabel('Stale')
             ->setMultiLine('artist', '') // TODO: INSERT fails on not null assertion
             ->setMultiLine('record.label', "Unitest Artists Corporation")
             ->create($this->userList['backlog']->id());
 
-        $ticketManager = new Gazelle\Manager\NotificationTicket;
+        $ticketManager = new Gazelle\Manager\NotificationTicket();
         $ticket        = $ticketManager->create($this->torrent);
-        $manager       = new Gazelle\Manager\Notification;
+        $manager       = new Gazelle\Manager\Notification();
         foreach (range(1, 59) as $try) {
             $manager->processBacklog($ticketManager, $this->torMan);
         }
@@ -384,13 +384,13 @@ public function testNewGroup(): void {
         $this->userList = [
             'new.grp' => Helper::makeUser('new.grp.' . randomString(10), 'notification-ticket'),
         ];
-        $filter = (new Gazelle\Notification\Filter)
+        $filter = (new Gazelle\Notification\Filter())
             ->setLabel('New Group')
             ->setMultiLine('artist', '') // TODO: INSERT fails on not null assertion
             ->setBoolean('new_groups_only', true)
             ->create($this->userList['new.grp']->id());
 
-        $ticketManager = new Gazelle\Manager\NotificationTicket;
+        $ticketManager = new Gazelle\Manager\NotificationTicket();
         $ticket        = $ticketManager->create($this->torrent);
         Gazelle\DB::DB()->prepared_query("
             INSERT INTO xbt_files_users
@@ -400,7 +400,7 @@ public function testNewGroup(): void {
         );
 
         // handle the ticket
-        $manager = new Gazelle\Manager\Notification;
+        $manager = new Gazelle\Manager\Notification();
         $manager->handleTicket($ticket, $this->torMan);
 
         $notifier = new Gazelle\Notification\Torrent($this->userList['new.grp']->id());
diff --git a/tests/phpunit/PrivilegeTest.php b/tests/phpunit/PrivilegeTest.php
index 4d4015409..cd0fd6b67 100644
--- a/tests/phpunit/PrivilegeTest.php
+++ b/tests/phpunit/PrivilegeTest.php
@@ -34,7 +34,7 @@ public function testPrivilegeCreate(): void {
         $privilegeList = Gazelle\Manager\Privilege::privilegeList();
         $this->assertCount(127, $privilegeList, 'privilege-total');
 
-        $manager = new Gazelle\Manager\Privilege;
+        $manager = new Gazelle\Manager\Privilege();
         $this->assertNull($manager->findByLevel(FAKE_LEVEL), 'privilege-find-none'); // if this fails, check the `permissions` table
 
         // create a privilege
@@ -108,7 +108,7 @@ public function testPrivilegeSecondary(int $privilegeId, string $method, string
     }
 
     public function testPrivilegeBadge(): void {
-        $manager = new Gazelle\Manager\Privilege;
+        $manager = new Gazelle\Manager\Privilege();
         $flsList = array_values(array_filter($manager->usageList(), fn($p) => $p['id'] == FLS_TEAM));
         $total = $flsList[0]['total'];
 
diff --git a/tests/phpunit/ReaperTest.php b/tests/phpunit/ReaperTest.php
index a836fb9b3..325cd82b7 100644
--- a/tests/phpunit/ReaperTest.php
+++ b/tests/phpunit/ReaperTest.php
@@ -147,7 +147,7 @@ protected function reaperStatus(array $torrentList): void {
     // -------------------------
 
     public function testExpand(): void {
-        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User);
+        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User());
 
         $this->assertEquals(
             [456 => [99, 88, 77]],
@@ -188,8 +188,8 @@ public function testNeverSeeded(): void {
         $pmMan = new Gazelle\Manager\PM($user);
         $this->assertEquals(0, $user->inbox()->messageTotal(), 'never-inbox-initial');
 
-        $torMan  = new Gazelle\Manager\Torrent;
-        $userMan = new Gazelle\Manager\User;
+        $torMan  = new Gazelle\Manager\Torrent();
+        $userMan = new Gazelle\Manager\User();
         $reaper  = new \Gazelle\Torrent\Reaper($torMan, $userMan);
         $initialUnseededStats = $reaper->stats();
 
@@ -310,8 +310,8 @@ public function testNeverSeeded(): void {
     }
 
     public function testUnseeded(): void {
-        $torMan  = new Gazelle\Manager\Torrent;
-        $userMan = new Gazelle\Manager\User;
+        $torMan  = new Gazelle\Manager\Torrent();
+        $userMan = new Gazelle\Manager\User();
         $reaper  = new \Gazelle\Torrent\Reaper($torMan, $userMan);
 
         $initialUnseededStats = $reaper->stats();
@@ -482,7 +482,7 @@ public function testNeverNotify(): void {
         }
 
         // look for never seeded
-        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User);
+        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User());
         $reaper->process($reaper->initialNeverSeededList(), ReaperState::NEVER, ReaperNotify::INITIAL);
 
         $this->assertEquals(0, $this->userList[0]->inbox()->messageTotal(), 'never-uploader-no-notify');
@@ -506,7 +506,7 @@ public function testUnseededNotify(): void {
         }
 
         // look for unseeded
-        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User);
+        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User());
         $reaper->process($reaper->initialUnseededList(), ReaperState::UNSEEDED, ReaperNotify::INITIAL);
 
         $this->assertEquals(1, $this->userList[0]->inbox()->messageTotal(), 'unseeded-uploader-no-notify');
@@ -527,7 +527,7 @@ public function testGracePeriod(): void {
             $this->modifyLastAction($torrent, NOTIFY_UNSEEDED_INITIAL_HOUR + 2);
         }
 
-        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent, new Gazelle\Manager\User);
+        $reaper = new \Gazelle\Torrent\Reaper(new Gazelle\Manager\Torrent(), new Gazelle\Manager\User());
         $reaper->process($reaper->initialUnseededList(), ReaperState::UNSEEDED, ReaperNotify::INITIAL);
 
         $uploaderId = $this->userList[0]->id();
diff --git a/tests/phpunit/RequestTest.php b/tests/phpunit/RequestTest.php
index f122d0908..1aea3c015 100644
--- a/tests/phpunit/RequestTest.php
+++ b/tests/phpunit/RequestTest.php
@@ -37,13 +37,13 @@ public function testCreate(): void {
         $admin = $this->userList['admin'];
         $user  = $this->userList['user'];
 
-        $manager = new Gazelle\Manager\Request;
+        $manager = new Gazelle\Manager\Request();
         $title   = 'phpunit ' . randomString(6) . ' Test Sessions';
         $image   = 'https://example.com/req.jpg';
         $this->request = $manager->create(
             user:            $admin,
             bounty:          1024 ** 2 * REQUEST_MIN,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            2018,
             title:           $title,
             image:           $image,
@@ -66,7 +66,7 @@ public function testCreate(): void {
             1,
             $this->request->artistRole()->set(
                 [ARTIST_MAIN => [$artistName]],
-                new Gazelle\Manager\Artist
+                new Gazelle\Manager\Artist()
             ),
             'request-add-artist-role'
         );
@@ -74,7 +74,7 @@ public function testCreate(): void {
         $this->assertInstanceOf(Gazelle\Request\LogCue::class, $this->request->logCue(), 'request-log-cue');
 
         $this->assertCount(0, $this->request->tagNameList());
-        $tagMan = new Gazelle\Manager\Tag;
+        $tagMan = new Gazelle\Manager\Tag();
         $tagId  = $tagMan->create('jazz', $admin);
         $this->assertGreaterThan(0, $tagId, 'request-create-tag');
         $this->assertEquals(1, $this->request->addTag($tagId), 'request-add-tag');
@@ -89,7 +89,7 @@ public function testCreate(): void {
         $this->assertEquals($admin->id(), $this->request->ajaxInfo()['requestorId'], 'request-ajax-user-id');
         $this->assertEquals("$artistName – $title [2018]", $this->request->text(), 'request-text');
 
-        $find = $manager->findByArtist((new Gazelle\Manager\Artist)->findByName($artistName));
+        $find = $manager->findByArtist((new Gazelle\Manager\Artist())->findByName($artistName));
         $this->assertCount(1, $find, 'request-find-by-artist');
         $this->assertEquals($id, $find[0]->id(), 'request-find-id');
 
@@ -139,7 +139,7 @@ public function testCreate(): void {
 
         $this->assertEquals(
             3,
-            $this->request->setTagList(['acoustic', 'electronic', 'electronic', 'metal'], $user, new Gazelle\Manager\Tag),
+            $this->request->setTagList(['acoustic', 'electronic', 'electronic', 'metal'], $user, new Gazelle\Manager\Tag()),
             'request-set-tag'
         );
 
@@ -194,7 +194,7 @@ public function testCreate(): void {
     }
 
     public function testFill(): void {
-        $statsReq = new Gazelle\Stats\Request;
+        $statsReq = new Gazelle\Stats\Request();
         $statsReq->flush();
         $admin  = $this->userList['admin'];
         $user   = $this->userList['user'];
@@ -208,13 +208,13 @@ public function testFill(): void {
             'total-filled'  => $statsReq->filledTotal(),
         ];
 
-        $requestMan = new Gazelle\Manager\Request;
+        $requestMan = new Gazelle\Manager\Request();
         $title  = 'phpunit req fill ' . randomString(6);
         $bounty = 1024 ** 2 * REQUEST_MIN;
         $this->request = $requestMan->create(
             user:            $admin,
             bounty:          $bounty,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            2018,
             title:           $title,
             image:           '',
@@ -234,7 +234,7 @@ public function testFill(): void {
         $this->assertEquals($before['total'] + 1, $statsReq->total(), 'request-stats-new-total');
         $this->assertEquals($before['total-filled'], $statsReq->filledTotal(), 'request-stats-new-filled');
 
-        $statsUser = new Gazelle\Stats\Users;
+        $statsUser = new Gazelle\Stats\Users();
         $statsUser->refresh();
 
         $admin->flush();
@@ -295,7 +295,7 @@ public function testFill(): void {
             title:  'Deluxe Edition',
         );
         $torrentId = current($this->tgroup->torrentIdList());
-        $torrent = (new Gazelle\Manager\Torrent)->findById($torrentId);
+        $torrent = (new Gazelle\Manager\Torrent())->findById($torrentId);
         $this->assertInstanceOf(Gazelle\Torrent::class, $torrent, 'request-torrent-filler');
 
         $this->assertCount(0, $this->request->validate($torrent), 'request-validate');
@@ -311,12 +311,12 @@ public function testFill(): void {
         $this->assertTrue($this->request->isFilled(), 'request-now-filled');
 
         // and now unfill it
-        $this->assertEquals(1, $this->request->unfill($this->userList['admin'], 'unfill unittest', new Gazelle\Manager\Torrent), 'request-unfill');
+        $this->assertEquals(1, $this->request->unfill($this->userList['admin'], 'unfill unittest', new Gazelle\Manager\Torrent()), 'request-unfill');
         $this->assertEquals($fillBefore['uploaded'], $this->userList['user']->flush()->uploadedSize(), 'request-fill-unfill-user');
         $this->assertEquals($fillBefore['bounty-total'], $this->userList['user']->stats()->requestBountyTotal(), 'request-fill-unfill-total');
         $this->assertFalse($this->request->isFilled(), 'request-unfilled');
 
-        $log = new Gazelle\Manager\SiteLog(new Gazelle\Manager\User);
+        $log = new Gazelle\Manager\SiteLog(new Gazelle\Manager\User());
         $page = $log->page(1, 0, $this->request->title(), bypassSphinx: true);
         $this->assertStringStartsWith(
             "Request <a href=\"{$this->request->url()}\">{$this->request->id()}</a> ({$this->request->title()})",
@@ -342,11 +342,11 @@ public function testFill(): void {
     }
 
     public function testBookmark(): void {
-        $manager = new Gazelle\Manager\Request;
+        $manager = new Gazelle\Manager\Request();
         $this->request = $manager->create(
             user:            $this->userList['admin'],
             bounty:          1024 ** 2 * REQUEST_MIN,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit request bookmark',
             image:           '',
@@ -363,9 +363,9 @@ public function testBookmark(): void {
         );
         $this->request->artistRole()->set(
             [ARTIST_MAIN => ['phpunit req ' . randomString(6)]],
-            new Gazelle\Manager\Artist,
+            new Gazelle\Manager\Artist(),
         );
-        $this->request->addTag((new Gazelle\Manager\Tag)->create('classical.era', $this->userList['admin']));
+        $this->request->addTag((new Gazelle\Manager\Tag())->create('classical.era', $this->userList['admin']));
         $this->assertTrue(
             (new Gazelle\User\Bookmark($this->userList['user']))->create('request', $this->request->id()),
             'request-bookmark-add'
@@ -377,11 +377,11 @@ public function testBookmark(): void {
     }
 
     public function testReport(): void {
-        $manager = new Gazelle\Manager\Request;
+        $manager = new Gazelle\Manager\Request();
         $this->request = $manager->create(
             user:            $this->userList['admin'],
             bounty:          1024 ** 2 * REQUEST_MIN,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit request report',
             image:           '',
@@ -398,12 +398,12 @@ public function testReport(): void {
         );
         $this->request->artistRole()->set(
             [ARTIST_MAIN => ['phpunit req ' . randomString(6)]],
-            new Gazelle\Manager\Artist,
+            new Gazelle\Manager\Artist(),
         );
-        $this->request->addTag((new Gazelle\Manager\Tag)->create('funk', $this->userList['admin']));
+        $this->request->addTag((new Gazelle\Manager\Tag())->create('funk', $this->userList['admin']));
 
         $title = 'phpunit request report';
-        $report = (new Gazelle\Manager\Report(new Gazelle\Manager\User))->create(
+        $report = (new Gazelle\Manager\Report(new Gazelle\Manager\User()))->create(
             $this->userList['user'], $this->request->id(), 'request', $title
         );
         $this->assertEquals('phpunit request report', $report->reason(), 'request-report-reason');
@@ -419,10 +419,10 @@ public function testReport(): void {
     }
 
     public function testJson(): void {
-        $this->request = (new Gazelle\Manager\Request)->create(
+        $this->request = (new Gazelle\Manager\Request())->create(
             user:            $this->userList['admin'],
             bounty:          1024 ** 2 * REQUEST_MIN,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit request json',
             image:           '',
@@ -439,10 +439,10 @@ public function testJson(): void {
         );
         $this->request->artistRole()->set(
             [ARTIST_MAIN => ['phpunit req ' . randomString(6)]],
-            new Gazelle\Manager\Artist,
+            new Gazelle\Manager\Artist(),
         );
 
-        $this->request->addTag((new Gazelle\Manager\Tag)->create('jazz', $this->userList['admin']));
+        $this->request->addTag((new Gazelle\Manager\Tag())->create('jazz', $this->userList['admin']));
         $this->assertInstanceOf(Gazelle\Request::class, $this->request, 'request-json-create');
 
         $json = new Gazelle\Json\Request(
@@ -450,7 +450,7 @@ public function testJson(): void {
             $this->userList['user'],
             new Gazelle\User\Bookmark($this->userList['user']),
             new Gazelle\Comment\Request($this->request->id(), 1, 0),
-            new Gazelle\Manager\User,
+            new Gazelle\Manager\User(),
         );
         $payload = $json->payload();
         $this->assertCount(39, $payload, 'req-json-payload');
@@ -533,7 +533,7 @@ public function testMediaValue(): void {
     }
 
     public function testLogCueValue(): void {
-        $none = new Gazelle\Request\LogCue;
+        $none = new Gazelle\Request\LogCue();
         $this->assertTrue($none->isValid(), 'req-none-valid');
         $this->assertEquals(0, $none->minScore(), 'req-none-min-score');
         $this->assertFalse($none->needLogChecksum(), 'req-none-need-checksum');
diff --git a/tests/phpunit/SchedulerTest.php b/tests/phpunit/SchedulerTest.php
index abcd9c289..486ea3db0 100644
--- a/tests/phpunit/SchedulerTest.php
+++ b/tests/phpunit/SchedulerTest.php
@@ -8,13 +8,13 @@
 
 class SchedulerTest extends TestCase {
     public function testRun(): void {
-        $scheduler = new Gazelle\TaskScheduler;
+        $scheduler = new Gazelle\TaskScheduler();
         $this->expectOutputRegex('/^(?:\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} \[(?:debug|info)\] (.*?)\n|Running task (?:.*?)\.\.\.DONE! \(\d+\.\d+\)\n)*$/');
         $scheduler->run();
     }
 
     public function testRunWithMissingImplementation(): void {
-        $scheduler = new Gazelle\TaskScheduler;
+        $scheduler = new Gazelle\TaskScheduler();
         $name = "RunUnimplemented";
         $db = Gazelle\DB::DB();
         $db->prepared_query("
@@ -38,12 +38,12 @@ public function testRunWithMissingImplementation(): void {
     }
 
     public function testMissingTaskEntry(): void {
-        $scheduler = new Gazelle\TaskScheduler;
+        $scheduler = new Gazelle\TaskScheduler();
         $this->assertEquals(-1, $scheduler->runClass("NoSuchClassname"), "sched-task-no-such-class");
     }
 
     public function testMissingImplementation(): void {
-        $scheduler = new Gazelle\TaskScheduler;
+        $scheduler = new Gazelle\TaskScheduler();
         $name = "Unimplemented";
         $db = Gazelle\DB::DB();
         $db->prepared_query("
@@ -66,7 +66,7 @@ public function testMissingImplementation(): void {
 
     #[DataProvider('taskProvider')]
     public function testTask(string $taskName): void {
-        $scheduler = new Gazelle\TaskScheduler;
+        $scheduler = new Gazelle\TaskScheduler();
         ob_start();
         $this->assertIsInt($scheduler->runClass($taskName), "sched-task-$taskName");
         ob_end_clean();
diff --git a/tests/phpunit/SearchEmailTest.php b/tests/phpunit/SearchEmailTest.php
index 8d8cc8ca9..0c09a6510 100644
--- a/tests/phpunit/SearchEmailTest.php
+++ b/tests/phpunit/SearchEmailTest.php
@@ -23,7 +23,7 @@ public function tearDown(): void {
     }
 
     public function testSearchEmail(): void {
-        $search = new \Gazelle\Search\Email(new \Gazelle\Search\ASN);
+        $search = new \Gazelle\Search\Email(new \Gazelle\Search\ASN());
         $search->create(randomString());
 
         $text = "chaff {$this->userList[0]->email()} chaff {$this->userList[1]->email()} chaff {$this->userList[2]->email()} dup {$this->userList[0]->email()} ";
diff --git a/tests/phpunit/SearchReportTest.php b/tests/phpunit/SearchReportTest.php
index 6ff91adc2..1c3e200a7 100644
--- a/tests/phpunit/SearchReportTest.php
+++ b/tests/phpunit/SearchReportTest.php
@@ -17,19 +17,19 @@ public function setUp(): void {
             Helper::makeUser('searchrep.' . randomString(10), 'searchrep', enable: true, clearInbox: true),
         ];
 
-        $this->collage = (new \Gazelle\Manager\Collage)->create(
+        $this->collage = (new \Gazelle\Manager\Collage())->create(
             user:        $this->userList[0],
             categoryId:  2,
             name:        'phpunit search report ' . randomString(20),
             description: 'phpunit search report description',
             tagList:     'disco funk metal',
-            logger:      new \Gazelle\Log,
+            logger:      new \Gazelle\Log(),
         );
 
-        $this->request = (new \Gazelle\Manager\Request)->create(
+        $this->request = (new \Gazelle\Manager\Request())->create(
             user:            $this->userList[1],
             bounty:          REQUEST_MIN * 1024 * 1024,
-            categoryId:      (new \Gazelle\Manager\Category)->findIdByName('Music'),
+            categoryId:      (new \Gazelle\Manager\Category())->findIdByName('Music'),
             year:            (int)date('Y'),
             title:           'phpunit request report',
             image:           '',
@@ -45,7 +45,7 @@ public function setUp(): void {
             oclc:            '',
         );
 
-        $manager = new \Gazelle\Manager\Report(new \Gazelle\Manager\User);
+        $manager = new \Gazelle\Manager\Report(new \Gazelle\Manager\User());
         $this->reportList['collage'] = $manager->create($this->userList[0], $this->collage->id(), 'collage', 'phpunit search collage report');
         sleep(1);
         $this->reportList['request'] = $manager->create($this->userList[0], $this->request->id(), 'request', 'phpunit search request report');
@@ -65,7 +65,7 @@ public function tearDown(): void {
     }
 
     public function testSearchReportId(): void {
-        $search = new \Gazelle\Search\Report;
+        $search = new \Gazelle\Search\Report();
         $this->assertEquals(
             \Gazelle\Enum\SearchReportOrder::createdDesc,
             $search->order(),
@@ -85,7 +85,7 @@ public function testSearchReportId(): void {
     }
 
     public function testSearchReportList(): void {
-        $search = new \Gazelle\Search\Report;
+        $search = new \Gazelle\Search\Report();
         $search->setStatus(['New']);
 
         $this->assertEquals(
@@ -98,7 +98,7 @@ public function testSearchReportList(): void {
             'search-report-page-list'
         );
 
-        $this->reportList['request']->resolve($this->userList[0], new \Gazelle\Manager\Report(new \Gazelle\Manager\User));
+        $this->reportList['request']->resolve($this->userList[0], new \Gazelle\Manager\Report(new \Gazelle\Manager\User()));
         $this->assertEquals(
             [
                 $this->reportList['user']->id(),
diff --git a/tests/phpunit/StaffBlogTest.php b/tests/phpunit/StaffBlogTest.php
index ebe59cca0..b4b00ae13 100644
--- a/tests/phpunit/StaffBlogTest.php
+++ b/tests/phpunit/StaffBlogTest.php
@@ -24,7 +24,7 @@ public function testStaffBlog(): void {
 
         $this->assertEquals('Moderator', $this->userList['mod']->userclassName(), 'mod-userclass-check');
 
-        $manager = new Gazelle\Manager\StaffBlog;
+        $manager = new Gazelle\Manager\StaffBlog();
 
         $blog = $manager->create($this->userList['admin'], 'phpunit staff blog', 'body text');
         $this->assertInstanceOf(Gazelle\StaffBlog::class, $blog, 'staff-blog-create');
diff --git a/tests/phpunit/StaffGroupTest.php b/tests/phpunit/StaffGroupTest.php
index c25356161..4b5c52de2 100644
--- a/tests/phpunit/StaffGroupTest.php
+++ b/tests/phpunit/StaffGroupTest.php
@@ -7,7 +7,7 @@
 
 class StaffGroupTest extends TestCase {
     public function testStaffGroupCreate(): void {
-        $manager = new Gazelle\Manager\StaffGroup;
+        $manager = new Gazelle\Manager\StaffGroup();
         $initial = $manager->groupList();
 
         $sg = $manager->create(1234, 'phpunit');
diff --git a/tests/phpunit/StaffPMTest.php b/tests/phpunit/StaffPMTest.php
index 451fced4c..7ae133aa1 100644
--- a/tests/phpunit/StaffPMTest.php
+++ b/tests/phpunit/StaffPMTest.php
@@ -14,7 +14,7 @@ class StaffPMTest extends TestCase {
     protected \Gazelle\User $user;
 
     public function setUp(): void {
-        $this->spMan = new \Gazelle\Manager\StaffPM;
+        $this->spMan = new \Gazelle\Manager\StaffPM();
         $this->fls   = Helper::makeUser('spm_fls_' . randomString(10), 'staffpm');
         $this->mod   = Helper::makeUser('spm_mod_' . randomString(10), 'staffpm');
         $this->sysop = Helper::makeUser('spm_sysop_' . randomString(10), 'staffpm');
diff --git a/tests/phpunit/TGroupTest.php b/tests/phpunit/TGroupTest.php
index 7050d317e..7e52973f6 100644
--- a/tests/phpunit/TGroupTest.php
+++ b/tests/phpunit/TGroupTest.php
@@ -26,7 +26,7 @@ public function setUp(): void {
         $this->year            = (int)date('Y');
         $this->recordLabel     = randomString(6) . ' Records';
         $this->catalogueNumber = randomString(3) . '-' . random_int(1000, 2000);
-        $this->manager         = new Gazelle\Manager\TGroup;
+        $this->manager         = new Gazelle\Manager\TGroup();
         $this->tgroup      = $this->manager->create(
             categoryId:      1,
             name:            $this->name,
@@ -35,7 +35,7 @@ public function setUp(): void {
             catalogueNumber: $this->catalogueNumber,
             description:     "Description of {$this->name}",
             image:           '',
-            releaseType:     (new Gazelle\ReleaseType)->findIdByName('Live album'),
+            releaseType:     (new Gazelle\ReleaseType())->findIdByName('Live album'),
             showcase:        false,
         );
 
@@ -98,7 +98,7 @@ public function testTGroupCreate(): void {
         $this->assertInstanceOf(Gazelle\TGroup::class, $find, 'tgroup-instance-of');
         $this->assertEquals($this->tgroup->id(), $find->id(), 'tgroup-create-find');
 
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         $torrent = $torMan->findById($this->tgroup->torrentIdList()[0]);
         $this->assertEquals(1, $torrent->tokenCount(), 'tgroup-torrent-fl-cost');
         $this->assertFalse($this->userList['user']->canSpendFLToken($torrent), 'tgroup-user-no-fltoken');
@@ -108,14 +108,14 @@ public function testTGroupCreate(): void {
         $this->assertEquals(1, $bonus->purchaseToken('token-1'), 'tgroup-user-buy-token');
         $this->assertTrue($this->userList['user']->canSpendFLToken($torrent), 'tgroup-user-fltoken');
 
-        (new Gazelle\Stats\Users)->refresh();
+        (new Gazelle\Stats\Users())->refresh();
         $this->assertEquals(3, $this->userList['user']->stats()->uploadTotal(), 'tgroup-user-stats-upload');
         $this->assertEquals(1, $this->userList['user']->stats()->uniqueGroupTotal(), 'tgroup-user-stats-unique');
     }
 
     public function testTGroupArtist(): void {
         $artistName = 'The ' . randomString(6) . ' Band';
-        $this->assertEquals(1, $this->tgroup->addArtists([ARTIST_MAIN], [$artistName], $this->userList['admin'], new Gazelle\Manager\Artist, new Gazelle\Log), 'tgroup-artist-add');
+        $this->assertEquals(1, $this->tgroup->addArtists([ARTIST_MAIN], [$artistName], $this->userList['admin'], new Gazelle\Manager\Artist(), new Gazelle\Log()), 'tgroup-artist-add');
         $this->assertEquals("$artistName – {$this->tgroup->name()} [{$this->tgroup->year()} Live album]", $this->tgroup->text(), 'tgroup-artist-text');
 
         $this->assertNotNull($this->tgroup->primaryArtist(), 'tgroup-artist-primary');
@@ -142,10 +142,10 @@ public function testTGroupArtist(): void {
     }
 
     public function testTGroupCoverArt(): void {
-        $coverId = $this->tgroup->addCoverArt('https://www.example.com/cover.jpg', 'cover art summary', $this->userList['user'], new Gazelle\Log);
+        $coverId = $this->tgroup->addCoverArt('https://www.example.com/cover.jpg', 'cover art summary', $this->userList['user'], new Gazelle\Log());
         $this->assertGreaterThan(0, $coverId, 'tgroup-cover-art-add');
-        $this->assertEquals(1, $this->tgroup->removeCoverArt($coverId, $this->userList['user'], new Gazelle\Log), 'tgroup-cover-art-del-ok');
-        $this->assertEquals(0, $this->tgroup->removeCoverArt(9999999, $this->userList['user'], new Gazelle\Log), 'tgroup-cover-art-del-nok');
+        $this->assertEquals(1, $this->tgroup->removeCoverArt($coverId, $this->userList['user'], new Gazelle\Log()), 'tgroup-cover-art-del-ok');
+        $this->assertEquals(0, $this->tgroup->removeCoverArt(9999999, $this->userList['user'], new Gazelle\Log()), 'tgroup-cover-art-del-nok');
     }
 
     public function testTGroupRevision(): void {
@@ -163,7 +163,7 @@ public function testTGroupSubscription(): void {
         $this->assertTrue($sub->subscribeComments('torrents', $this->tgroup->id()));
 
         $text       = 'phpunit tgroup subscribe ' . randomString();
-        $commentMan = new Gazelle\Manager\Comment;
+        $commentMan = new Gazelle\Manager\Comment();
         $comment    = $commentMan->create($this->userList['admin'], 'torrents', 0, $text);
         // TODO: should this be 1?
         $this->assertEquals(0, $comment->pageNum(), 'tgroup-comment-page-num');
@@ -175,7 +175,7 @@ public function testTGroupSubscription(): void {
     public function testTGroupTag(): void {
         $user = $this->userList['admin'];
 
-        $tagMan = new Gazelle\Manager\Tag;
+        $tagMan = new Gazelle\Manager\Tag();
         $tagId = $tagMan->create('synthetic.disco.punk', $user);
         $this->assertGreaterThan(1, $tagId, 'tgroup-tag-create');
         $this->assertEquals(1, $tagMan->createTorrentTag($tagId, $this->tgroup, $user, 10), 'tgroup-tag-add-one');
@@ -199,7 +199,7 @@ public function testTGroupTag(): void {
 
     public function testLatestUploads(): void {
         // we can at least test the SQL
-        $this->assertIsArray((new \Gazelle\Manager\Torrent)->latestUploads(5), 'tgroup-latest-uploads');
+        $this->assertIsArray((new \Gazelle\Manager\Torrent())->latestUploads(5), 'tgroup-latest-uploads');
     }
 
     public function testTGroupMerge(): void {
@@ -213,7 +213,7 @@ public function testTGroupMerge(): void {
             catalogueNumber: $this->catalogueNumber,
             description:     "Description of {$this->name} merge",
             image:           '',
-            releaseType:     (new Gazelle\ReleaseType)->findIdByName('Live album'),
+            releaseType:     (new Gazelle\ReleaseType())->findIdByName('Live album'),
             showcase:        false,
         );
         Helper::makeTorrentMusic(
@@ -225,7 +225,7 @@ public function testTGroupMerge(): void {
         $oldName = $this->tgroupExtra->name();
 
         (new Gazelle\User\Bookmark($admin))->create('torrent', $oldId);
-        (new Gazelle\Manager\Comment)->create($user, 'torrents', $oldId, 'phpunit comment ' . randomString(10));
+        (new Gazelle\Manager\Comment())->create($user, 'torrents', $oldId, 'phpunit comment ' . randomString(10));
         $adminVote = new \Gazelle\User\Vote($admin);
         $userVote = new \Gazelle\User\Vote($user);
         $adminVote->upvote($oldId);
@@ -236,14 +236,14 @@ public function testTGroupMerge(): void {
                 $this->tgroupExtra,
                 $this->tgroup,
                 $this->userList['admin'],
-                new \Gazelle\Manager\User,
-                new \Gazelle\Manager\Vote,
-                new \Gazelle\Log,
+                new \Gazelle\Manager\User(),
+                new \Gazelle\Manager\Vote(),
+                new \Gazelle\Log(),
             ),
             'tgroup-music-merge'
         );
 
-        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User);
+        $sitelog = new \Gazelle\Manager\SiteLog(new \Gazelle\Manager\User());
         $list = $sitelog->tgroupLogList($this->tgroup->id());
         $event = end($list);
         $this->assertStringContainsString("($oldName)", $event['info'], 'tgroup-merge-old-name');
@@ -276,19 +276,19 @@ public function testTGroupMerge(): void {
     public function testTGroupSplit(): void {
         $list = $this->tgroup->torrentIdList();
         $this->assertCount(3, $list, 'tgroup-has-torrents');
-        $torrent = (new \Gazelle\Manager\Torrent)->findById($list[1]);
+        $torrent = (new \Gazelle\Manager\Torrent())->findById($list[1]);
         $this->assertInstanceOf(\Gazelle\Torrent::class, $torrent, 'tgroup-id-is-a-torrent');
         $suffix = randomString(10);
-        $this->tgroupExtra = (new \Gazelle\Manager\TGroup)->createFromTorrent(
+        $this->tgroupExtra = (new \Gazelle\Manager\TGroup())->createFromTorrent(
             $torrent,
             "phpunit split artist $suffix",
             "php split title $suffix",
             (int)date('Y'),
-            new \Gazelle\Manager\Artist,
-            new \Gazelle\Manager\Bookmark,
-            new \Gazelle\Manager\Comment,
-            new \Gazelle\Manager\Vote,
-            new \Gazelle\Log,
+            new \Gazelle\Manager\Artist(),
+            new \Gazelle\Manager\Bookmark(),
+            new \Gazelle\Manager\Comment(),
+            new \Gazelle\Manager\Vote(),
+            new \Gazelle\Log(),
             $this->userList['admin'],
         );
         $this->assertInstanceOf(\Gazelle\TGroup::class, $this->tgroupExtra, 'tgroup-is-split');
@@ -297,7 +297,7 @@ public function testTGroupSplit(): void {
     }
 
     public function testStatsRefresh(): void {
-        $this->assertIsInt((new \Gazelle\Stats\TGroups)->refresh(), 'tgroup-stats-refresh');
+        $this->assertIsInt((new \Gazelle\Stats\TGroups())->refresh(), 'tgroup-stats-refresh');
     }
 
     public function testRemasterList(): void {
@@ -312,7 +312,7 @@ public function testRemasterList(): void {
     }
 
     public function testTGroupStats(): void {
-        (new \Gazelle\Stats\TGroups)->refresh();
+        (new \Gazelle\Stats\TGroups())->refresh();
 
         $stats = $this->tgroup->stats();
         $this->assertIsInt($stats->downloadTotal(), 'tgroup-stats-download');
@@ -326,7 +326,7 @@ public function testTGroupStats(): void {
         $bookmark = new \Gazelle\User\Bookmark($this->userList['user']);
         $bookmark->create('torrent', $this->tgroup->id());
 
-        (new \Gazelle\Stats\TGroups)->refresh();
+        (new \Gazelle\Stats\TGroups())->refresh();
         $stats->flush();
         $this->assertEquals($total + 1, $stats->bookmarkTotal(), 'tgroup-stats-update-bookmark');
     }
diff --git a/tests/phpunit/TagTest.php b/tests/phpunit/TagTest.php
index eaef29b41..fbef63ff0 100644
--- a/tests/phpunit/TagTest.php
+++ b/tests/phpunit/TagTest.php
@@ -31,7 +31,7 @@ public function tearDown(): void {
     }
 
     public function testSanitize(): void {
-        $manager = new Gazelle\Manager\Tag;
+        $manager = new Gazelle\Manager\Tag();
         $this->assertEquals('trim', $manager->sanitize(' trim '), 'tag-sanitize-trim');
         $this->assertEquals('lower', $manager->sanitize('Lower'), 'tag-sanitize-lower');
         $this->assertEquals('heavy.metal', $manager->sanitize('heavy metal'), 'tag-sanitize-internal-space');
@@ -41,14 +41,14 @@ public function testSanitize(): void {
     }
 
     public function testNormalize(): void {
-        $manager = new Gazelle\Manager\Tag;
+        $manager = new Gazelle\Manager\Tag();
         $this->assertEquals('dub', $manager->normalize('Dub dub  DUB! '), 'tag-normalize-dup');
         $this->assertEquals('neo.folk', $manager->normalize('neo...folk neo-folk'), 'tag-normalize-more');
         $this->assertEquals('pop rock', $manager->normalize(' pop rock rock pop Rock'), 'tag-normalize-two');
     }
 
     public function testCreate(): void {
-        $manager = new Gazelle\Manager\Tag;
+        $manager = new Gazelle\Manager\Tag();
         $name    = self::PREFIX . randomString(5);
         $this->assertNull($manager->lookup($name), 'tag-lookup-fail');
 
@@ -75,7 +75,7 @@ public function testCreate(): void {
     }
 
     public function testAlias(): void {
-        $manager    = new Gazelle\Manager\Tag;
+        $manager    = new Gazelle\Manager\Tag();
         $this->user = Helper::makeUser('tag.' . randomString(6), 'tag');
 
         $badId  = $manager->create(self::PREFIX . randomString(10), $this->user);
@@ -97,7 +97,7 @@ public function testAlias(): void {
     }
 
     public function testOfficial(): void {
-        $manager    = new Gazelle\Manager\Tag;
+        $manager    = new Gazelle\Manager\Tag();
         $this->user = Helper::makeUser('tag.' . randomString(6), 'tag');
         $tagId      = $manager->create(self::PREFIX . randomString(10), $this->user);
         $this->assertEquals($tagId, $manager->officialize($manager->name($tagId), $this->user), 'tag-officalize-existing');
@@ -134,7 +134,7 @@ public function testTGroup(): void {
             user:   $this->user,
         );
 
-        $manager = new Gazelle\Manager\Tag;
+        $manager = new Gazelle\Manager\Tag();
         $folkId  = $manager->lookup('phpunit.folk');
         $this->assertFalse(
             $manager->torrentTagHasVote($folkId, $this->tgroup, $this->user),
@@ -161,7 +161,7 @@ public function testTGroup(): void {
 
     public function testTag(): void {
         $this->user = Helper::makeUser('tag.' . randomString(8), 'tag.tgroup');
-        $manager    = new Gazelle\Manager\Tag;
+        $manager    = new Gazelle\Manager\Tag();
         $name       = self::PREFIX . randomString(10);
         $tagId      = $manager->create($name, $this->user);
         $tag        = $manager->findById($tagId);
@@ -181,7 +181,7 @@ public function testTag(): void {
     }
 
     public function testTop10(): void {
-        $manager = new Gazelle\Manager\Tag;
+        $manager = new Gazelle\Manager\Tag();
         $this->assertIsArray($manager->topTGroupList(1), 'tag-top10-tgroup');
         $this->assertIsArray($manager->topRequestList(1), 'tag-top10-request');
         $this->assertIsArray($manager->topVotedList(1), 'tag-top10-voted');
diff --git a/tests/phpunit/TextTest.php b/tests/phpunit/TextTest.php
index 69b2f4f57..5a9f606ba 100644
--- a/tests/phpunit/TextTest.php
+++ b/tests/phpunit/TextTest.php
@@ -107,7 +107,7 @@ public function testCollage(): void {
         $this->userList['admin'] = Helper::makeUser('collage.' . randomString(6), 'text');
         $this->userList['admin']->setField('PermissionID', SYSOP)->modify();
         $name    = 'collage ' . randomString(6);
-        $collage = (new Gazelle\Manager\Collage)->create($this->userList['admin'], 1, $name, 'phpunit collage', 'jazz,disco', new Gazelle\Log);
+        $collage = (new Gazelle\Manager\Collage())->create($this->userList['admin'], 1, $name, 'phpunit collage', 'jazz,disco', new Gazelle\Log());
         $this->assertInstanceOf(Gazelle\Collage::class, $collage, 'text-create-collage');
         $this->assertEquals(
             "<a href=\"collages.php?id={$collage->id()}\">{$collage->name()}</a>",
@@ -119,7 +119,7 @@ public function testCollage(): void {
             Text::full_format($collage->publicLocation()),
             'text-collage-url'
         );
-        $commentMan = new Gazelle\Manager\Comment;
+        $commentMan = new Gazelle\Manager\Comment();
         $comment    = $commentMan->create($this->userList['admin'], 'collages', $collage->id(), "nice collage!");
         $this->assertEquals(
             "<a href=\"{$comment->url()}\">Collages Comment #{$comment->id()}</a>",
@@ -134,7 +134,7 @@ public function testForum(): void {
         $this->userList['admin']->setField('PermissionID', SYSOP)->modify();
         Text::setViewer($this->userList['admin']);
         $name  = 'forum ' . randomString(6);
-        $category = (new \Gazelle\Manager\ForumCategory)->create($name, 10003);
+        $category = (new \Gazelle\Manager\ForumCategory())->create($name, 10003);
         $forum = Helper::makeForum(
             user:        $this->userList['admin'],
             sequence:    999,
@@ -149,7 +149,7 @@ public function testForum(): void {
             'text-forum'
         );
 
-        $thread = (new Gazelle\Manager\ForumThread)->create(
+        $thread = (new Gazelle\Manager\ForumThread())->create(
             $forum, $this->userList['admin'], "phpunit thread title", "phpunit thread body"
         );
 
@@ -158,7 +158,7 @@ public function testForum(): void {
             FROM forums_posts fp
             INNER JOIN forums_topics ft ON (ft.ID = fp.TopicID)
         ");
-        $post = (new Gazelle\Manager\ForumPost)->findById($postId);
+        $post = (new Gazelle\Manager\ForumPost())->findById($postId);
         $threadId = $post->thread()->id();
         $title    = $post->thread()->title();
 
@@ -316,7 +316,7 @@ public function testTorrent(): void {
             WHERE c.name = ?
             ", 'Music'
         );
-        $torrent = (new Gazelle\Manager\Torrent)->findById($id);
+        $torrent = (new Gazelle\Manager\Torrent())->findById($id);
         $torrentId = $torrent->id();
         $tgroupId  = $torrent->group()->id();
 
diff --git a/tests/phpunit/TorrentTest.php b/tests/phpunit/TorrentTest.php
index 4a6304093..b6df02647 100644
--- a/tests/phpunit/TorrentTest.php
+++ b/tests/phpunit/TorrentTest.php
@@ -44,9 +44,9 @@ public function testRemoveAllLogs(): void {
             0,
             $this->torrent->removeAllLogs(
                 $this->user,
-                new Gazelle\File\RipLog,
-                new Gazelle\File\RipLogHTML,
-                new Gazelle\Log,
+                new Gazelle\File\RipLog(),
+                new Gazelle\File\RipLogHTML(),
+                new Gazelle\Log(),
             ),
             'torrent-remove-all-logs'
         );
diff --git a/tests/phpunit/TrackerTest.php b/tests/phpunit/TrackerTest.php
index 3c5861089..59edd0236 100644
--- a/tests/phpunit/TrackerTest.php
+++ b/tests/phpunit/TrackerTest.php
@@ -24,7 +24,7 @@ public function tearDown(): void {
      * @group no-ci
      */
     public function testTrackerAnnounce(): void {
-        $tracker  = new \Gazelle\Tracker;
+        $tracker  = new \Gazelle\Tracker();
         $interval = 1000 + random_int(0, 2000);
         $jitter   = random_int(0, 500);
         $this->assertTrue($tracker->modifyAnnounceInterval($interval), 'tracker-announce-modify-interval');
@@ -39,7 +39,7 @@ public function testTrackerAnnounce(): void {
      * @group no-ci
      */
     public function testTrackerStats(): void {
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         // this will fail if you have local clients logged into ocelot
         $this->assertEquals([0, 0], $tracker->global_peer_count(), 'tracker-global-peer-count');
     }
@@ -59,7 +59,7 @@ public function testTrackerToken(): void {
             user:  $this->user,
             title: 'tracker ' . randomString(10),
         );
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         $this->assertTrue($tracker->addToken($this->torrent, $this->user), 'tracker-add-token');
         $this->assertTrue($tracker->removeToken($this->torrent, $this->user), 'tracker-remove-token');
     }
@@ -79,7 +79,7 @@ public function testTrackerTorrent(): void {
             user:  $this->user,
             title: 'tracker ' . randomString(10),
         );
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         $this->assertTrue($tracker->addTorrent($this->torrent), 'tracker-add-torrent');
         $this->assertTrue($tracker->modifyTorrent($this->torrent, LeechType::Free), 'tracker-modify-torrent');
     }
@@ -88,7 +88,7 @@ public function testTrackerTorrent(): void {
      * @group no-ci
      */
     public function testTrackerUser(): void {
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         $this->assertFalse($tracker->last_error(), 'tracker-init');
 
         $info = $tracker->info();
@@ -138,7 +138,7 @@ public function testTrackerUser(): void {
      * @group no-ci
      */
     public function testTrackerWhitelist(): void {
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         $peer = '#utest-' . randomString(10);
 
         $this->assertTrue($tracker->removeWhitelist($peer), 'tracker-whitelist-remove-inexistent');
@@ -150,7 +150,7 @@ public function testTrackerWhitelist(): void {
     }
 
     public function testTrackerExpireFreeleech(): void {
-        $tracker = new \Gazelle\Tracker;
+        $tracker = new \Gazelle\Tracker();
         $this->user = Helper::makeUser('trkfree.' . randomString(10), 'tracker');
         $this->torrent = Helper::makeTorrentMusic(
             Helper::makeTGroupMusic(
diff --git a/tests/phpunit/UploadTest.php b/tests/phpunit/UploadTest.php
index 50d34c1f4..57e1d1ff4 100644
--- a/tests/phpunit/UploadTest.php
+++ b/tests/phpunit/UploadTest.php
@@ -33,7 +33,7 @@ public function testUpload(): void {
         $this->assertEquals("TextareaPreview.factory([[0, 'album_desc'],[1, 'release_desc']]);", $upload->albumReleaseJS(), 'upload-album-js');
         $this->assertEquals("TextareaPreview.factory([[0, 'desc']]);", $upload->descriptionJS(), 'upload-description-js');
 
-        $form = $upload->music_form(['acoustic', 'baroque.era', 'chillout'], new \Gazelle\Manager\TGroup);
+        $form = $upload->music_form(['acoustic', 'baroque.era', 'chillout'], new \Gazelle\Manager\TGroup());
         $this->assertStringStartsWith('        <div id="musicbrainz_popup"', $form, 'upload-music-popup');
         $this->assertStringContainsString('        <table id="form-music-upload"', $form, 'upload-music-begin');
         $this->assertStringContainsString('chillout', $form, 'upload-music-form');
diff --git a/tests/phpunit/UserActivityTest.php b/tests/phpunit/UserActivityTest.php
index 6caf8df53..07887ba01 100644
--- a/tests/phpunit/UserActivityTest.php
+++ b/tests/phpunit/UserActivityTest.php
@@ -29,19 +29,19 @@ public function testActivity(): void {
         $this->assertCount(2, $activity->alertList(), 'user-activity-alert');
 
         $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->configure(), 'user-activity-configure');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setApplicant(new Gazelle\Manager\Applicant), 'user-activity-applicant');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setDb(new Gazelle\DB), 'user-activity-db');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setPayment(new Gazelle\Manager\Payment), 'user-activity-payment');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setReferral(new Gazelle\Manager\Referral), 'user-activity-referral');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setReport(new Gazelle\Stats\Report), 'user-activity-report');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setSSLHost(new Gazelle\Manager\SSLHost), 'user-activity-sslhost');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setScheduler(new Gazelle\TaskScheduler), 'user-activity-scheduler');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setApplicant(new Gazelle\Manager\Applicant()), 'user-activity-applicant');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setDb(new Gazelle\DB()), 'user-activity-db');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setPayment(new Gazelle\Manager\Payment()), 'user-activity-payment');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setReferral(new Gazelle\Manager\Referral()), 'user-activity-referral');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setReport(new Gazelle\Stats\Report()), 'user-activity-report');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setSSLHost(new Gazelle\Manager\SSLHost()), 'user-activity-sslhost');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setScheduler(new Gazelle\TaskScheduler()), 'user-activity-scheduler');
         $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setStaff(new Gazelle\Staff($this->userList['admin'])), 'user-activity-staff-set');
-        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setStaffPM(new Gazelle\Manager\StaffPM), 'user-activity-staffpm');
+        $this->assertInstanceOf(Gazelle\User\Activity::class, $activity->setStaffPM(new Gazelle\Manager\StaffPM()), 'user-activity-staffpm');
     }
 
     public function testGlobal(): void {
-        $global = new Gazelle\Notification\GlobalNotification;
+        $global = new Gazelle\Notification\GlobalNotification();
         $global->remove(); // just in case
 
         $title  = 'global 10 minute news';
@@ -64,7 +64,7 @@ public function testGlobal(): void {
     }
 
     public function testInbox(): void {
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $this->userList['admin'] = Helper::makeUser('admin.' . randomString(10), 'activity');
         $this->userList['admin']->setField('PermissionID', SYSOP)->modify();
         $this->userList['user'] = Helper::makeUser('user.' . randomString(10), 'activity');
@@ -103,7 +103,7 @@ public function testNews(): void {
         $this->userList['admin']->setField('PermissionID', SYSOP)->modify();
         $this->userList['user'] = Helper::makeUser('user.' . randomString(10), 'activity');
 
-        $manager = new Gazelle\Manager\News;
+        $manager = new Gazelle\Manager\News();
         $title = "This is the 6 o'clock news";
         $newsId  = $manager->create($this->userList['admin'], $title, 'Not much happened');
         $this->assertGreaterThan(0, $newsId, 'alert-news-create');
diff --git a/tests/phpunit/UserCreateTest.php b/tests/phpunit/UserCreateTest.php
index 02e448fc2..5ad941e1e 100644
--- a/tests/phpunit/UserCreateTest.php
+++ b/tests/phpunit/UserCreateTest.php
@@ -22,7 +22,7 @@ public function testCreate(): void {
         $password     = randomString(40);
         $adminComment = 'Created by tests/phpunit/UserCreateTest.php';
 
-        $this->user = (new \Gazelle\UserCreator)
+        $this->user = (new \Gazelle\UserCreator())
             ->setUsername($name)
             ->setEmail($email)
             ->setPassword($password)
@@ -54,14 +54,14 @@ public function testLogin(): void {
         $_SERVER['REMOTE_ADDR']     = '127.0.0.100';
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
 
-        $this->user = (new \Gazelle\UserCreator)
+        $this->user = (new \Gazelle\UserCreator())
             ->setUsername('phpunit.' . randomString(10))
             ->setEmail('email@example.com')
             ->setPassword('password')
             ->setIpaddr($_SERVER['REMOTE_ADDR'])
             ->setAdminComment('phpunit test login')
             ->create();
-        $login = new Gazelle\Login;
+        $login = new Gazelle\Login();
         $watch = new Gazelle\LoginWatch($_SERVER['REMOTE_ADDR']);
         $watch->clearAttempts();
 
@@ -85,7 +85,7 @@ public function testLogin(): void {
     public function testZeroFailure(): void {
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
 
-        $creator = (new \Gazelle\UserCreator)
+        $creator = (new \Gazelle\UserCreator())
             ->setUsername('0')
             ->setEmail("test@example.com")
             ->setPassword(randomString(20))
@@ -99,7 +99,7 @@ public function testZeroFailure(): void {
     public function testNameFailure(): void {
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
 
-        $creator = (new \Gazelle\UserCreator)
+        $creator = (new \Gazelle\UserCreator())
             ->setUsername(randomString(21))
             ->setEmail("test@example.com")
             ->setPassword(randomString(20))
@@ -112,7 +112,7 @@ public function testNameFailure(): void {
 
     public function testNameTrim(): void {
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
-        $this->user = (new \Gazelle\UserCreator)
+        $this->user = (new \Gazelle\UserCreator())
             ->setUsername(' ' . randomString(6))
             ->setEmail("test@example.com")
             ->setPassword(randomString(20))
diff --git a/tests/phpunit/UserHistoryTest.php b/tests/phpunit/UserHistoryTest.php
index 063d98995..b933c17c5 100644
--- a/tests/phpunit/UserHistoryTest.php
+++ b/tests/phpunit/UserHistoryTest.php
@@ -29,14 +29,14 @@ public function testHistoryEmail(): void {
             $history->registerNewEmail(
                 $newEmail,
                 '127.1.2.3',
-                new \Gazelle\Manager\IPv4,
-                new \Gazelle\Util\Irc,
-                new \Gazelle\Util\Mail,
+                new \Gazelle\Manager\IPv4(),
+                new \Gazelle\Util\Irc(),
+                new \Gazelle\Util\Mail(),
             ),
             'userhist-record-email'
         );
         $this->assertEquals(2, $history->emailTotal(), 'userhist-email-total');
-        $list = $history->email(new \Gazelle\Search\ASN);
+        $list = $history->email(new \Gazelle\Search\ASN());
         $this->assertEquals($newEmail, $list[0]['email'], 'userhist-list-0');
         $this->assertEquals($email,    $list[1]['email'], 'userhist-list-1');
     }
@@ -50,13 +50,13 @@ public function testEmailDuplicate(): void {
         $history->registerNewEmail(
             $email,
             '127.1.2.3',
-            new \Gazelle\Manager\IPv4,
-            new \Gazelle\Util\Irc,
-            new \Gazelle\Util\Mail,
+            new \Gazelle\Manager\IPv4(),
+            new \Gazelle\Util\Irc(),
+            new \Gazelle\Util\Mail(),
         );
         $user->setField('Email', $email)->modify();
 
-        $duplicate = $history->emailDuplicate(new \Gazelle\Search\ASN);
+        $duplicate = $history->emailDuplicate(new \Gazelle\Search\ASN());
         $this->assertCount(1, $duplicate, 'email-duplicate-count');
         $this->assertEquals($this->userList[0]->id(), $duplicate[0]['user_id'], 'email-duplicate-user-id');
     }
@@ -65,6 +65,6 @@ public function testEmailReset(): void {
         $history = new \Gazelle\User\History($this->userList[0]);
         $email   = 'reset@phpunit';
         $this->assertEquals(1, $history->resetEmail($email, '127.2.3.4'), 'email-reset-action');
-        $this->assertEquals($email, $history->email(new \Gazelle\Search\ASN)[0]['email'], 'email-reset-address');
+        $this->assertEquals($email, $history->email(new \Gazelle\Search\ASN())[0]['email'], 'email-reset-address');
     }
 }
diff --git a/tests/phpunit/UserNavigationTest.php b/tests/phpunit/UserNavigationTest.php
index 36ecb7059..dab5016cf 100644
--- a/tests/phpunit/UserNavigationTest.php
+++ b/tests/phpunit/UserNavigationTest.php
@@ -17,7 +17,7 @@ public function tearDown(): void {
     }
 
     public function testNavigationBasic(): void {
-        $manager = new Gazelle\Manager\UserNavigation;
+        $manager = new Gazelle\Manager\UserNavigation();
         $fullList = $manager->fullList();
         $this->assertCount(12, $fullList, 'user-nav-manager-full');
 
diff --git a/tests/phpunit/UserSeedboxTest.php b/tests/phpunit/UserSeedboxTest.php
index 71663e949..970a4b240 100644
--- a/tests/phpunit/UserSeedboxTest.php
+++ b/tests/phpunit/UserSeedboxTest.php
@@ -123,7 +123,7 @@ public function testSeedbox(): void {
         $seedbox->setSource($hostList[$key2]['id'])->setTarget($hostList[$key1]['id']);
         $this->assertEquals([$this->torrentList[2]->id(), $this->torrentList[3]->id()], $seedbox->idList(), 'seedbox-2-not-1');
 
-        $list = $seedbox->torrentList(new Gazelle\Manager\Torrent, 3, 0);
+        $list = $seedbox->torrentList(new Gazelle\Manager\Torrent(), 3, 0);
         $this->assertEquals([$this->torrentList[2]->id(), $this->torrentList[3]->id()], array_map(fn($t) => $t['id'], $list), 'seedbox-list');
     }
 }
diff --git a/tests/phpunit/UserTest.php b/tests/phpunit/UserTest.php
index 028b1b122..15a28f0fc 100644
--- a/tests/phpunit/UserTest.php
+++ b/tests/phpunit/UserTest.php
@@ -38,7 +38,7 @@ public function modifyAvatarRender(AvatarDisplay $display, AvatarSynthetic $synt
     }
 
     public function testUserFind(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $admin = $userMan->find('@' . $this->user->username());
         $this->user->setField('PermissionID', SYSOP)->modify();
         $this->assertTrue($admin->isStaff(), 'admin-is-admin');
@@ -49,7 +49,7 @@ public function testUserFind(): void {
     }
 
     public function testFindById(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $user = $userMan->findById($this->user->id());
         $this->assertFalse($user->isStaff(), 'user-is-not-admin');
         $this->assertStringStartsWith('user.', $user->username(), 'user-username');
@@ -61,8 +61,8 @@ public function testFindById(): void {
         $id       = $this->user->id();
         $username = $this->user->username();
         $this->assertEquals(1, $this->user->remove(), 'user-remove');
-        $this->assertNull((new \Gazelle\Manager\User)->findById($id), 'user-is-removed');
-        $this->assertNull((new \Gazelle\Manager\User)->findByUsername($username), 'username-is-removed');
+        $this->assertNull((new \Gazelle\Manager\User())->findById($id), 'user-is-removed');
+        $this->assertNull((new \Gazelle\Manager\User())->findByUsername($username), 'username-is-removed');
         unset($this->user);
     }
 
@@ -142,7 +142,7 @@ public function testExternalProfile(): void {
     }
 
     public function testPassword(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $password = randomString(30);
         $_SERVER['HTTP_USER_AGENT'] = 'phpunit';
         $this->assertTrue($this->user->updatePassword($password, '0.0.0.0'), 'utest-password-modify');
@@ -169,7 +169,7 @@ public function testUserBasic(): void {
         $this->assertEquals(0.0, $this->user->requiredRatio(), 'utest-required-ratio');
         $this->assertEquals('', $this->user->forbiddenForumsList(), 'utest-forbidden-forum-list');
         $this->assertEquals([], $this->user->tagSnatchCounts(), 'utest-tag-snatch-counts');
-        $this->assertEquals([], $this->user->tokenList(new \Gazelle\Manager\Torrent, 0, 0), 'utest-token-list');
+        $this->assertEquals([], $this->user->tokenList(new \Gazelle\Manager\Torrent(), 0, 0), 'utest-token-list');
         $this->assertEquals([], $this->user->navigationList(), 'utest-navigation-list');
         $this->assertEquals(USER, $this->user->primaryClass(), 'utest-primary-class');
 
@@ -244,7 +244,7 @@ public function testUpDown(): void {
     }
 
     public function testAvatar(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $this->assertEquals('', $this->user->avatar(), 'utest-avatar-blank');
         $this->assertEquals(
             [
@@ -292,7 +292,7 @@ public function testNextClass(): void {
         $this->user->setField('Enabled', UserStatus::enabled->value)->modify();
         $this->assertEquals(\Gazelle\Enum\UserStatus::enabled, $this->user->userStatus(), 'utest-user-status-enabled');
 
-        $manager = new Gazelle\Manager\User;
+        $manager = new Gazelle\Manager\User();
         $next = $this->user->nextClass($manager);
         $this->assertEquals('Member', $next['class'], 'user-next-class-is-member');
 
@@ -321,7 +321,7 @@ public function testNextClass(): void {
     }
 
     public function testStylesheet(): void {
-        $manager = new \Gazelle\Manager\Stylesheet;
+        $manager = new \Gazelle\Manager\Stylesheet();
         $list = $manager->list();
         $this->assertGreaterThan(5, $list, 'we-can-haz-stylesheets');
         $this->assertEquals(count($list), count($manager->usageList('name', 'ASC')), 'stylesheet-list-usage');
@@ -371,7 +371,7 @@ public function testLogin(): void {
         $this->assertEquals(1, $watch->nrAttempts(), 'loginwatch-init-attempt');
         $this->assertEquals(0, $watch->nrBans(), 'loginwatch-init-ban');
 
-        $login  = new \Gazelle\Login;
+        $login  = new \Gazelle\Login();
         $result = $login->login(
             username: 'email@example.com',
             password: 'password',
@@ -428,7 +428,7 @@ public function testAnnounceKey(): void {
     }
 
     public function testInactive(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $db      = \Gazelle\DB::DB();
 
         $this->user->setField('Enabled', UserStatus::enabled->value)->modify();
@@ -437,20 +437,20 @@ public function testInactive(): void {
             ", $this->user->id(), INACTIVE_USER_WARN_DAYS + 1
         );
         $this->user->flush();
-        $this->assertEquals(1, $userMan->inactiveUserWarn(new \Gazelle\Util\Mail), 'utest-one-user-inactive-warned');
+        $this->assertEquals(1, $userMan->inactiveUserWarn(new \Gazelle\Util\Mail()), 'utest-one-user-inactive-warned');
         $this->assertTrue($this->user->hasAttr('inactive-warning-sent'), 'utest-inactive-warned');
 
         $db->prepared_query("
             UPDATE user_last_access SET last_access = now() - INTERVAL ? DAY WHERE user_id = ?
             ", INACTIVE_USER_DEACTIVATE_DAYS + 1, $this->user->id()
         );
-        $this->assertEquals(1, $userMan->inactiveUserDeactivate(new \Gazelle\Tracker), 'utest-one-user-inactive-deactivated');
+        $this->assertEquals(1, $userMan->inactiveUserDeactivate(new \Gazelle\Tracker()), 'utest-one-user-inactive-deactivated');
         $this->user->flush();
         $this->assertTrue($this->user->isDisabled(), 'utest-inactive-deactivated');
     }
 
     public function testLastFM(): void {
-        $lastfm   = new \Gazelle\Util\LastFM;
+        $lastfm   = new \Gazelle\Util\LastFM();
         $username = 'phpunit.' . randomString(6);
         $this->assertNull($lastfm->username($this->user), 'lastfm-no-username');
         $this->assertEquals(1, $lastfm->modifyUsername($this->user, $username), 'lastfm-create-username');
@@ -474,7 +474,7 @@ public function testSecondaryClass(): void {
     }
 
     public function testStats(): void {
-        $eco = new \Gazelle\Stats\Economic;
+        $eco = new \Gazelle\Stats\Economic();
         $eco->flush();
 
         $total    = $eco->tokenTotal();
@@ -492,7 +492,7 @@ public function testStats(): void {
         $this->assertEquals(23 + $stranded, $eco->tokenStrandedTotal(), 'utest-stats-total-disabled-stranded-tokens');
         $this->assertEquals(1 + $disabled, $eco->userDisabledTotal(), 'utest-stats-user-disabled-total');
 
-        $stats = new \Gazelle\Stats\Users;
+        $stats = new \Gazelle\Stats\Users();
         $this->assertTrue($stats->newUsersAllowed($this->user), 'user-stats-new-users');
         $this->assertGreaterThan(0, $stats->refresh(), 'user-stats-refresh');
         $this->assertGreaterThan(0, $stats->registerActivity('users_stats_daily', 10), 'user-stats-register');
diff --git a/tests/phpunit/UserTokenTest.php b/tests/phpunit/UserTokenTest.php
index 7e6323360..a05b8b3a3 100644
--- a/tests/phpunit/UserTokenTest.php
+++ b/tests/phpunit/UserTokenTest.php
@@ -17,12 +17,12 @@ public function setUp(): void {
     }
 
     public function tearDown(): void {
-        (new \Gazelle\Manager\UserToken)->removeUser($this->user);
+        (new \Gazelle\Manager\UserToken())->removeUser($this->user);
         $this->user->remove();
     }
 
     public function testUserTokenCreate(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $userToken = $manager->create(UserTokenType::password, $this->user);
         $this->assertTrue(Helper::recentDate($userToken->expiry()), 'usertoken-expiry');
 
@@ -39,19 +39,19 @@ public function testUserTokenCreate(): void {
     }
 
     public function testUserTokenPermanent(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $userToken = $manager->create(UserTokenType::mfa, $this->user);
         $this->assertEquals('infinity', $userToken->expiry(), 'usertoken-permanent');
     }
 
     public function testUserTokenExists(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $userToken = $manager->create(UserTokenType::confirm, $this->user);
         $this->assertInstanceOf(\Gazelle\User\Token::class, $manager->findByUser($userToken->user(), UserTokenType::confirm), 'usertoken-find-by-user');
     }
 
     public function testPasswordToken(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $userToken = $manager->createPasswordResetToken($this->user);
         $this->assertEquals('1 day', UserTokenType::confirm->interval(), 'usertoken-confirm-interval');
 
@@ -69,12 +69,12 @@ public function testPasswordToken(): void {
     }
 
     public function testUserTokenMissing(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $this->assertNull($manager->findByUser($this->user, UserTokenType::mfa), 'usertoken-missing');
     }
 
     public function testMFA(): void {
-        $manager = new \Gazelle\Manager\UserToken;
+        $manager = new \Gazelle\Manager\UserToken();
         $this->assertCount(0, $this->user->list2FA(), 'utest-no-mfa');
         $this->assertEquals(1, $this->user->create2FA($manager, randomString(16)), 'utest-setup-mfa');
         $recovery = $this->user->list2FA();
diff --git a/tests/phpunit/Util/SSLTest.php b/tests/phpunit/Util/SSLTest.php
index 9ce12fd96..ffd5c1b48 100644
--- a/tests/phpunit/Util/SSLTest.php
+++ b/tests/phpunit/Util/SSLTest.php
@@ -8,7 +8,7 @@ class SSLTest extends TestCase {
     protected Manager\SSLHost $manager;
 
     public function setUp(): void {
-        $this->manager = new Manager\SSLHost;
+        $this->manager = new Manager\SSLHost();
     }
 
     public function testAll(): void {
diff --git a/tests/phpunit/Util/TwigTest.php b/tests/phpunit/Util/TwigTest.php
index 691ae64a9..286f83442 100644
--- a/tests/phpunit/Util/TwigTest.php
+++ b/tests/phpunit/Util/TwigTest.php
@@ -12,7 +12,7 @@ class TwigTest extends TestCase {
     protected \Gazelle\User $user;
 
     public function setUp(): void {
-        Gazelle\Util\Twig::setUserMan(new Gazelle\Manager\User);
+        Gazelle\Util\Twig::setUserMan(new Gazelle\Manager\User());
         $this->user = Helper::makeUser('user.' . randomString(6), 'user');
         $this->user->setField('PermissionID', SYSOP)->modify();
     }
@@ -222,7 +222,7 @@ public function testFunction(): void {
                'BrowserVersion'         => '1.0',
                'OperatingSystem'        => 'phpunit/OS',
                'OperatingSystemVersion' => '1.0',
-           ],
+            ],
             'ipaddr'      => '127.0.0.1',
             'useragent'   => 'phpunit',
         ]);
diff --git a/tests/phpunit/WikiTest.php b/tests/phpunit/WikiTest.php
index 53c8daad1..ec3926376 100644
--- a/tests/phpunit/WikiTest.php
+++ b/tests/phpunit/WikiTest.php
@@ -44,7 +44,7 @@ public function testNormalizeAlias(string $expected, string $input, string $mess
     }
 
     public function testWikiCreate(): void {
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $title   = 'phpunit title ' . randomString(6);
         $alias   = \Gazelle\Wiki::normalizeAlias($title);
         $article = $manager->create(
@@ -79,7 +79,7 @@ public function testWikiCreate(): void {
     }
 
     public function testWikiAlias(): void {
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $title   = 'phpunit title ' . randomString(6);
         $alias   = \Gazelle\Wiki::normalizeAlias($title);
         $article = $manager->create(
@@ -100,7 +100,7 @@ public function testWikiAlias(): void {
     }
 
     public function testWikiException(): void {
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $title   = 'phpunit title ' . randomString(6);
         $alias   = \Gazelle\Wiki::normalizeAlias($title);
         $article = $manager->create(
@@ -120,12 +120,12 @@ public function testWikiException(): void {
     }
 
     public function testWikiList(): void {
-        $classList = (new \Gazelle\Manager\User)->classList();
+        $classList = (new \Gazelle\Manager\User())->classList();
         $level = [
             USER  => $classList[USER]['Level'],
             SYSOP => $classList[SYSOP]['Level'],
         ];
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $initial = [
             USER  => count($manager->articles($level[USER])),
             SYSOP => count($manager->articles($level[SYSOP])),
@@ -144,7 +144,7 @@ public function testWikiList(): void {
     }
 
     public function testWikiRevision(): void {
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $title   = 'phpunit title ' . randomString(6);
         $alias   = \Gazelle\Wiki::normalizeAlias($title);
         $article = $manager->create(
@@ -166,7 +166,7 @@ public function testWikiRevision(): void {
     }
 
     public function testConfigureAccess(): void {
-        $manager = new \Gazelle\Manager\Wiki;
+        $manager = new \Gazelle\Manager\Wiki();
         $access = $manager->configureAccess(
             user:    $this->userList['user'],
             minRead: $this->userList['user']->privilege()->effectiveClassLevel(),
diff --git a/tests/phpunit/manager/BlogTest.php b/tests/phpunit/manager/BlogTest.php
index 40da302d4..b6bb73441 100644
--- a/tests/phpunit/manager/BlogTest.php
+++ b/tests/phpunit/manager/BlogTest.php
@@ -27,7 +27,7 @@ public function tearDown(): void {
     }
 
     public function testBlogCreate(): void {
-        $manager = new \Gazelle\Manager\Blog;
+        $manager = new \Gazelle\Manager\Blog();
         $initial = $manager->headlines();
         $this->blog = $manager->create([
             'userId'    => $this->userList[0]->id(),
@@ -56,7 +56,7 @@ public function testBlogCreate(): void {
     }
 
     public function testBlogWitness(): void {
-        $manager = new \Gazelle\Manager\Blog;
+        $manager = new \Gazelle\Manager\Blog();
         $this->blog = $manager->create([
             'userId'    => $this->userList[0]->id(),
             'title'     => 'phpunit blog witness',
@@ -65,14 +65,14 @@ public function testBlogWitness(): void {
             'important' => 1,
         ]);
 
-        $witness = new \Gazelle\WitnessTable\UserReadBlog;
+        $witness = new \Gazelle\WitnessTable\UserReadBlog();
         $this->assertNull($witness->lastRead($this->userList[1]), 'blog-user-not-read');
         $this->assertTrue($witness->witness($this->userList[1]));
         $this->assertEquals($this->blog->id(), $witness->lastRead($this->userList[1]), 'blog-user-read');
     }
 
     public function testBlogNotification(): void {
-        $manager = new \Gazelle\Manager\Blog;
+        $manager = new \Gazelle\Manager\Blog();
         $title   = 'phpunit blog notif';
         $this->blog    = $manager->create([
             'userId'    => $this->userList[0]->id(),
diff --git a/tests/phpunit/manager/CollageFreeleechTest.php b/tests/phpunit/manager/CollageFreeleechTest.php
index da7666527..b30574cfa 100644
--- a/tests/phpunit/manager/CollageFreeleechTest.php
+++ b/tests/phpunit/manager/CollageFreeleechTest.php
@@ -29,13 +29,13 @@ public function setUp(): void {
                 user:       $this->user,
             ),
         ];
-        $this->collage = (new Gazelle\Manager\Collage)->create(
+        $this->collage = (new Gazelle\Manager\Collage())->create(
             user:        $this->user,
             categoryId:  2,
             name:        'phpunit collfree ' . randomString(10),
             description: 'phpunit collfree',
             tagList:     'pop',
-            logger:      new \Gazelle\Log,
+            logger:      new \Gazelle\Log(),
         );
         foreach ($this->tgroupList as $tgroup) {
             foreach ([
@@ -56,7 +56,7 @@ public function setUp(): void {
     }
 
     public function tearDown(): void {
-        $torMan = new Gazelle\Manager\Torrent;
+        $torMan = new Gazelle\Manager\Torrent();
         foreach ($this->tgroupList as $tgroup) {
             $this->collage->removeEntry($tgroup->id());
             foreach ($tgroup->torrentIdList() as $torrentId) {
@@ -69,14 +69,14 @@ public function tearDown(): void {
     }
 
     public function testCollageFreeleech(): void {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         $idList = $this->collage->entryFlacList();
         $this->assertCount(4, $idList, 'collfree-flac-list');
         $this->assertEquals(
             4,
             $this->collage->setFreeleech(
                 torMan:    $torMan,
-                tracker:   new \Gazelle\Tracker,
+                tracker:   new \Gazelle\Tracker(),
                 user:      $this->user,
                 leechType: LeechType::Free,
                 reason:    LeechReason::Permanent,
@@ -99,7 +99,7 @@ public function testCollageFreeleech(): void {
             4,
             $this->collage->setFreeleech(
                 torMan:    $torMan,
-                tracker:   new \Gazelle\Tracker,
+                tracker:   new \Gazelle\Tracker(),
                 user:      $this->user,
                 leechType: LeechType::Normal,
                 reason:    LeechReason::Normal,
diff --git a/tests/phpunit/manager/DuplicateIpTest.php b/tests/phpunit/manager/DuplicateIpTest.php
index 68739ff2a..9d744e1b8 100644
--- a/tests/phpunit/manager/DuplicateIpTest.php
+++ b/tests/phpunit/manager/DuplicateIpTest.php
@@ -44,7 +44,7 @@ public function tearDown(): void {
     }
 
     public function testDuplicateIpTotal(): void {
-        $dup = new \Gazelle\Manager\DuplicateIP;
+        $dup = new \Gazelle\Manager\DuplicateIP();
         $total = $dup->total(5);
         $this->assertGreaterThan(1, $total, 'duplicate-ip-total');
 
diff --git a/tests/phpunit/manager/EmailBlacklistTest.php b/tests/phpunit/manager/EmailBlacklistTest.php
index 5496ce46d..48f8e1801 100644
--- a/tests/phpunit/manager/EmailBlacklistTest.php
+++ b/tests/phpunit/manager/EmailBlacklistTest.php
@@ -17,7 +17,7 @@ public function tearDown(): void {
     }
 
     public function testCreate(): void {
-        $manager = new \Gazelle\Manager\EmailBlacklist;
+        $manager = new \Gazelle\Manager\EmailBlacklist();
         $total   = $manager->total();
 
         $stem = randomString(10);
diff --git a/tests/phpunit/manager/FeaturedAlbumTest.php b/tests/phpunit/manager/FeaturedAlbumTest.php
index 006d27ff2..028492def 100644
--- a/tests/phpunit/manager/FeaturedAlbumTest.php
+++ b/tests/phpunit/manager/FeaturedAlbumTest.php
@@ -22,7 +22,7 @@ public function setUp(): void {
             tagName:    ['opera'],
             user:       $this->user,
         );
-        $this->thread = (new \Gazelle\Manager\ForumThread)->create(
+        $this->thread = (new \Gazelle\Manager\ForumThread())->create(
             new Gazelle\Forum(AOTM_FORUM_ID),
             $this->user,
             'phpunit aotm ' . $this->tgroup->text(),
@@ -32,26 +32,26 @@ public function setUp(): void {
 
     public function tearDown(): void {
         $db = \Gazelle\DB::DB();
-        (new Gazelle\Manager\News)->remove(
+        (new Gazelle\Manager\News())->remove(
             (int)$db->scalar("
                 SELECT ID FROM news WHERE UserID = ?
                 ", $this->user->id()
             )
         );
-        (new Gazelle\Manager\FeaturedAlbum)->findById($this->tgroup->id())?->remove();
+        (new Gazelle\Manager\FeaturedAlbum())->findById($this->tgroup->id())?->remove();
         $this->tgroup->remove($this->user);
         $this->thread->remove();
         $this->user->remove();
     }
 
     public function testFeaturedAotm(): void {
-        $manager = new Gazelle\Manager\FeaturedAlbum;
+        $manager = new Gazelle\Manager\FeaturedAlbum();
         $aotm = $manager->create(
             featureType: FeaturedAlbumType::AlbumOfTheMonth,
-            news:        new \Gazelle\Manager\News,
-            tgMan:       new \Gazelle\Manager\TGroup,
-            torMan:      new \Gazelle\Manager\Torrent,
-            tracker:     new \Gazelle\Tracker,
+            news:        new \Gazelle\Manager\News(),
+            tgMan:       new \Gazelle\Manager\TGroup(),
+            torMan:      new \Gazelle\Manager\Torrent(),
+            tracker:     new \Gazelle\Tracker(),
             tgroup:      $this->tgroup,
             forumThread: $this->thread,
             title:       'AOTM phpunit feature ' . date('Y-m-d H:i:s'),
@@ -78,13 +78,13 @@ public function testFeaturedAotm(): void {
     }
 
     public function testFeaturedShowcase(): void {
-        $manager = new Gazelle\Manager\FeaturedAlbum;
+        $manager = new Gazelle\Manager\FeaturedAlbum();
         $showcase = $manager->create(
             featureType: FeaturedAlbumType::Showcase,
-            news:        new \Gazelle\Manager\News,
-            tgMan:       new \Gazelle\Manager\TGroup,
-            torMan:      new \Gazelle\Manager\Torrent,
-            tracker:     new \Gazelle\Tracker,
+            news:        new \Gazelle\Manager\News(),
+            tgMan:       new \Gazelle\Manager\TGroup(),
+            torMan:      new \Gazelle\Manager\Torrent(),
+            tracker:     new \Gazelle\Tracker(),
             tgroup:      $this->tgroup,
             forumThread: $this->thread,
             title:       'Showcase phpunit feature ' . date('Y-m-d H:i:s'),
diff --git a/tests/phpunit/manager/IPv4Test.php b/tests/phpunit/manager/IPv4Test.php
index 6aae8f0e1..d6f7e0b1a 100644
--- a/tests/phpunit/manager/IPv4Test.php
+++ b/tests/phpunit/manager/IPv4Test.php
@@ -17,7 +17,7 @@ public function tearDown(): void {
     }
 
     public function testBan(): void {
-        $ipv4 = new \Gazelle\Manager\IPv4;
+        $ipv4 = new \Gazelle\Manager\IPv4();
         $initial = $ipv4->total();
         // if the following fails, it is due to a previous unittest failure
         $this->assertFalse($ipv4->isBanned('127.9.9.55'), 'ipv4-is-not-banned');
@@ -44,7 +44,7 @@ public function testBan(): void {
     }
 
     public function testUserPage(): void {
-        $ipv4 = new \Gazelle\Manager\IPv4;
+        $ipv4 = new \Gazelle\Manager\IPv4();
         $this->assertEquals(1, $ipv4->register($this->user, '127.1.0.1'), 'ipv4-create');
         $this->assertEquals(2, $ipv4->userTotal($this->user), 'ipv4-user-total');
         $this->assertEquals(
diff --git a/tests/phpunit/manager/NewsTest.php b/tests/phpunit/manager/NewsTest.php
index 44a3b0f40..6fa6c2b4b 100644
--- a/tests/phpunit/manager/NewsTest.php
+++ b/tests/phpunit/manager/NewsTest.php
@@ -18,7 +18,7 @@ public function setUp(): void {
 
     public function tearDown(): void {
         if (isset($this->news)) {
-            (new \Gazelle\Manager\News)->remove($this->news);
+            (new \Gazelle\Manager\News())->remove($this->news);
         }
         foreach ($this->userList as $user) {
             $user->remove();
@@ -26,7 +26,7 @@ public function tearDown(): void {
     }
 
     public function testNewsCreate(): void {
-        $manager = new \Gazelle\Manager\News;
+        $manager = new \Gazelle\Manager\News();
         $initial = $manager->headlines();
         $this->news = $manager->create(
             $this->userList[0],
@@ -42,21 +42,21 @@ public function testNewsCreate(): void {
     }
 
     public function testNewsWitness(): void {
-        $manager    = new \Gazelle\Manager\News;
+        $manager    = new \Gazelle\Manager\News();
         $this->news = $manager->create(
             $this->userList[0],
             'phpunit news witness',
             'phpunit news witness body',
         );
 
-        $witness = new \Gazelle\WitnessTable\UserReadNews;
+        $witness = new \Gazelle\WitnessTable\UserReadNews();
         $this->assertNull($witness->lastRead($this->userList[1]), 'news-user-not-read');
         $this->assertTrue($witness->witness($this->userList[1]));
         $this->assertEquals($this->news, $witness->lastRead($this->userList[1]), 'news-user-read');
     }
 
     public function testNewsNotification(): void {
-        $manager    = new \Gazelle\Manager\News;
+        $manager    = new \Gazelle\Manager\News();
         $title      = 'phpunit news notif';
         $this->news = $manager->create(
             $this->userList[0],
diff --git a/tests/phpunit/manager/ReportManagerTest.php b/tests/phpunit/manager/ReportManagerTest.php
index 3583562ba..5ce7580d5 100644
--- a/tests/phpunit/manager/ReportManagerTest.php
+++ b/tests/phpunit/manager/ReportManagerTest.php
@@ -34,15 +34,15 @@ public function tearDown(): void {
     }
 
     public function testReportCollage(): void {
-        $this->collage = (new Gazelle\Manager\Collage)->create(
+        $this->collage = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList[0],
             categoryId:  2,
             name:        'phpunit collage report ' . randomString(20),
             description: 'phpunit collage report description',
             tagList:     'disco funk metal',
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
-        $manager = new Gazelle\Manager\Report(new Gazelle\Manager\User);
+        $manager = new Gazelle\Manager\Report(new Gazelle\Manager\User());
         $report = $manager->create($this->userList[1], $this->collage->id(), 'collage', 'phpunit collage report');
         $this->reportList[] = $report;
         $this->assertEquals("phpunit collage report", $report->reason(), 'collage-report-reason');
@@ -51,10 +51,10 @@ public function testReportCollage(): void {
     }
 
     public function testReportRequest(): void {
-        $this->request = (new Gazelle\Manager\Request)->create(
+        $this->request = (new Gazelle\Manager\Request())->create(
             user:            $this->userList[1],
             bounty:          REQUEST_MIN * 1024 * 1024,
-            categoryId:      (new Gazelle\Manager\Category)->findIdByName('Comics'),
+            categoryId:      (new Gazelle\Manager\Category())->findIdByName('Comics'),
             year:            (int)date('Y'),
             title:           'phpunit request report',
             image:           '',
@@ -70,7 +70,7 @@ public function testReportRequest(): void {
             oclc:            '',
         );
 
-        $manager = new Gazelle\Manager\Report(new Gazelle\Manager\User);
+        $manager = new Gazelle\Manager\Report(new Gazelle\Manager\User());
         $initial = $manager->remainingTotal();
 
         $report = $manager->create($this->userList[1], $this->request->id(), 'request', 'phpunit report');
@@ -120,21 +120,21 @@ public function testReportRequest(): void {
         // search
         $this->assertCount(
             1,
-            (new Gazelle\Search\Report)->setId($report->id())->page(2, 0),
+            (new Gazelle\Search\Report())->setId($report->id())->page(2, 0),
             'request-report-search-id'
         );
         $this->assertEquals(
             1,
-            (new Gazelle\Search\Report)->setStatus(['InProgress'])->total(),
+            (new Gazelle\Search\Report())->setStatus(['InProgress'])->total(),
             'request-report-search-in-progress-total'
         );
         $this->assertEquals(
             0,
-            (new Gazelle\Search\Report)->setStatus(['InProgress'])->restrictForumMod()->total(),
+            (new Gazelle\Search\Report())->setStatus(['InProgress'])->restrictForumMod()->total(),
             'request-report-search-fmod-in-progress-total'
         );
 
-        $search = new Gazelle\Search\Report;
+        $search = new Gazelle\Search\Report();
         $total  = $search->setStatus(['InProgress'])->total();
         $page   = $search->page($total, 0);
         $this->assertEquals($total, count($page), 'request-report-page-list');
@@ -151,7 +151,7 @@ public function testReportRequest(): void {
     }
 
     public function testReportUser(): void {
-        $manager = new \Gazelle\Manager\Report(new Gazelle\Manager\User);
+        $manager = new \Gazelle\Manager\Report(new Gazelle\Manager\User());
         $report = $manager->create($this->userList[0], $this->userList[1]->id(), 'user', 'phpunit user report');
         $this->reportList[] = $report;
 
@@ -183,15 +183,15 @@ public function testReportUser(): void {
     }
 
     public function testDecorate(): void {
-        $manager = new \Gazelle\Manager\Report(new Gazelle\Manager\User);
+        $manager = new \Gazelle\Manager\Report(new Gazelle\Manager\User());
 
-        $this->collage = (new Gazelle\Manager\Collage)->create(
+        $this->collage = (new Gazelle\Manager\Collage())->create(
             user:        $this->userList[0],
             categoryId:  2,
             name:        'phpunit collage report ' . randomString(20),
             description: 'phpunit collage report description',
             tagList:     'disco funk metal',
-            logger:      new Gazelle\Log,
+            logger:      new Gazelle\Log(),
         );
         $report = $manager->create($this->userList[1], $this->collage->id(), 'collage', 'phpunit collage report');
         $this->reportList[] = $report;
@@ -200,11 +200,11 @@ public function testDecorate(): void {
 
         $list = $manager->decorate(
             array_map(fn($r) => $r->id(), $this->reportList),
-            new Gazelle\Manager\Collage,
-            new Gazelle\Manager\Comment,
-            new Gazelle\Manager\ForumThread,
-            new Gazelle\Manager\ForumPost,
-            new Gazelle\Manager\Request,
+            new Gazelle\Manager\Collage(),
+            new Gazelle\Manager\Comment(),
+            new Gazelle\Manager\ForumThread(),
+            new Gazelle\Manager\ForumPost(),
+            new Gazelle\Manager\Request(),
         );
         $this->assertCount(2, $list, 'report-decorate-list');
         $this->assertEquals('collage', $list[0]['label'], 'report-list-label');
diff --git a/tests/phpunit/manager/RequestManagerTest.php b/tests/phpunit/manager/RequestManagerTest.php
index 55927cd31..a1c6103b9 100644
--- a/tests/phpunit/manager/RequestManagerTest.php
+++ b/tests/phpunit/manager/RequestManagerTest.php
@@ -8,7 +8,7 @@ class RequestManagerTest extends TestCase {
     protected \Gazelle\Manager\Request $manager;
 
     public function setUp(): void {
-        $this->manager = new \Gazelle\Manager\Request;
+        $this->manager = new \Gazelle\Manager\Request();
     }
 
     public function testManager(): void {
diff --git a/tests/phpunit/manager/TGroupManagerTest.php b/tests/phpunit/manager/TGroupManagerTest.php
index 96f8f5397..ad5214ea5 100644
--- a/tests/phpunit/manager/TGroupManagerTest.php
+++ b/tests/phpunit/manager/TGroupManagerTest.php
@@ -37,7 +37,7 @@ public function tearDown(): void {
     }
 
     public function testFindByTorrentId(): void {
-        $manager = new \Gazelle\Manager\TGroup;
+        $manager = new \Gazelle\Manager\TGroup();
         $torrentId = $this->torrentList[0]->id();
         $this->assertEquals(
             $this->tgroupList[0]->id(),
@@ -47,7 +47,7 @@ public function testFindByTorrentId(): void {
     }
 
     public function testFindByInfohash(): void {
-        $manager = new \Gazelle\Manager\TGroup;
+        $manager = new \Gazelle\Manager\TGroup();
         $infohash = $this->torrentList[0]->infohash();
         $this->assertEquals(
             $this->tgroupList[0]->id(),
@@ -57,7 +57,7 @@ public function testFindByInfohash(): void {
     }
 
     public function testRefreshBetterTranscode(): void {
-        $manager = new \Gazelle\Manager\TGroup;
+        $manager = new \Gazelle\Manager\TGroup();
         // There is at least something from our own tgroup
         $this->assertGreaterThanOrEqual(1, $manager->refreshBetterTranscode(), 'tgman-refresh-better-transcode');
     }
diff --git a/tests/phpunit/manager/TorManagerTest.php b/tests/phpunit/manager/TorManagerTest.php
index 994ff4f54..0a1bf9da9 100644
--- a/tests/phpunit/manager/TorManagerTest.php
+++ b/tests/phpunit/manager/TorManagerTest.php
@@ -6,7 +6,7 @@
 
 class TorManagerTest extends TestCase {
     public function testTor(): void {
-        $manager = new \Gazelle\Manager\Tor;
+        $manager = new \Gazelle\Manager\Tor();
         $list = array_map(fn($n) => $n['ipv4'], $manager->exitNodeList());
         $this->assertIsArray($list, 'tornode-has-list');
         $this->assertFalse($manager->isExitNode('0.0.0.0'), 'tornode-0000-exit-node');
diff --git a/tests/phpunit/manager/TorrentFreeleechTest.php b/tests/phpunit/manager/TorrentFreeleechTest.php
index e20836664..e79e81c3b 100644
--- a/tests/phpunit/manager/TorrentFreeleechTest.php
+++ b/tests/phpunit/manager/TorrentFreeleechTest.php
@@ -39,7 +39,7 @@ public function setUp(): void {
     public function tearDown(): void {
         $tgroup = $this->torrentList[0]->group();
         $user   = $this->torrentList[0]->uploader();
-        $torMan = new Gazelle\Manager\Torrent;
+        $torMan = new Gazelle\Manager\Torrent();
         foreach ($this->torrentList as $torrent) {
             $torrent->remove($user, 'torman unit test');
         }
@@ -51,8 +51,8 @@ public function testTorrentFreeleechThreshold(): void {
         $this->assertEquals(
             4,
             $this->torrentList[0]->group()->setFreeleech(
-                torMan:    new \Gazelle\Manager\Torrent,
-                tracker:   new \Gazelle\Tracker,
+                torMan:    new \Gazelle\Manager\Torrent(),
+                tracker:   new \Gazelle\Tracker(),
                 user:      $this->torrentList[0]->uploader(),
                 leechType: LeechType::Free,
                 reason:    LeechReason::StaffPick,
@@ -70,8 +70,8 @@ public function testTorrentFreeleechThreshold(): void {
         $this->assertEquals(
             4,
             $this->torrentList[0]->group()->setFreeleech(
-                torMan:    new \Gazelle\Manager\Torrent,
-                tracker:   new \Gazelle\Tracker,
+                torMan:    new \Gazelle\Manager\Torrent(),
+                tracker:   new \Gazelle\Tracker(),
                 user:      $this->torrentList[0]->uploader(),
                 leechType: LeechType::Normal,
                 reason:    LeechReason::Normal,
@@ -90,8 +90,8 @@ public function testTorrentFreeleechAllFree(): void {
         $this->assertEquals(
             5,
             $this->torrentList[0]->group()->setFreeleech(
-                torMan:    new \Gazelle\Manager\Torrent,
-                tracker:   new \Gazelle\Tracker,
+                torMan:    new \Gazelle\Manager\Torrent(),
+                tracker:   new \Gazelle\Tracker(),
                 user:      $this->torrentList[0]->uploader(),
                 leechType: LeechType::Free,
                 reason:    LeechReason::StaffPick,
@@ -102,5 +102,5 @@ public function testTorrentFreeleechAllFree(): void {
 
         $this->assertEquals(LeechType::Free, $this->torrentList[3]->flush()->leechType(), 'torman-3-is-free');
         $this->assertEquals(LeechType::Free, $this->torrentList[4]->flush()->leechType(), 'torman-4-is-free');
-   }
+    }
 }
diff --git a/tests/phpunit/manager/TorrentManagerTest.php b/tests/phpunit/manager/TorrentManagerTest.php
index 53c6f966d..8513f9f4f 100644
--- a/tests/phpunit/manager/TorrentManagerTest.php
+++ b/tests/phpunit/manager/TorrentManagerTest.php
@@ -69,7 +69,7 @@ public function tearDown(): void {
     }
 
     public function testLatestUploads(): void {
-        $manager = new \Gazelle\Manager\Torrent;
+        $manager = new \Gazelle\Manager\Torrent();
         $list = $manager->latestUploads(5);
         $latestTotal = count($list);
         $this->assertGreaterThanOrEqual(2, $latestTotal, 'latest-uploads-two-plus');
@@ -118,7 +118,7 @@ public function testTopTenHistoryList(): void {
         }
         $this->topTenList[] = $histId;
 
-        $manager = new \Gazelle\Manager\Torrent;
+        $manager = new \Gazelle\Manager\Torrent();
         $date = explode(' ', $this->torrentList[0]->created())[0];
         $list = $manager->topTenHistoryList($date, isByDay: true);
         $this->assertCount(1, $list, 'tor-top10-history-by-day');
@@ -183,7 +183,7 @@ public function testReseedGracePeriod(): void {
     }
 
     public function testTorrentLeechReason(): void {
-        $manager = new \Gazelle\Manager\Torrent;
+        $manager = new \Gazelle\Manager\Torrent();
 
         $this->assertEquals(LeechReason::Normal,    $manager->lookupLeechReason('0'), 'torman-leechreason-normal');
         $this->assertEquals(LeechReason::StaffPick, $manager->lookupLeechReason('1'), 'torman-leechreason-staffpick');
@@ -197,7 +197,7 @@ public function testTorrentLeechReason(): void {
     }
 
     public function testTorrentLeechType(): void {
-        $manager = new \Gazelle\Manager\Torrent;
+        $manager = new \Gazelle\Manager\Torrent();
 
         $this->assertEquals(LeechType::Normal,  $manager->lookupLeechType('0'), 'torman-leechtype-normal');
         $this->assertEquals(LeechType::Free,    $manager->lookupLeechType('1'), 'torman-leechtype-free');
@@ -216,7 +216,7 @@ public function testTorrentStats(): void {
          * some other time).
          * We just want to exercise the code and show that it works
          */
-        $stats = new \Gazelle\Stats\Torrent;
+        $stats = new \Gazelle\Stats\Torrent();
         $this->assertInstanceOf(\Gazelle\Stats\Torrent::class, $stats->flush(), 'torrents-stats-flush');
         $this->assertIsInt($stats->torrentTotal(), 'torrent-stats-torrent-total');
         $this->assertIsInt($stats->totalFiles(), 'torrent-stats-file-total');
diff --git a/tests/phpunit/manager/TorrentReportManagerTest.php b/tests/phpunit/manager/TorrentReportManagerTest.php
index 253cf6b17..5a6417049 100644
--- a/tests/phpunit/manager/TorrentReportManagerTest.php
+++ b/tests/phpunit/manager/TorrentReportManagerTest.php
@@ -39,16 +39,16 @@ public function tearDown(): void {
     }
 
     public function testWorkflowReport(): void {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         $torrent = $torMan->findById($this->tgroup->torrentIdList()[0]);
         $this->assertInstanceOf(\Gazelle\Torrent::class, $torrent, 'report-torrent-is-torrent');
         $report = (new \Gazelle\Manager\Torrent\Report($torMan))->create(
             torrent:     $torrent,
             user:        $this->userList[1],
-            reportType:  (new \Gazelle\Manager\Torrent\ReportType)->findByName('other'),
+            reportType:  (new \Gazelle\Manager\Torrent\ReportType())->findByName('other'),
             reason:      'phpunit other report',
             otherIdList: '123 234',
-            irc:         new Gazelle\Util\Irc,
+            irc:         new Gazelle\Util\Irc(),
         );
 
         $this->assertTrue(Helper::recentDate($report->created()), 'torrent-report-created');
@@ -81,25 +81,25 @@ public function testWorkflowReport(): void {
     }
 
     public function testModeratorResolve(): void {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         $torrent = $torMan->findById($this->tgroup->torrentIdList()[0]);
         $this->assertInstanceOf(\Gazelle\Torrent::class, $torrent, 'report-torrent-is-torrent');
         $report = (new \Gazelle\Manager\Torrent\Report($torMan))->create(
             torrent:     $torrent,
             user:        $this->userList[1],
-            reportType:  (new \Gazelle\Manager\Torrent\ReportType)->findByName('other'),
+            reportType:  (new \Gazelle\Manager\Torrent\ReportType())->findByName('other'),
             reason:      'phpunit other report',
             otherIdList: '123 234',
-            irc:         new Gazelle\Util\Irc,
+            irc:         new Gazelle\Util\Irc(),
         );
         $this->assertEquals(1, $report->moderatorResolve($this->userList[0], 'phpunit moderator resolve'), 'torrent-report-moderator-resolve');
         $this->assertEquals('phpunit moderator resolve', $report->comment(), 'torrent-report-final-comment');
     }
 
     public function testUrgentReport(): void {
-        $torMan = new \Gazelle\Manager\Torrent;
+        $torMan = new \Gazelle\Manager\Torrent();
         $torMan->setViewer($this->userList[0]);
-        $type = (new \Gazelle\Manager\Torrent\ReportType)->findByName('urgent');
+        $type = (new \Gazelle\Manager\Torrent\ReportType())->findByName('urgent');
         $this->assertInstanceOf(\Gazelle\Torrent\ReportType::class, $type, 'torrent-report-instance-urgent');
 
         $torrentId = $this->tgroup->torrentIdList()[0];
@@ -110,7 +110,7 @@ public function testUrgentReport(): void {
             reportType:  $type,
             reason:      'phpunit urgent report',
             otherIdList: '',
-            irc:         new Gazelle\Util\Irc,
+            irc:         new Gazelle\Util\Irc(),
         );
         $this->assertEquals([], $torrent->labelList($this->userList[0]), 'uploader-report-label');
 
diff --git a/tests/phpunit/manager/UserManagerTest.php b/tests/phpunit/manager/UserManagerTest.php
index 4359c402e..856ef8916 100644
--- a/tests/phpunit/manager/UserManagerTest.php
+++ b/tests/phpunit/manager/UserManagerTest.php
@@ -27,7 +27,7 @@ public function tearDown(): void {
     }
 
     public function testCycleAuthKeys(): void {
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $this->assertEquals(
             (int)\Gazelle\DB::DB()->scalar("
                 SELECT count(*) FROM users_main
@@ -38,10 +38,10 @@ public function testCycleAuthKeys(): void {
     }
 
     public function testDisableUserList(): void {
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $idList  = array_map(fn($u) => $u->id(), $this->userList);
 
-        $this->assertEquals(3, $userMan->disableUserList(new \Gazelle\Tracker, $idList, 'phpunit mass disable', 3), 'uman-mass-disable');
+        $this->assertEquals(3, $userMan->disableUserList(new \Gazelle\Tracker(), $idList, 'phpunit mass disable', 3), 'uman-mass-disable');
         $this->userList[2]->flush();
         $this->assertTrue($this->userList[2]->isDisabled(), 'uman-disabled-user2');
         $this->assertFalse($this->userList[2]->isEnabled(), 'uman-enabled-user2');
@@ -49,7 +49,7 @@ public function testDisableUserList(): void {
     }
 
     public function testModifyUserAttr(): void {
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $idList  = array_map(fn($u) => $u->id(), $this->userList);
         $this->assertFalse($this->userList[0]->hasAttr('hide-tags'), 'uman-attr-no-attr');
 
@@ -58,7 +58,7 @@ public function testModifyUserAttr(): void {
     }
 
     public function testModifyUserMassToken(): void {
-        $userMan = new Gazelle\Manager\User;
+        $userMan = new Gazelle\Manager\User();
         $idList  = array_map(fn($u) => $u->id(), $this->userList);
         $this->assertEquals(0, $this->userList[0]->tokenCount(), 'uman-masstoken-initial');
 
@@ -98,7 +98,7 @@ public function testModifyUserMassToken(): void {
 
         $this->assertEquals(
             1,
-            $userMan->disableUserList(new \Gazelle\Tracker, [$this->userList[2]->id()], 'phpunit fltoken', \Gazelle\Manager\User::DISABLE_MANUAL),
+            $userMan->disableUserList(new \Gazelle\Tracker(), [$this->userList[2]->id()], 'phpunit fltoken', \Gazelle\Manager\User::DISABLE_MANUAL),
             'uman-masstoken-disable'
         );
         $userMan->clearMassTokens(18, allowLeechDisabled: false, excludeDisabled: true);
@@ -135,7 +135,7 @@ public function testModifyUserMassToken(): void {
     }
 
     public function testUserclassPromotion(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $this->assertEquals(0, $userMan->promote(), 'uman-promote-initial');
         $this->assertEquals(0, $userMan->demote(), 'uman-demote-initial');
 
@@ -170,7 +170,7 @@ public function testUserclassPromotion(): void {
         $this->assertTrue($this->request->vote($user1, 5 * 1024 ** 3), 'uman-user-member-req-vote');
 
         // recompute user request stats
-        $stats = new Gazelle\Stats\Users;
+        $stats = new Gazelle\Stats\Users();
         $stats->refresh();
         $this->assertEquals(1, $userMan->promote(), 'uman-user-member-req-promotion');
 
@@ -190,8 +190,8 @@ public function testUserclassPromotion(): void {
 
     public function testUserRatioWatch(): void {
         $db      = \Gazelle\DB::DB();
-        $tracker = new \Gazelle\Tracker;
-        $userMan = new \Gazelle\Manager\User;
+        $tracker = new \Gazelle\Tracker();
+        $userMan = new \Gazelle\Manager\User();
         $idList  = array_map(fn($u) => $u->id(), $this->userList);
 
         // put users onto ratio watch
@@ -299,7 +299,7 @@ public function testUserRatioWatch(): void {
     }
 
     public function testSendCustomPM(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $this->assertEquals(
             2,
             $userMan->sendCustomPM(
@@ -323,7 +323,7 @@ public function testSendCustomPM(): void {
     }
 
     public function testUserclassFlush(): void {
-        $userMan = new \Gazelle\Manager\User;
+        $userMan = new \Gazelle\Manager\User();
         $administratorId = (int)current(array_filter($userMan->classList(), fn($class) => $class['Name'] == 'Administrator'))['ID'];
         $alphaTeamId = (int)current(array_filter($userMan->classList(), fn($class) => $class['Name'] == 'Alpha Team'))['ID'];
 
@@ -334,7 +334,7 @@ public function testUserclassFlush(): void {
     }
 
     public function testUserflow(): void {
-        $userflow = (new \Gazelle\Manager\User)->userflow();
+        $userflow = (new \Gazelle\Manager\User())->userflow();
         $this->assertIsArray($userflow, 'uman-userflow-is-array');
         $recent = end($userflow);
         $this->assertIsArray($recent, 'uman-userflow-recent-is-array');
diff --git a/tests/phpunit/manager/UserRegistrationTest.php b/tests/phpunit/manager/UserRegistrationTest.php
index 24e1b2a17..495c3e498 100644
--- a/tests/phpunit/manager/UserRegistrationTest.php
+++ b/tests/phpunit/manager/UserRegistrationTest.php
@@ -28,7 +28,7 @@ public function tearDown(): void {
     }
 
     public function testUserRegistrationAfter(): void {
-        $reg = new Gazelle\Manager\Registration;
+        $reg = new Gazelle\Manager\Registration();
         $reg->setAfterDate("2600-01-01 00:00:01");
         $this->assertEquals(2, $reg->total(), 'user-reg-total-after');
 
@@ -39,7 +39,7 @@ public function testUserRegistrationAfter(): void {
     }
 
     public function testUserRegistrationBefore(): void {
-        $reg = new Gazelle\Manager\Registration;
+        $reg = new Gazelle\Manager\Registration();
         $reg->setBeforeDate("1600-12-31");
         $this->assertEquals(3, $reg->total(), 'user-reg-total-before');
 
@@ -51,7 +51,7 @@ public function testUserRegistrationBefore(): void {
     }
 
     public function testUserRegistrationBetween(): void {
-        $reg = new Gazelle\Manager\Registration;
+        $reg = new Gazelle\Manager\Registration();
         $reg->setAfterDate("1600-02-01")->setBeforeDate("1600-03-01");
         $this->assertEquals(1, $reg->total(), 'user-reg-total-between');
 
@@ -61,6 +61,6 @@ public function testUserRegistrationBetween(): void {
     }
 
     public function testUserRegistrationUnconfirmed(): void {
-        $this->assertEquals(3, (new Gazelle\Manager\User)->disableUnconfirmedUsers(), 'user-reg-unconfirmed');
+        $this->assertEquals(3, (new Gazelle\Manager\User())->disableUnconfirmedUsers(), 'user-reg-unconfirmed');
     }
 }
diff --git a/tests/phpunit/manager/UserclassRateLimitTest.php b/tests/phpunit/manager/UserclassRateLimitTest.php
index 0380e2f7b..33b8ff58f 100644
--- a/tests/phpunit/manager/UserclassRateLimitTest.php
+++ b/tests/phpunit/manager/UserclassRateLimitTest.php
@@ -6,7 +6,7 @@
 
 class UserclassRateLimitTest extends TestCase {
     public function testUserclassRateLimit(): void {
-        $limiter = new Gazelle\Manager\UserclassRateLimit;
+        $limiter = new Gazelle\Manager\UserclassRateLimit();
         $list = $limiter->list();
         $this->assertIsArray($list, 'userclass-ratelimit-initial'); // validate the SQL query
 
diff --git a/tests/phpunit/render/RenderTGroupTest.php b/tests/phpunit/render/RenderTGroupTest.php
index 063e8b634..5582ceefc 100644
--- a/tests/phpunit/render/RenderTGroupTest.php
+++ b/tests/phpunit/render/RenderTGroupTest.php
@@ -12,8 +12,8 @@ public function testRequest(): void {
             return;
         }
 
-        $reqMan = new Gazelle\Manager\Request;
-        $tgMan  = new Gazelle\Manager\TGroup;
+        $reqMan = new Gazelle\Manager\Request();
+        $tgMan  = new Gazelle\Manager\TGroup();
         $this->assertIsString(
             Gazelle\Util\Twig::factory()->render('torrent/request.twig', [
                 'list' => $reqMan->findByTGroup($tgMan->findById($tgroupId))
diff --git a/tests/phpunit/render/RenderUserTest.php b/tests/phpunit/render/RenderUserTest.php
index bcb9bbc86..f9bcfd093 100644
--- a/tests/phpunit/render/RenderUserTest.php
+++ b/tests/phpunit/render/RenderUserTest.php
@@ -24,7 +24,7 @@ public function testProfile(): void {
         $limiter = new \Gazelle\User\UserclassRateLimit($this->userList['user']);
 
         $sidebar = Gazelle\Util\Twig::factory()->render('user/sidebar.twig', [
-            'applicant'     => new \Gazelle\Manager\Applicant,
+            'applicant'     => new \Gazelle\Manager\Applicant(),
             'invite_source' => 'invsrc',
             'user'          => $this->userList['user'],
             'viewer'        => $Viewer,
@@ -46,7 +46,7 @@ public function testProfile(): void {
             'friend'       => new Gazelle\User\Friend($Viewer),
             'preview_user' => $this->userList['user'],
             'user'         => $this->userList['user'],
-            'userMan'      => new \Gazelle\Manager\User,
+            'userMan'      => new \Gazelle\Manager\User(),
             'viewer'       => $Viewer,
         ]);
         $this->assertStringContainsString('<div class="header">', $header, 'user-header-div-header');
diff --git a/tests/phpunit/stats/EconomicTest.php b/tests/phpunit/stats/EconomicTest.php
index c9c0236b9..94bb555ce 100644
--- a/tests/phpunit/stats/EconomicTest.php
+++ b/tests/phpunit/stats/EconomicTest.php
@@ -6,7 +6,7 @@
 
 class EconomicTest extends TestCase {
     public function testEconomic(): void {
-        $eco = new \Gazelle\Stats\Economic;
+        $eco = new \Gazelle\Stats\Economic();
 
         $this->assertIsInt($eco->bountyAvailable(), 'eco-stats-bounty-available');
         $this->assertIsInt($eco->bountyTotal(), 'eco-stats-bounty-total');
diff --git a/tests/phpunit/stats/UsersTest.php b/tests/phpunit/stats/UsersTest.php
index bab8dfe30..d272ac6dc 100644
--- a/tests/phpunit/stats/UsersTest.php
+++ b/tests/phpunit/stats/UsersTest.php
@@ -6,7 +6,7 @@
 
 class UsersTest extends TestCase {
     public function testStats(): void {
-        $stats = new \Gazelle\Stats\Users;
+        $stats = new \Gazelle\Stats\Users();
 
         /* not easy to test precise results, but at least the SQL can be exercised */
         $this->assertIsArray($stats->browserDistribution(), 'users-stats-browser');
@@ -26,7 +26,7 @@ public function testStats(): void {
     }
 
     public function testTop(): void {
-        $stats = new \Gazelle\Stats\Users;
+        $stats = new \Gazelle\Stats\Users();
         $this->assertInstanceOf(Gazelle\Stats\Users::class, $stats->flush(), 'users-stats-flush');
         $this->assertInstanceOf(Gazelle\Stats\Users::class, $stats->flushTop(10), 'users-stats-top-flush');
         $this->assertIsArray($stats->topDownloadList(10), 'users-stats-top-download');
@@ -40,24 +40,24 @@ public function testAjaxTop10(): void {
         $bogus = new Gazelle\Json\Top10\User(
             'bogus',
             10,
-            new \Gazelle\Stats\Users,
-            new \Gazelle\Manager\User,
+            new \Gazelle\Stats\Users(),
+            new \Gazelle\Manager\User(),
         );
         $this->assertCount(0, $bogus->payload(), 'user-ajax-top10-bogus');
 
         $all = new Gazelle\Json\Top10\User(
             'all',
             10,
-            new \Gazelle\Stats\Users,
-            new \Gazelle\Manager\User,
+            new \Gazelle\Stats\Users(),
+            new \Gazelle\Manager\User(),
         );
         $this->assertCount(5, $all->payload(), 'user-ajax-top10-all');
 
         $ul = new Gazelle\Json\Top10\User(
             'ul',
             10,
-            new \Gazelle\Stats\Users,
-            new \Gazelle\Manager\User,
+            new \Gazelle\Stats\Users(),
+            new \Gazelle\Manager\User(),
         );
         $this->assertCount(1, $ul->payload(), 'user-ajax-top10-ul');
     }