diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor
similarity index 98%
rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor
rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor
index d1556d41..04b07728 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/OpcUaBrowserDialog.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/NodeBrowserDialog.razor
@@ -1,7 +1,7 @@
 @using ZB.MOM.WW.ScadaBridge.Commons.Interfaces.Protocol
 @using ZB.MOM.WW.ScadaBridge.Commons.Messages.Management
 @using ZB.MOM.WW.ScadaBridge.CentralUI.Services
-@inject IOpcUaBrowseService BrowseService
+@inject IBrowseService BrowseService
 
 @if (_isVisible)
 {
@@ -9,7 +9,7 @@
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                    <h5 class="modal-title">Browse OPC UA — @ConnectionName</h5>
+                    <h5 class="modal-title">Browse — @ConnectionName</h5>
                     <button type="button" class="btn-close" @onclick="Cancel"></button>
                 </div>
                 <div class="modal-body">
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor
index d5a2d43f..2da15c86 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TestBindingsDialog.razor
@@ -143,7 +143,7 @@
 
     /// <summary>
     /// Opens the dialog and triggers an immediate one-shot read. Method-arg
-    /// pattern (mirroring <c>OpcUaBrowserDialog.ShowAsync</c>) — Razor
+    /// pattern (mirroring <c>NodeBrowserDialog.ShowAsync</c>) — Razor
     /// parameter binding would propagate on the next render and race the
     /// LoadAsync below.
     /// </summary>
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor
index 5ae9038b..a2dd3eff 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Dialogs/TreeRow.razor
@@ -46,8 +46,8 @@
 </li>
 
 @code {
-    [Parameter] public OpcUaBrowserDialog.TreeNode Node { get; set; } = default!;
-    [Parameter] public EventCallback<OpcUaBrowserDialog.TreeNode> OnToggle { get; set; }
-    [Parameter] public EventCallback<OpcUaBrowserDialog.TreeNode> OnSelect { get; set; }
+    [Parameter] public NodeBrowserDialog.TreeNode Node { get; set; } = default!;
+    [Parameter] public EventCallback<NodeBrowserDialog.TreeNode> OnToggle { get; set; }
+    [Parameter] public EventCallback<NodeBrowserDialog.TreeNode> OnSelect { get; set; }
     [Parameter] public string? SelectedNodeId { get; set; }
 }
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
index e2f717e7..997e0cc6 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Components/Pages/Deployment/InstanceConfigure.razor
@@ -144,7 +144,7 @@
                                         {
                                             <button class="btn btn-sm btn-outline-primary"
                                                     disabled="@(!canBrowse)"
-                                                    title="@(canBrowse ? "Browse OPC UA address space" : "Pick a connection first")"
+                                                    title="@(canBrowse ? "Browse address space" : "Pick a connection first")"
                                                     @onclick="() => OpenBrowser(attr.Name)">
                                                 Browse…
                                             </button>
@@ -367,7 +367,7 @@
 
         @* OPC UA Tag Browser dialog (Task 18) — rendered once; OpenBrowser
            tracks which binding row's override input receives the picked node id. *@
-        <OpcUaBrowserDialog @ref="_browserRef"
+        <NodeBrowserDialog @ref="_browserRef"
                             SiteId="@_browserSiteIdentifier"
                             ConnectionName="@_browserConnectionName"
                             InitialNodeId="@_browserInitial"
@@ -375,7 +375,7 @@
 
         @* Test Bindings dialog — one-shot live read of every bound attribute.
            Method-arg ShowAsync(siteId, rows) — no Razor parameter propagation
-           race (same pattern as OpcUaBrowserDialog). *@
+           race (same pattern as NodeBrowserDialog). *@
         <TestBindingsDialog @ref="_testBindingsRef" />
     }
 </div>
@@ -407,7 +407,7 @@
 
     // OPC UA tag browser (Task 18) — single dialog rendered at page bottom;
     // _browserAttrInEdit tracks which row gets the picked node id on Select.
-    private OpcUaBrowserDialog? _browserRef;
+    private NodeBrowserDialog? _browserRef;
     private string? _browserAttrInEdit;
     private string _browserSiteIdentifier = "";
     private string _browserConnectionName = "";
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs
index 651e6be2..aa802860 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/ServiceCollectionExtensions.cs
@@ -53,7 +53,7 @@ public static class ServiceCollectionExtensions
         // OPC UA Tag Browser (Task 14): facade over CommunicationService.BrowseNodeAsync
         // that enforces the CentralUI-side Design-role trust boundary and translates
         // transport failures into typed BrowseFailure results for the dialog.
-        services.AddScoped<IOpcUaBrowseService, OpcUaBrowseService>();
+        services.AddScoped<IBrowseService, BrowseService>();
 
         // Test Bindings: facade over CommunicationService.ReadTagValuesAsync —
         // same Design-role guard + typed-failure translation as the browse
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs
index 2c19d8b1..e8e1c7d5 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BindingTester.cs
@@ -10,7 +10,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services;
 /// <see cref="CommunicationService.ReadTagValuesAsync"/> that enforces the
 /// CentralUI-side <c>Design</c>-role trust boundary and translates transport
 /// exceptions into a typed <see cref="ReadTagValuesFailure"/> result. Mirrors
-/// <see cref="OpcUaBrowseService"/>.
+/// <see cref="BrowseService"/>.
 /// </summary>
 public sealed class BindingTester : IBindingTester
 {
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs
similarity index 91%
rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs
rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs
index 8c60126a..b27f4298 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/OpcUaBrowseService.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/BrowseService.cs
@@ -7,7 +7,7 @@ using ZB.MOM.WW.ScadaBridge.Security;
 namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services;
 
 /// <summary>
-/// Default <see cref="IOpcUaBrowseService"/> implementation — a thin facade over
+/// Default <see cref="IBrowseService"/> implementation — a thin facade over
 /// <see cref="CommunicationService.BrowseNodeAsync"/> that enforces the
 /// CentralUI-side <c>Design</c>-role trust boundary and translates transport
 /// exceptions into a typed <see cref="BrowseFailure"/> result.
@@ -19,17 +19,17 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services;
 /// <c>ServerError</c> so the dialog can show an inline banner while leaving the
 /// manual node-id paste field usable.
 /// </remarks>
-public sealed class OpcUaBrowseService : IOpcUaBrowseService
+public sealed class BrowseService : IBrowseService
 {
     private readonly CommunicationService _communication;
     private readonly AuthenticationStateProvider _auth;
 
     /// <summary>
-    /// Initializes a new instance of the <see cref="OpcUaBrowseService"/>.
+    /// Initializes a new instance of the <see cref="BrowseService"/>.
     /// </summary>
     /// <param name="communication">Central-side cluster communication service.</param>
     /// <param name="auth">Authentication state provider used for the Design-role guard.</param>
-    public OpcUaBrowseService(CommunicationService communication, AuthenticationStateProvider auth)
+    public BrowseService(CommunicationService communication, AuthenticationStateProvider auth)
     {
         _communication = communication ?? throw new ArgumentNullException(nameof(communication));
         _auth = auth ?? throw new ArgumentNullException(nameof(auth));
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs
index 91a08dde..028987e8 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBindingTester.cs
@@ -16,7 +16,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services;
 /// envelope. Transport failures (timeouts, unreachable sites) are translated
 /// into a typed <see cref="ReadTagValuesFailure"/> so the dialog can render an
 /// inline banner without crashing — same shape as
-/// <see cref="IOpcUaBrowseService"/>.
+/// <see cref="IBrowseService"/>.
 /// </remarks>
 public interface IBindingTester
 {
diff --git a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs
similarity index 98%
rename from src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs
rename to src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs
index 47730ed3..f70f2025 100644
--- a/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IOpcUaBrowseService.cs
+++ b/src/ZB.MOM.WW.ScadaBridge.CentralUI/Services/IBrowseService.cs
@@ -17,7 +17,7 @@ namespace ZB.MOM.WW.ScadaBridge.CentralUI.Services;
 /// <see cref="BrowseFailure"/> so the dialog can render an inline error and
 /// remain usable (manual node-id paste still works).
 /// </remarks>
-public interface IOpcUaBrowseService
+public interface IBrowseService
 {
     /// <summary>
     /// Enumerates the immediate children of an OPC UA node on the live server
diff --git a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs
index 9e9f5287..a33eb66b 100644
--- a/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs
+++ b/tests/ZB.MOM.WW.ScadaBridge.CentralUI.Tests/Deployment/InstanceConfigureAuditDrillinTests.cs
@@ -44,10 +44,10 @@ public class InstanceConfigureAuditDrillinTests : BunitContext
         Services.AddSingleton(new InstanceService(_templateRepo, Substitute.For<IAuditService>()));
         Services.AddSingleton(Substitute.For<IFlatteningPipeline>());
 
-        // The page renders <OpcUaBrowserDialog/> and <TestBindingsDialog/> at
+        // The page renders <NodeBrowserDialog/> and <TestBindingsDialog/> at
         // the bottom; their @inject directives need a registered service even
         // though this test doesn't open either dialog.
-        Services.AddSingleton(Substitute.For<IOpcUaBrowseService>());
+        Services.AddSingleton(Substitute.For<IBrowseService>());
         Services.AddSingleton(Substitute.For<IBindingTester>());
 
         // Auth: a system-wide Deployment user so SiteScope grants everything.