diff --git a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/BrandBar.razor b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/BrandBar.razor
index bc8cbd1..d1420d9 100644
--- a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/BrandBar.razor
+++ b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/BrandBar.razor
@@ -1,4 +1,5 @@
 @* Components/BrandBar.razor *@
+@namespace ZB.MOM.WW.Theme
 <div class="brand">
     @if (Logo is not null) { @Logo }
     else { <span class="mark">&#9646;</span> }
diff --git a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailItem.razor b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailItem.razor
index 28e87f6..dd5d982 100644
--- a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailItem.razor
+++ b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailItem.razor
@@ -1,4 +1,5 @@
 @* Components/NavRailItem.razor *@
+@namespace ZB.MOM.WW.Theme
 <NavLink class="rail-link" href="@Href" Match="@Match" ActiveClass="active">
     @if (Icon is not null) { <span class="rail-ico">@Icon</span> }
     @Text
diff --git a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailSection.razor b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailSection.razor
index eb5bd5d..b620734 100644
--- a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailSection.razor
+++ b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/NavRailSection.razor
@@ -1,5 +1,6 @@
 @* Components/NavRailSection.razor — CSS-only collapsible (no JS, works in static SSR).
    Apps that want cookie-persisted expand state keep their own interactive NavSection. *@
+@namespace ZB.MOM.WW.Theme
 <details class="rail-section" open="@Expanded">
     <summary class="rail-eyebrow-toggle"><span class="rail-eyebrow-label">@Title</span></summary>
     <div class="rail-section-body">@ChildContent</div>
diff --git a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/StatusPill.razor b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/StatusPill.razor
index 6a6503e..99de38a 100644
--- a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/StatusPill.razor
+++ b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/Components/StatusPill.razor
@@ -1,4 +1,5 @@
 @* Components/StatusPill.razor *@
+@namespace ZB.MOM.WW.Theme
 <span class="chip @ChipClass">@ChildContent</span>
 
 @code {
diff --git a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/_Imports.razor b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/_Imports.razor
index f74d448..b47a016 100644
--- a/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/_Imports.razor
+++ b/ZB.MOM.WW.Theme/src/ZB.MOM.WW.Theme/_Imports.razor
@@ -1,5 +1,5 @@
+@namespace ZB.MOM.WW.Theme
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using ZB.MOM.WW.Theme
-@using ZB.MOM.WW.Theme.Components
diff --git a/ZB.MOM.WW.Theme/tests/ZB.MOM.WW.Theme.Tests/_Imports.cs b/ZB.MOM.WW.Theme/tests/ZB.MOM.WW.Theme.Tests/_Imports.cs
index e196a6c..5fc9bb5 100644
--- a/ZB.MOM.WW.Theme/tests/ZB.MOM.WW.Theme.Tests/_Imports.cs
+++ b/ZB.MOM.WW.Theme/tests/ZB.MOM.WW.Theme.Tests/_Imports.cs
@@ -2,4 +2,3 @@ global using Bunit;
 global using Xunit;
 global using Microsoft.AspNetCore.Components;
 global using ZB.MOM.WW.Theme;
-global using ZB.MOM.WW.Theme.Components;