diff --git a/app/Http/Submission/Handlers/BuildHandler.php b/app/Http/Submission/Handlers/BuildHandler.php
index 0018990925..014fd2eca3 100644
--- a/app/Http/Submission/Handlers/BuildHandler.php
+++ b/app/Http/Submission/Handlers/BuildHandler.php
@@ -23,7 +23,7 @@
 use App\Models\BuildCommand;
 use App\Models\BuildCommandOutput;
 use App\Models\BuildMeasurement;
-use App\Models\Label as EloquentLabel;
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Models\Target;
@@ -40,7 +40,6 @@
 use CDash\Model\BuildError;
 use CDash\Model\BuildFailure;
 use CDash\Model\BuildGroup;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\Subscriber;
 use CDash\Submission\CommitAuthorHandlerInterface;
@@ -78,7 +77,7 @@ class BuildHandler extends AbstractXmlHandler implements ActionableBuildInterfac
      * don't exist until parsing is complete.
      *
      * @var array<string,array{
-     *     labels: array<EloquentLabel>,
+     *     labels: array<Label>,
      *     target: Target
      * }>
      */
@@ -463,14 +462,14 @@ public function endElement($parser, $name): void
                 if (isset($this->Error->Labels)) {
                     $hasLabel = false;
                     foreach ($this->Labels as $lbl) {
-                        if ($lbl->Text === $this->SubProjectName) {
+                        if ($lbl->text === $this->SubProjectName) {
                             $hasLabel = true;
                             break;
                         }
                     }
                     if (!$hasLabel) {
                         $label = $factory->create(Label::class);
-                        $label->Text = $this->SubProjectName;
+                        $label->text = $this->SubProjectName;
                         if (!$this->Error instanceof BuildFailure) {
                             throw new RuntimeException('Field "Error" is not instance of BuildFailure.');
                         }
@@ -645,7 +644,7 @@ public function text($parser, $data): void
                 throw new Exception('Target data not initialized properly.');
             }
 
-            $this->Targets[$this->MostRecentCommand['targetname']]['labels'][] = EloquentLabel::firstOrCreate([
+            $this->Targets[$this->MostRecentCommand['targetname']]['labels'][] = Label::firstOrCreate([
                 'text' => $data,
             ]);
         } elseif ($this->getParent() === 'LABELS' && $element === 'LABEL') {
@@ -657,7 +656,7 @@ public function text($parser, $data): void
                 }
             }
             if (empty($this->ErrorSubProjectName)) {
-                $this->Label->Text = $data;
+                $this->Label->text = $data;
             }
         } elseif (
             $this->currentPathMatches('site.build.commands.*.namedmeasurement.value')
diff --git a/app/Http/Submission/Handlers/ConfigureHandler.php b/app/Http/Submission/Handlers/ConfigureHandler.php
index 9fc5394019..390ffa1011 100644
--- a/app/Http/Submission/Handlers/ConfigureHandler.php
+++ b/app/Http/Submission/Handlers/ConfigureHandler.php
@@ -17,6 +17,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Services\SiteService;
@@ -30,7 +31,6 @@
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
 use CDash\Model\BuildGroup;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\Subscriber;
 
@@ -289,7 +289,7 @@ public function text($parser, $data): void
             $this->SubProjects[$this->SubProjectName][] = $data;
             $build = $this->Builds[$this->SubProjectName];
             $label = $this->getModelFactory()->create(Label::class);
-            $label->Text = $data;
+            $label->text = $data;
             $build->AddLabel($label);
         } elseif ($parent === 'LABELS' && $element === 'LABEL') {
             // First, check if this label belongs to a SubProject
@@ -301,7 +301,7 @@ public function text($parser, $data): void
                 }
             }
             if (empty($subproject_name)) {
-                $this->Label->Text = $data;
+                $this->Label->text = $data;
             }
         }
     }
diff --git a/app/Http/Submission/Handlers/CoverageHandler.php b/app/Http/Submission/Handlers/CoverageHandler.php
index f99c474951..d4d55a5ab2 100644
--- a/app/Http/Submission/Handlers/CoverageHandler.php
+++ b/app/Http/Submission/Handlers/CoverageHandler.php
@@ -17,6 +17,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Services\ProjectService;
@@ -26,7 +27,6 @@
 use CDash\Model\Coverage;
 use CDash\Model\CoverageFile;
 use CDash\Model\CoverageSummary;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\SubProject;
 
@@ -227,7 +227,7 @@ public function text($parser, $data): void
                     break;
             }
         } elseif ($element === 'LABEL') {
-            $this->Label->Text = $data;
+            $this->Label->text = $data;
         }
     }
 }
diff --git a/app/Http/Submission/Handlers/CoverageJUnitHandler.php b/app/Http/Submission/Handlers/CoverageJUnitHandler.php
index 9f108c019e..c351f85e30 100644
--- a/app/Http/Submission/Handlers/CoverageJUnitHandler.php
+++ b/app/Http/Submission/Handlers/CoverageJUnitHandler.php
@@ -17,6 +17,7 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Services\SiteService;
@@ -24,7 +25,6 @@
 use CDash\Model\Coverage;
 use CDash\Model\CoverageFile;
 use CDash\Model\CoverageSummary;
-use CDash\Model\Label;
 use CDash\Model\Project;
 
 class CoverageJUnitHandler extends AbstractXmlHandler
@@ -181,7 +181,7 @@ public function text($parser, $data): void
     {
         $element = $this->getElement();
         if ($element === 'LABEL') {
-            $this->Label->Text = $data;
+            $this->Label->text = $data;
         }
     }
 }
diff --git a/app/Http/Submission/Handlers/DynamicAnalysisHandler.php b/app/Http/Submission/Handlers/DynamicAnalysisHandler.php
index 73325fc3ab..3a40c85944 100644
--- a/app/Http/Submission/Handlers/DynamicAnalysisHandler.php
+++ b/app/Http/Submission/Handlers/DynamicAnalysisHandler.php
@@ -18,6 +18,7 @@
 =========================================================================*/
 
 use App\Models\DynamicAnalysisDefect;
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Services\SiteService;
@@ -32,7 +33,6 @@
 use CDash\Model\BuildGroup;
 use CDash\Model\DynamicAnalysis;
 use CDash\Model\DynamicAnalysisSummary;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\Subscriber;
 
@@ -256,7 +256,7 @@ public function text($parser, $data): void
                 }
             }
             if (empty($this->TestSubProjectName)) {
-                $this->Label->Text = $data;
+                $this->Label->text = $data;
             }
         }
     }
diff --git a/app/Http/Submission/Handlers/GcovTarHandler.php b/app/Http/Submission/Handlers/GcovTarHandler.php
index a0fc4d501e..610a44d6ee 100644
--- a/app/Http/Submission/Handlers/GcovTarHandler.php
+++ b/app/Http/Submission/Handlers/GcovTarHandler.php
@@ -17,13 +17,13 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Utils\SubmissionUtils;
 use CDash\Model\Build;
 use CDash\Model\Coverage;
 use CDash\Model\CoverageFile;
 use CDash\Model\CoverageFileLog;
 use CDash\Model\CoverageSummary;
-use CDash\Model\Label;
 use CDash\Model\SubProject;
 use League\Flysystem\UnableToReadFile;
 use RecursiveDirectoryIterator;
@@ -381,7 +381,7 @@ public function ParseGcovFile($fileinfo): void
         if (array_key_exists($path, $this->Labels)) {
             foreach ($this->Labels[$path] as $labelText) {
                 $label = new Label();
-                $label->Text = $labelText;
+                $label->text = $labelText;
                 $coverage->AddLabel($label);
             }
         }
@@ -483,7 +483,7 @@ public function ParseUncoveredSourceFile($fileinfo, $path)
         if (array_key_exists($path, $this->Labels)) {
             foreach ($this->Labels[$path] as $labelText) {
                 $label = new Label();
-                $label->Text = $labelText;
+                $label->text = $labelText;
                 $coverage->AddLabel($label);
             }
         }
diff --git a/app/Http/Submission/Handlers/ProjectHandler.php b/app/Http/Submission/Handlers/ProjectHandler.php
index 81681c90c3..1ac001725d 100644
--- a/app/Http/Submission/Handlers/ProjectHandler.php
+++ b/app/Http/Submission/Handlers/ProjectHandler.php
@@ -17,8 +17,8 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Services\ProjectService;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\SubProject;
 use Illuminate\Support\Facades\DB;
@@ -167,9 +167,7 @@ public function endElement($parser, $name): void
             $this->SubProjectPosition++;
 
             // Insert the label.
-            $Label = new Label();
-            $Label->Text = $this->SubProject->GetName();
-            $Label->Insert();
+            Label::firstOrCreate(['text' => $this->SubProject->GetName()]);
 
             $this->SubProjects[$this->SubProject->GetId()] = $this->SubProject;
 
diff --git a/app/Http/Submission/Handlers/TestingHandler.php b/app/Http/Submission/Handlers/TestingHandler.php
index 60a66af48b..0a9dc31999 100644
--- a/app/Http/Submission/Handlers/TestingHandler.php
+++ b/app/Http/Submission/Handlers/TestingHandler.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Submission\Handlers;
 
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Models\TestMeasurement;
@@ -20,7 +21,6 @@
 use CDash\Model\Build;
 use CDash\Model\BuildGroup;
 use CDash\Model\Image;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use CDash\Model\Subscriber;
 use CDash\Submission\CommitAuthorHandlerInterface;
@@ -307,7 +307,7 @@ public function text($parser, $data): void
                     break;
                 }
             }
-            $this->Label->Text = $data;
+            $this->Label->text = $data;
             $this->Labels[] = $this->Label;
         }
     }
diff --git a/app/Http/Submission/Handlers/UploadHandler.php b/app/Http/Submission/Handlers/UploadHandler.php
index 52593061a9..ae8fbcb8a1 100644
--- a/app/Http/Submission/Handlers/UploadHandler.php
+++ b/app/Http/Submission/Handlers/UploadHandler.php
@@ -17,12 +17,12 @@
   PURPOSE. See the above copyright notices for more information.
 =========================================================================*/
 
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\SiteInformation;
 use App\Models\UploadFile;
 use App\Services\SiteService;
 use App\Utils\SubmissionUtils;
-use CDash\Model\Label;
 use CDash\Model\Project;
 use Illuminate\Http\File;
 use Illuminate\Support\Carbon;
@@ -276,7 +276,7 @@ public function text($parser, $data): void
         } elseif ($parent === 'UPLOAD' && $element === 'TIME') {
             $this->Timestamp = (int) $data;
         } elseif ($element === 'LABEL') {
-            $this->Label->Text = $data;
+            $this->Label->text = $data;
         }
     }
 
diff --git a/app/Models/Test.php b/app/Models/Test.php
index a89eb00a3c..5d14599de6 100644
--- a/app/Models/Test.php
+++ b/app/Models/Test.php
@@ -4,7 +4,6 @@
 
 use App\Enums\TestTimeStatusCategory;
 use Carbon\Carbon;
-use CDash\Model\Label;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
@@ -109,11 +108,11 @@ public function testMeasurements(): HasMany
     }
 
     /**
-     * @return BelongsToMany<\App\Models\Label, $this>
+     * @return BelongsToMany<Label, $this>
      */
     public function labels(): BelongsToMany
     {
-        return $this->belongsToMany(\App\Models\Label::class, 'label2test', 'testid', 'labelid');
+        return $this->belongsToMany(Label::class, 'label2test', 'testid', 'labelid');
     }
 
     /**
@@ -172,7 +171,7 @@ public function addLabel(Label $label): void
         if (null === $this->labels) {
             $this->labels = collect();
         }
-        $this->labels->put($label->Text, $label);
+        $this->labels->put($label->text, $label);
     }
 
     /**
@@ -185,9 +184,7 @@ public function getLabels(): Collection
         if (null === $this->labels) {
             $this->labels = collect();
             foreach ($this->labels()->get() as $eloquent_label) {
-                $label = new Label();
-                $label->Id = $eloquent_label->id;
-                $this->labels->put($eloquent_label->text, $label);
+                $this->labels->put($eloquent_label->text, $eloquent_label);
             }
         }
         return $this->labels;
diff --git a/app/Utils/TestCreator.php b/app/Utils/TestCreator.php
index 31e32c9915..cc059ae56b 100755
--- a/app/Utils/TestCreator.php
+++ b/app/Utils/TestCreator.php
@@ -17,6 +17,7 @@
 
 namespace App\Utils;
 
+use App\Models\Label;
 use App\Models\Test;
 use App\Models\TestImage;
 use App\Models\TestMeasurement;
@@ -178,9 +179,11 @@ public function create(Build $build): void
             $build->AddTest($buildtest);
 
             foreach ($this->labels as $label) {
-                $label->Test = $buildtest;
-                $label->Insert();
-                $buildtest->addLabel($label);
+                if ($label->text !== null && $label->text !== '') {
+                    $eloquent_label = Label::firstOrCreate(['text' => $label->text]);
+                    $buildtest->labels()->syncWithoutDetaching([$eloquent_label->id]);
+                    $buildtest->addLabel($eloquent_label);
+                }
             }
 
             // test2image
diff --git a/app/cdash/app/Model/Build.php b/app/cdash/app/Model/Build.php
index 908f7aaecb..0210fe8cb8 100644
--- a/app/cdash/app/Model/Build.php
+++ b/app/cdash/app/Model/Build.php
@@ -20,6 +20,7 @@
 use App\Models\BasicBuildAlert;
 use App\Models\Build as EloquentBuild;
 use App\Models\BuildUpdateFile;
+use App\Models\Label;
 use App\Models\Site;
 use App\Models\Test;
 use App\Utils\DatabaseCleanupUtils;
@@ -140,8 +141,9 @@ public function AddError($error): void
 
     public function AddLabel($label): void
     {
-        $label->BuildId = $this->Id;
-        $this->LabelCollection->put($label->Text, $label);
+        if ($label->text !== null) {
+            $this->LabelCollection->put($label->text, $label);
+        }
     }
 
     public function SetStamp(string $stamp): void
@@ -186,7 +188,7 @@ public function SetSubProject($subproject): int|bool
         }
 
         $label = new Label();
-        $label->Text = $subproject;
+        $label->text = $subproject;
         $this->AddLabel($label);
 
         // Add this subproject as a label on the parent build.
@@ -213,9 +215,7 @@ public function SetSubProject($subproject): int|bool
         $subProject->Save();
 
         // Insert the label too.
-        $Label = new Label();
-        $Label->Text = $subProject->GetName();
-        $Label->Insert();
+        Label::firstOrCreate(['text' => $subProject->GetName()]);
 
         Log::debug('New subproject detected: ' . $subproject, [
             'projectid' => $this->ProjectId,
@@ -674,9 +674,16 @@ public function InsertLabelAssociations(): bool
             return true;
         }
 
+        $eloquent_build = EloquentBuild::find($this->Id);
+        if ($eloquent_build === null) {
+            return false;
+        }
+
         foreach ($this->LabelCollection as $label) {
-            $label->BuildId = $this->Id;
-            $label->Insert();
+            if ($label->text !== null && $label->text !== '') {
+                $eloquent_label = Label::firstOrCreate(['text' => $label->text]);
+                $eloquent_build->labels()->syncWithoutDetaching([$eloquent_label->id]);
+            }
         }
         return true;
     }
@@ -1483,7 +1490,7 @@ public function CreateParentBuild(int $numErrors, int $numWarnings): bool
 
         // Give the parent a label for this build's subproject.
         $label = new Label();
-        $label->Text = $this->SubProjectName;
+        $label->text = $this->SubProjectName;
         $parent = new self();
         $parent->Id = $this->ParentId;
         $parent->AddLabel($label);
diff --git a/app/cdash/app/Model/BuildConfigure.php b/app/cdash/app/Model/BuildConfigure.php
index a76f87261d..07fcfc207f 100644
--- a/app/cdash/app/Model/BuildConfigure.php
+++ b/app/cdash/app/Model/BuildConfigure.php
@@ -17,8 +17,10 @@
 
 namespace CDash\Model;
 
+use App\Models\Build as EloquentBuild;
 use App\Models\BuildConfigure as EloquentBuildConfigure;
 use App\Models\Configure as EloquentConfigure;
+use App\Models\Label;
 use CDash\Database;
 use Exception;
 use Illuminate\Support\Collection;
@@ -53,8 +55,9 @@ public function __construct()
 
     public function AddLabel($label): void
     {
-        $label->BuildId = $this->BuildId;
-        $this->LabelCollection->put($label->Text, $label);
+        if ($label->text !== null) {
+            $this->LabelCollection->put($label->text, $label);
+        }
     }
 
     /** Check if the configure exists */
@@ -164,9 +167,16 @@ public function InsertLabelAssociations(): void
                 return;
             }
 
+            $eloquent_build = EloquentBuild::find($this->BuildId);
+            if ($eloquent_build === null) {
+                return;
+            }
+
             foreach ($this->LabelCollection as $label) {
-                $label->BuildId = $this->BuildId;
-                $label->Insert();
+                if ($label->text !== null && $label->text !== '') {
+                    $eloquent_label = Label::firstOrCreate(['text' => $label->text]);
+                    $eloquent_build->labels()->syncWithoutDetaching([$eloquent_label->id]);
+                }
             }
         } else {
             Log::error('No BuildConfigure::BuildId - cannot call $label->Insert...', [
diff --git a/app/cdash/app/Model/BuildFailure.php b/app/cdash/app/Model/BuildFailure.php
index 2ae3ee029d..50675c7e27 100644
--- a/app/cdash/app/Model/BuildFailure.php
+++ b/app/cdash/app/Model/BuildFailure.php
@@ -117,9 +117,9 @@ public function Insert(): bool
 
         // Insert the labels
         foreach ($this->Labels as $label) {
-            if ($label->Text !== null && $label->Text !== '') {
-                $label = Label::firstOrCreate(['text' => $label->Text]);
-                $failure->labels()->syncWithoutDetaching([$label->id]);
+            if ($label->text !== null && $label->text !== '') {
+                $eloquent_label = Label::firstOrCreate(['text' => $label->text]);
+                $failure->labels()->syncWithoutDetaching([$eloquent_label->id]);
             }
         }
         return true;
diff --git a/app/cdash/app/Model/CoverageSummary.php b/app/cdash/app/Model/CoverageSummary.php
index 364c4919ae..f155876a43 100644
--- a/app/cdash/app/Model/CoverageSummary.php
+++ b/app/cdash/app/Model/CoverageSummary.php
@@ -191,8 +191,8 @@ public function Insert($append = false): bool
                 }
 
                 foreach ($coverage->Labels ?? [] as $label) {
-                    if ($label->Text !== null && $label->Text !== '') {
-                        $eloquent_coverage->labels()->syncWithoutDetaching(Label::firstOrCreate(['text' => $label->Text]));
+                    if ($label->text !== null && $label->text !== '') {
+                        $eloquent_coverage->labels()->syncWithoutDetaching([Label::firstOrCreate(['text' => $label->text])->id]);
                     }
                 }
             }
diff --git a/app/cdash/app/Model/DynamicAnalysis.php b/app/cdash/app/Model/DynamicAnalysis.php
index 2fd190a7f9..d205da654f 100644
--- a/app/cdash/app/Model/DynamicAnalysis.php
+++ b/app/cdash/app/Model/DynamicAnalysis.php
@@ -41,7 +41,7 @@ class DynamicAnalysis
     /** @var array<DynamicAnalysisDefect> */
     private array $Defects = [];
     public int $BuildId = -1;
-    /** @var array<\CDash\Model\Label> */
+    /** @var array<Label> */
     public array $Labels = [];
     public string $LogCompression = '';
     public string $LogEncoding = '';
@@ -57,7 +57,7 @@ public function GetDefects(): array
         return $this->Defects;
     }
 
-    public function AddLabel(\CDash\Model\Label $label): void
+    public function AddLabel(Label $label): void
     {
         $this->Labels[] = $label;
     }
@@ -72,9 +72,9 @@ protected function InsertLabelAssociations(): void
         if ($this->Id) {
             $dynamicAnalysis = EloquentDynamicAnalysis::findOrFail((int) $this->Id);
             foreach ($this->Labels as $label) {
-                if ($label->Text !== null && $label->Text !== '') {
+                if ($label->text !== null && $label->text !== '') {
                     $dynamicAnalysis->labels()->attach(
-                        Label::firstOrCreate(['text' => $label->Text])->id
+                        Label::firstOrCreate(['text' => $label->text])->id
                     );
                 }
             }
diff --git a/app/cdash/app/Model/Label.php b/app/cdash/app/Model/Label.php
deleted file mode 100644
index 1aee05a21d..0000000000
--- a/app/cdash/app/Model/Label.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*=========================================================================
-  Program:   CDash - Cross-Platform Dashboard System
-  Module:    $Id$
-  Language:  PHP
-  Date:      $Date$
-  Version:   $Revision$
-
-  Copyright (c) Kitware, Inc. All rights reserved.
-  See LICENSE or http://www.cdash.org/licensing/ for details.
-
-  This software is distributed WITHOUT ANY WARRANTY; without even
-  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-  PURPOSE. See the above copyright notices for more information.
-=========================================================================*/
-
-namespace CDash\Model;
-
-use App\Models\Build;
-use App\Models\Label as EloquentLabel;
-use App\Models\Test;
-
-/** Label */
-class Label
-{
-    public $Id;
-    public string $Text = '';
-
-    public $BuildId;
-    public ?Test $Test = null;
-
-    /**
-     * Save in the database
-     */
-    public function Insert()
-    {
-        if ($this->Text === '') {
-            return false;
-        }
-
-        $this->Id = EloquentLabel::firstOrCreate(['text' => $this->Text])->id;
-
-        // Insert relationship records, too, but only for those relationships
-        // established by callers. (If coming from test.php, for example, TestId
-        // will be set, but none of the others will. Similarly for other callers.)
-
-        if (!empty($this->BuildId)) {
-            Build::findOrFail((int) $this->BuildId)->labels()->syncWithoutDetaching([$this->Id]);
-        }
-
-        $this->Test?->labels()->syncWithoutDetaching([$this->Id]);
-
-        return true;
-    }
-}
diff --git a/app/cdash/app/Model/Subscriber.php b/app/cdash/app/Model/Subscriber.php
index 27fbdcf536..c16629310f 100644
--- a/app/cdash/app/Model/Subscriber.php
+++ b/app/cdash/app/Model/Subscriber.php
@@ -111,7 +111,9 @@ public function getLabels(): Collection
     public function setLabels(array $labels): static
     {
         foreach ($labels as $label) {
-            $this->LabelCollection->put($label->Text, $label);
+            if ($label->text !== null) {
+                $this->LabelCollection->put($label->text, $label);
+            }
         }
         return $this;
     }
diff --git a/app/cdash/include/Messaging/Topic/BuildErrorTopic.php b/app/cdash/include/Messaging/Topic/BuildErrorTopic.php
index 3c0365fa75..26d5f1ed37 100644
--- a/app/cdash/include/Messaging/Topic/BuildErrorTopic.php
+++ b/app/cdash/include/Messaging/Topic/BuildErrorTopic.php
@@ -123,7 +123,9 @@ public function getLabelsFromBuild(Build $build): Collection
                 if (is_a($error, BuildFailure::class)
                 && $this->itemHasTopicSubject($build, $error)) {
                     foreach ($error->Labels as $label) {
-                        $collection->put($label->Text, $label);
+                        if ($label->text !== null) {
+                            $collection->put($label->text, $label);
+                        }
                     }
                 }
             }
diff --git a/app/cdash/include/Messaging/Topic/ConfigureTopic.php b/app/cdash/include/Messaging/Topic/ConfigureTopic.php
index 55ad961fbc..1fcd797c9d 100644
--- a/app/cdash/include/Messaging/Topic/ConfigureTopic.php
+++ b/app/cdash/include/Messaging/Topic/ConfigureTopic.php
@@ -93,12 +93,16 @@ public function getLabelsFromBuild(Build $build): Collection
         $collection = collect();
         $labels = $configure->GetLabelCollection();
         foreach ($labels as $lbl) {
-            $collection->put($lbl->Text, $lbl);
+            if ($lbl->text !== null) {
+                $collection->put($lbl->text, $lbl);
+            }
         }
 
         $labels = $build->GetLabelCollection();
         foreach ($labels as $lbl) {
-            $collection->put($lbl->Text, $lbl);
+            if ($lbl->text !== null) {
+                $collection->put($lbl->text, $lbl);
+            }
         }
         return $collection;
     }
diff --git a/app/cdash/include/Messaging/Topic/LabeledTopic.php b/app/cdash/include/Messaging/Topic/LabeledTopic.php
index b13e951041..15be459ee1 100644
--- a/app/cdash/include/Messaging/Topic/LabeledTopic.php
+++ b/app/cdash/include/Messaging/Topic/LabeledTopic.php
@@ -2,6 +2,7 @@
 
 namespace CDash\Messaging\Topic;
 
+use App\Models\Label;
 use CDash\Model\Build;
 
 class LabeledTopic extends Topic
@@ -24,8 +25,9 @@ public function subscribesToBuild(Build $build): bool
         if ($this->decoratedSubscribes) {
             $subscriberLabels = $this->subscriber->getLabels();
             $topicLabels = $this->topic->getLabelsFromBuild($build);
+            /** @var Label $subscriberLabel */
             foreach ($subscriberLabels as $subscriberLabel) {
-                if ($topicLabels->has($subscriberLabel->Text)) {
+                if ($topicLabels->has($subscriberLabel->text)) {
                     $subscribe = true;
                     break;
                 }
diff --git a/app/cdash/include/Messaging/Topic/TestFailureTopic.php b/app/cdash/include/Messaging/Topic/TestFailureTopic.php
index f09b903377..4464af7c19 100644
--- a/app/cdash/include/Messaging/Topic/TestFailureTopic.php
+++ b/app/cdash/include/Messaging/Topic/TestFailureTopic.php
@@ -17,10 +17,10 @@
 
 namespace CDash\Messaging\Topic;
 
+use App\Models\Label;
 use App\Models\Test;
 use CDash\Messaging\Notification\NotifyOn;
 use CDash\Model\Build;
-use CDash\Model\Label;
 use CDash\Model\Subscriber;
 use Illuminate\Support\Collection;
 
@@ -140,7 +140,7 @@ public function setTopicDataWithLabels(Build $build, Collection $labels): void
             if ($this->itemHasTopicSubject($build, $buildtest)) {
                 $testLabels = $buildtest->getLabels();
                 foreach ($labels as $label) {
-                    if ($testLabels->has($label->Text)) {
+                    if ($testLabels->has($label->text)) {
                         $collection->put($test_name, $buildtest);
                     }
                 }
@@ -157,7 +157,9 @@ public function getLabelsFromBuild(Build $build): Collection
             if ($this->itemHasTopicSubject($build, $buildtest)) {
                 /** @var Label $label */
                 foreach ($buildtest->getLabels() as $label) {
-                    $collection->put($label->Text, $label);
+                    if ($label->text !== null) {
+                        $collection->put($label->text, $label);
+                    }
                 }
             }
         }
diff --git a/app/cdash/tests/case/CDash/Messaging/Topic/ConfigureTopicTest.php b/app/cdash/tests/case/CDash/Messaging/Topic/ConfigureTopicTest.php
index 58cb55d836..aba522000d 100644
--- a/app/cdash/tests/case/CDash/Messaging/Topic/ConfigureTopicTest.php
+++ b/app/cdash/tests/case/CDash/Messaging/Topic/ConfigureTopicTest.php
@@ -15,13 +15,13 @@
  * =========================================================================
  */
 
+use App\Models\Label;
 use CDash\Collection\ConfigureCollection;
 use CDash\Messaging\Preferences\BitmaskNotificationPreferences;
 use CDash\Messaging\Topic\ConfigureTopic;
 use CDash\Messaging\Topic\Topic;
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
-use CDash\Model\Label;
 use CDash\Model\Subscriber;
 use CDash\Test\CDashTestCase;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -151,8 +151,8 @@ public function testGetLabelsFromBuild(): void
         $lbl1 = new Label();
         $lbl2 = new Label();
 
-        $lbl1->Text = 'one';
-        $lbl2->Text = 'two';
+        $lbl1->text = 'one';
+        $lbl2->text = 'two';
 
         $build->AddLabel($lbl2);
         $configure->AddLabel($lbl1);
diff --git a/app/cdash/tests/case/CDash/Messaging/Topic/TestFailureTopicTest.php b/app/cdash/tests/case/CDash/Messaging/Topic/TestFailureTopicTest.php
index 0cc85bf7f0..bbd50942a8 100644
--- a/app/cdash/tests/case/CDash/Messaging/Topic/TestFailureTopicTest.php
+++ b/app/cdash/tests/case/CDash/Messaging/Topic/TestFailureTopicTest.php
@@ -15,13 +15,13 @@
  * =========================================================================
  */
 
+use App\Models\Label;
 use App\Models\Test;
 use CDash\Messaging\Notification\NotifyOn;
 use CDash\Messaging\Preferences\BitmaskNotificationPreferences;
 use CDash\Messaging\Topic\TestFailureTopic;
 use CDash\Messaging\Topic\Topic;
 use CDash\Model\Build;
-use CDash\Model\Label;
 use CDash\Model\Subscriber;
 use CDash\Test\BuildDiffForTesting;
 use CDash\Test\CDashTestCase;
@@ -181,7 +181,7 @@ public function testSetTopicDataWithLabels(): void
 
         // Create a test that has a label we're searching for but has passed, does not get added
         $labelForOne = new Label();
-        $labelForOne->Text = 'One';
+        $labelForOne->text = 'One';
         $buildTestOne = new Test();
         $buildTestOne->status = Test::PASSED;
         $buildTestOne->addLabel($labelForOne);
@@ -189,7 +189,7 @@ public function testSetTopicDataWithLabels(): void
 
         // Create a test that has failed but does not have a label we're searching for
         $labelForTwo = new Label();
-        $labelForTwo->Text = 'Two';
+        $labelForTwo->text = 'Two';
         $buildTestTwo = new Test();
         $buildTestTwo->status = Test::FAILED;
         $buildTestTwo->addLabel($labelForTwo);
@@ -197,7 +197,7 @@ public function testSetTopicDataWithLabels(): void
 
         // Create a test that has failed and has a label that we're searching for
         $labelForThree = new Label();
-        $labelForThree->Text = 'Three';
+        $labelForThree->text = 'Three';
         $buildTestThree = new Test();
         $buildTestThree->status = Test::FAILED;
         $buildTestThree->addLabel($labelForThree);
@@ -209,17 +209,17 @@ public function testSetTopicDataWithLabels(): void
             ->AddTest($buildTestThree);
 
         $lbl1 = new Label();
-        $lbl1->Text = 'One';
+        $lbl1->text = 'One';
         $lbl2 = new Label();
-        $lbl2->Text = 'Nope';
+        $lbl2->text = 'Nope';
         $lbl3 = new Label();
-        $lbl3->Text = 'Three';
+        $lbl3->text = 'Three';
 
         $lblCollection = collect();
         $lblCollection
-            ->put($lbl1->Text, $lbl1)
-            ->put($lbl2->Text, $lbl2)
-            ->put($lbl3->Text, $lbl3);
+            ->put($lbl1->text, $lbl1)
+            ->put($lbl2->text, $lbl2)
+            ->put($lbl3->text, $lbl3);
 
         $sut->setTopicDataWithLabels($build, $lblCollection);
 
@@ -234,7 +234,7 @@ public function testGetLabelsFromBuild(): void
 
         // Create a test that has a label we're searching for but has passed, does not get added
         $labelForOne = new Label();
-        $labelForOne->Text = 'One';
+        $labelForOne->text = 'One';
         $buildTestOne = new Test();
         $buildTestOne->status = Test::PASSED;
         $buildTestOne->addLabel($labelForOne);
@@ -242,7 +242,7 @@ public function testGetLabelsFromBuild(): void
 
         // Create a test that has failed but does not have a label we're searching for
         $labelForTwo = new Label();
-        $labelForTwo->Text = 'Two';
+        $labelForTwo->text = 'Two';
         $buildTestTwo = new Test();
         $buildTestTwo->status = Test::FAILED;
         $buildTestTwo->addLabel($labelForTwo);
@@ -250,7 +250,7 @@ public function testGetLabelsFromBuild(): void
 
         // Create a test that is not run and has a label that we're searching for
         $labelForThree = new Label();
-        $labelForThree->Text = 'Three';
+        $labelForThree->text = 'Three';
         $buildTestThree = new Test();
         $buildTestThree->status = Test::NOTRUN;
         $buildTestThree->addLabel($labelForThree);
diff --git a/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php b/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
index 2a08f2f0a2..b3482414ad 100644
--- a/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
+++ b/app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
@@ -17,6 +17,7 @@
 
 use App\Http\Submission\Handlers\ActionableBuildInterface;
 use App\Models\BuildGroup;
+use App\Models\Label;
 use CDash\Collection\SubscriberCollection;
 use CDash\Database;
 use CDash\Messaging\Notification\Email\EmailBuilder;
@@ -25,7 +26,6 @@
 use CDash\Messaging\Preferences\BitmaskNotificationPreferences;
 use CDash\Messaging\Subscription\SubscriptionCollection;
 use CDash\Messaging\Subscription\UserSubscriptionBuilder;
-use CDash\Model\Label;
 use CDash\Model\Subscriber;
 use CDash\Test\CDashUseCaseTestCase;
 use CDash\Test\UseCase\UseCase;
@@ -153,7 +153,7 @@ private function getNotifications(array $subscribers): NotificationCollection
             if (isset($entry[2])) {
                 $labels = array_map(function ($text) {
                     $label = new Label();
-                    $label->Text = $text;
+                    $label->text = $text;
                     return $label;
                 }, $entry[2]);
             }
diff --git a/app/cdash/tests/test_buildconfigure.php b/app/cdash/tests/test_buildconfigure.php
index 140d8149ea..1b4f009c66 100644
--- a/app/cdash/tests/test_buildconfigure.php
+++ b/app/cdash/tests/test_buildconfigure.php
@@ -6,11 +6,11 @@
 //
 require_once __DIR__ . '/cdash_test_case.php';
 
+use App\Models\Label;
 use App\Utils\DatabaseCleanupUtils;
 use CDash\Database;
 use CDash\Model\Build;
 use CDash\Model\BuildConfigure;
-use CDash\Model\Label;
 
 class BuildConfigureTestCase extends KWWebTestCase
 {
diff --git a/app/cdash/tests/test_removebuilds.php b/app/cdash/tests/test_removebuilds.php
index d7f48d0eed..f92da8fbc3 100644
--- a/app/cdash/tests/test_removebuilds.php
+++ b/app/cdash/tests/test_removebuilds.php
@@ -8,6 +8,7 @@
 
 use App\Models\BuildUpdateFile;
 use App\Models\DynamicAnalysisDefect;
+use App\Models\Label;
 use App\Models\TestMeasurement;
 use App\Models\UploadFile;
 use App\Utils\DatabaseCleanupUtils;
@@ -26,7 +27,6 @@
 use CDash\Model\DynamicAnalysis;
 use CDash\Model\DynamicAnalysisSummary;
 use CDash\Model\Image;
-use CDash\Model\Label;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\DB;
 
@@ -47,7 +47,7 @@ public function testBuildRemovalWorksAsExpected(): void
 
         // Label
         $label = new Label();
-        $label->Text = 'remove me';
+        $label->text = 'remove me';
 
         // Build
         $build = new Build();
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 1a390d5c7b..1b109c351d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -2304,7 +2304,7 @@ parameters:
 		-
 			rawMessage: 'Method App\Http\Submission\Handlers\BuildHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
 			identifier: missingType.checkedException
-			count: 3
+			count: 2
 			path: app/Http/Submission/Handlers/BuildHandler.php
 
 		-
@@ -2487,12 +2487,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/ConfigureHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\ConfigureHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 2
-			path: app/Http/Submission/Handlers/ConfigureHandler.php
-
 		-
 			rawMessage: 'Only booleans are allowed in an if condition, int|false given.'
 			identifier: if.condNotBoolean
@@ -2634,12 +2628,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/CoverageHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\CoverageHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/CoverageHandler.php
-
 		-
 			rawMessage: Property App\Http\Submission\Handlers\CoverageHandler::$CoverageSummaries type has no value type specified in iterable type array.
 			identifier: missingType.iterableValue
@@ -2742,12 +2730,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/CoverageJUnitHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\CoverageJUnitHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/CoverageJUnitHandler.php
-
 		-
 			rawMessage: Access to an undefined property object::$Id.
 			identifier: property.notFound
@@ -3078,7 +3060,7 @@ parameters:
 		-
 			rawMessage: 'Method App\Http\Submission\Handlers\DynamicAnalysisHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
 			identifier: missingType.checkedException
-			count: 2
+			count: 1
 			path: app/Http/Submission/Handlers/DynamicAnalysisHandler.php
 
 		-
@@ -3171,12 +3153,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/GcovTarHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\GcovTarHandler::ParseGcovFile() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/GcovTarHandler.php
-
 		-
 			rawMessage: 'Method App\Http\Submission\Handlers\GcovTarHandler::ParseLabelsFile() has parameter $fileinfo with no type specified.'
 			identifier: missingType.parameter
@@ -3201,12 +3177,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/GcovTarHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\GcovTarHandler::ParseUncoveredSourceFile() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/GcovTarHandler.php
-
 		-
 			rawMessage: 'Parameter #1 $haystack of function str_contains expects string, array|string|false given.'
 			identifier: argument.type
@@ -4164,12 +4134,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/TestingHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\TestingHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/TestingHandler.php
-
 		-
 			rawMessage: 'Only booleans are allowed in &&, string given on the right side.'
 			identifier: booleanAnd.rightNotBoolean
@@ -4548,12 +4512,6 @@ parameters:
 			count: 1
 			path: app/Http/Submission/Handlers/UploadHandler.php
 
-		-
-			rawMessage: 'Method App\Http\Submission\Handlers\UploadHandler::text() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/Http/Submission/Handlers/UploadHandler.php
-
 		-
 			rawMessage: 'Offset ''extension'' might not exist on array{dirname?: string, basename: string, extension?: string, filename: string}.'
 			identifier: offsetAccess.notFound
@@ -7425,6 +7383,12 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/ActionableTypes.php
 
+		-
+			rawMessage: 'Call to an undefined method App\Models\Build|Illuminate\Database\Eloquent\Collection<int, App\Models\Build>::labels().'
+			identifier: method.notFound
+			count: 1
+			path: app/cdash/app/Model/Build.php
+
 		-
 			rawMessage: '''
 				Call to deprecated function pdo_execute():
@@ -7569,12 +7533,6 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/Build.php
 
-		-
-			rawMessage: 'Method CDash\Model\Build::CreateParentBuild() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/cdash/app/Model/Build.php
-
 		-
 			rawMessage: 'Method CDash\Model\Build::FillFromId() has parameter $buildid with no type specified.'
 			identifier: missingType.parameter
@@ -7779,12 +7737,6 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/Build.php
 
-		-
-			rawMessage: 'Method CDash\Model\Build::SetSubProject() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/cdash/app/Model/Build.php
-
 		-
 			rawMessage: 'Method CDash\Model\Build::UpdateBuild() has parameter $buildid with no type specified.'
 			identifier: missingType.parameter
@@ -7965,6 +7917,12 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/Build.php
 
+		-
+			rawMessage: 'Call to an undefined method App\Models\Build|Illuminate\Database\Eloquent\Collection<int, App\Models\Build>::labels().'
+			identifier: method.notFound
+			count: 1
+			path: app/cdash/app/Model/BuildConfigure.php
+
 		-
 			rawMessage: '''
 				Call to deprecated function pdo_execute():
@@ -7984,15 +7942,9 @@ parameters:
 			path: app/cdash/app/Model/BuildConfigure.php
 
 		-
-			rawMessage: Cannot access property $BuildId on mixed.
+			rawMessage: Cannot access property $text on mixed.
 			identifier: property.nonObject
-			count: 1
-			path: app/cdash/app/Model/BuildConfigure.php
-
-		-
-			rawMessage: 'Cannot call method Insert() on mixed.'
-			identifier: method.nonObject
-			count: 1
+			count: 3
 			path: app/cdash/app/Model/BuildConfigure.php
 
 		-
@@ -9126,30 +9078,6 @@ parameters:
 			count: 1
 			path: app/cdash/app/Model/Image.php
 
-		-
-			rawMessage: 'Construct empty() is not allowed. Use more strict comparison.'
-			identifier: empty.notAllowed
-			count: 1
-			path: app/cdash/app/Model/Label.php
-
-		-
-			rawMessage: 'Method CDash\Model\Label::Insert() has no return type specified.'
-			identifier: missingType.return
-			count: 1
-			path: app/cdash/app/Model/Label.php
-
-		-
-			rawMessage: Property CDash\Model\Label::$BuildId has no type specified.
-			identifier: missingType.property
-			count: 1
-			path: app/cdash/app/Model/Label.php
-
-		-
-			rawMessage: Property CDash\Model\Label::$Id has no type specified.
-			identifier: missingType.property
-			count: 1
-			path: app/cdash/app/Model/Label.php
-
 		-
 			rawMessage: 'Access to an undefined property App\Models\Project|Illuminate\Database\Eloquent\Collection<int, App\Models\Project>::$id.'
 			identifier: property.notFound
@@ -10294,9 +10222,9 @@ parameters:
 			path: app/cdash/include/Messaging/Topic/BuildErrorTopic.php
 
 		-
-			rawMessage: Cannot access property $Text on mixed.
+			rawMessage: Cannot access property $text on mixed.
 			identifier: property.nonObject
-			count: 2
+			count: 4
 			path: app/cdash/include/Messaging/Topic/ConfigureTopic.php
 
 		-
@@ -10461,12 +10389,6 @@ parameters:
 			count: 1
 			path: app/cdash/include/Messaging/Topic/LabeledTopic.php
 
-		-
-			rawMessage: Cannot access property $Text on mixed.
-			identifier: property.nonObject
-			count: 1
-			path: app/cdash/include/Messaging/Topic/LabeledTopic.php
-
 		-
 			rawMessage: Property CDash\Messaging\Topic\LabeledTopic::$decoratedSubscribes has no type specified.
 			identifier: missingType.property
@@ -10525,7 +10447,7 @@ parameters:
 			path: app/cdash/include/Messaging/Topic/TestFailureTopic.php
 
 		-
-			rawMessage: Cannot access property $Text on mixed.
+			rawMessage: Cannot access property $text on mixed.
 			identifier: property.nonObject
 			count: 1
 			path: app/cdash/include/Messaging/Topic/TestFailureTopic.php
@@ -14130,12 +14052,6 @@ parameters:
 			count: 1
 			path: app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
 
-		-
-			rawMessage: 'Method MultipleSubprojectsEmailTest::getNotifications() throws checked exception TypeError but it''s missing from the PHPDoc @throws tag.'
-			identifier: missingType.checkedException
-			count: 1
-			path: app/cdash/tests/case/CDash/MultipleSubprojectsEmailTest.php
-
 		-
 			rawMessage: 'Parameter #1 $submission of class CDash\Messaging\Subscription\UserSubscriptionBuilder constructor expects App\Http\Submission\Handlers\ActionableBuildInterface, App\Http\Submission\Handlers\AbstractXmlHandler given.'
 			identifier: argument.type