diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml
index 3d485094f..673f550d3 100644
--- a/.github/workflows/general.yml
+++ b/.github/workflows/general.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 24
 
       - name: Setup Pana source analysis
         run: tool/gh_actions/install_pana.sh
diff --git a/devtools_options.yaml b/devtools_options.yaml
new file mode 100644
index 000000000..0a727a9da
--- /dev/null
+++ b/devtools_options.yaml
@@ -0,0 +1,4 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
+  - rohd: true
diff --git a/doc/tutorials/chapter_6/answers/exercise_2_n_bit_subtractor.dart b/doc/tutorials/chapter_6/answers/exercise_2_n_bit_subtractor.dart
index 5765f08bf..18efb5a2d 100644
--- a/doc/tutorials/chapter_6/answers/exercise_2_n_bit_subtractor.dart
+++ b/doc/tutorials/chapter_6/answers/exercise_2_n_bit_subtractor.dart
@@ -7,7 +7,6 @@ import '../../chapter_3/answers/helper.dart';
 import '../../chapter_5/answers/full_subtractor.dart';
 
 class FullSubtractorComb extends FullSubtractor {
-  @override
   FullSubtractorComb(super.a, super.b, super.borrowIn) {
     // Declare input and output
     final a = input('a');
diff --git a/extension/devtools/config.yaml b/extension/devtools/config.yaml
index 45c598205..88e472bb9 100644
--- a/extension/devtools/config.yaml
+++ b/extension/devtools/config.yaml
@@ -2,4 +2,4 @@ name: rohd
 issueTracker: https://github.com/intel/rohd/issues
 version: 0.0.1
 materialIconCodePoint: '0xe1c5'
-requiresConnection: true  # optional field - defaults to true
\ No newline at end of file
+requiresConnection: false
diff --git a/lib/rohd.dart b/lib/rohd.dart
index 841505590..d0ea2a266 100644
--- a/lib/rohd.dart
+++ b/lib/rohd.dart
@@ -1,6 +1,7 @@
 // Copyright (C) 2021-2023 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 
+export 'src/diagnostics/module_services.dart';
 export 'src/exceptions/exceptions.dart';
 export 'src/external.dart';
 export 'src/finite_state_machine.dart';
diff --git a/lib/src/diagnostics/module_services.dart b/lib/src/diagnostics/module_services.dart
new file mode 100644
index 000000000..a0e583b59
--- /dev/null
+++ b/lib/src/diagnostics/module_services.dart
@@ -0,0 +1,78 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// module_services.dart
+// Singleton service registry for DevTools integration.
+//
+// 2026 April 25
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:convert';
+
+import 'package:rohd/rohd.dart';
+import 'package:rohd/src/diagnostics/inspector_service.dart';
+
+/// Singleton service registry that provides a unified query surface for
+/// DevTools and other inspection tools.
+///
+/// Services register themselves here on construction; DevTools evaluates
+/// getters on [instance] via `EvalOnDartLibrary` to pull data.
+///
+/// **Auto-registered:**
+///  - [rootModule] / [hierarchyJSON] — set by [Module.build].
+///
+/// **Opt-in (registered by service constructors):**
+///  - [svService] — SystemVerilog synthesis results.
+///
+/// Additional services (netlist, trace, waveform) can be added by setting
+/// the corresponding field after construction.
+class ModuleServices {
+  ModuleServices._();
+
+  /// The singleton instance.
+  static final ModuleServices instance = ModuleServices._();
+
+  // ─── Hierarchy (auto-registered by Module.build) ──────────────
+
+  /// The most recently built top-level [Module].
+  ///
+  /// Set automatically at the end of [Module.build].
+  Module? rootModule;
+
+  /// Returns the module hierarchy as a JSON string.
+  ///
+  /// DevTools evaluates this via `EvalOnDartLibrary` to display
+  /// the module hierarchy.
+  String get hierarchyJSON {
+    ModuleTree.rootModuleInstance = rootModule;
+    return ModuleTree.instance.hierarchyJSON;
+  }
+
+  /// Returns the primary inspector JSON for DevTools.
+  ///
+  /// Returns the hierarchy JSON.  Downstream branches (e.g. netlist) may
+  /// override this to return richer data when available.
+  String get inspectorJSON => hierarchyJSON;
+
+  // ─── SystemVerilog service (opt-in) ───────────────────────────
+
+  /// The active [SvService], if one has been registered.
+  SvService? svService;
+
+  /// Returns SV synthesis metadata as JSON, or an unavailable status.
+  String get svJSON =>
+      svService != null ? jsonEncode(svService!.toJson()) : _unavailable('sv');
+
+  // ─── Helpers ──────────────────────────────────────────────────
+
+  static String _unavailable(String service) => jsonEncode(<String, String>{
+        'status': 'unavailable',
+        'reason': '$service service not registered',
+      });
+
+  /// Resets all services.  Intended for test teardown.
+  void reset() {
+    rootModule = null;
+    svService = null;
+  }
+}
diff --git a/lib/src/module.dart b/lib/src/module.dart
index 92fc410e0..9f6ec634e 100644
--- a/lib/src/module.dart
+++ b/lib/src/module.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2025 Intel Corporation
+// Copyright (C) 2021-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // module.dart
@@ -11,11 +11,10 @@ import 'dart:async';
 import 'dart:collection';
 
 import 'package:meta/meta.dart';
-
 import 'package:rohd/rohd.dart';
 import 'package:rohd/src/collections/traverseable_collection.dart';
-import 'package:rohd/src/diagnostics/inspector_service.dart';
 import 'package:rohd/src/utilities/config.dart';
+import 'package:rohd/src/utilities/namer.dart';
 import 'package:rohd/src/utilities/sanitizer.dart';
 import 'package:rohd/src/utilities/timestamper.dart';
 import 'package:rohd/src/utilities/uniquifier.dart';
@@ -52,6 +51,22 @@ abstract class Module {
   /// An internal mapping of input names to their sources to this [Module].
   late final Map<String, Logic> _inputSources = {};
 
+  // ─── Central naming (Namer) ─────────────────────────────────────
+
+  /// Central namer that owns both the signal and instance namespaces.
+  /// Initialized lazily on first access (after build).
+  @internal
+  late final Namer namer = _createNamer();
+
+  Namer _createNamer() {
+    assert(hasBuilt, 'Module must be built before canonical names are bound.');
+    return Namer.forModule(
+      inputs: _inputs,
+      outputs: _outputs,
+      inOuts: _inOuts,
+    );
+  }
+
   /// An internal mapping of inOut names to their sources to this [Module].
   late final Map<String, Logic> _inOutSources = {};
 
@@ -317,7 +332,7 @@ abstract class Module {
 
     _hasBuilt = true;
 
-    ModuleTree.rootModuleInstance = this;
+    ModuleServices.instance.rootModule = this;
   }
 
   /// Confirms that the post-[build] hierarchy is valid.
diff --git a/lib/src/synthesizers/synth_builder.dart b/lib/src/synthesizers/synth_builder.dart
index 54e312ab3..f9d0a0d08 100644
--- a/lib/src/synthesizers/synth_builder.dart
+++ b/lib/src/synthesizers/synth_builder.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2025 Intel Corporation
+// Copyright (C) 2021-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // synth_builder.dart
diff --git a/lib/src/synthesizers/synthesizer.dart b/lib/src/synthesizers/synthesizer.dart
index b70c9338e..687bbab03 100644
--- a/lib/src/synthesizers/synthesizer.dart
+++ b/lib/src/synthesizers/synthesizer.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2023 Intel Corporation
+// Copyright (C) 2021-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // synthesizer.dart
@@ -6,7 +6,6 @@
 //
 // 2021 August 26
 // Author: Max Korbel <max.korbel@intel.com>
-//
 
 import 'package:rohd/rohd.dart';
 
diff --git a/lib/src/synthesizers/systemverilog/sv_service.dart b/lib/src/synthesizers/systemverilog/sv_service.dart
new file mode 100644
index 000000000..e1adf43cd
--- /dev/null
+++ b/lib/src/synthesizers/systemverilog/sv_service.dart
@@ -0,0 +1,114 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// sv_service.dart
+// Service wrapper for SystemVerilog synthesis.
+//
+// 2026 April 25
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:io';
+
+import 'package:collection/collection.dart';
+import 'package:rohd/rohd.dart';
+
+/// A service that wraps SystemVerilog synthesis of a [Module] hierarchy.
+///
+/// Provides access to the generated SV file contents and per-module
+/// synthesis results, and optionally registers with [ModuleServices]
+/// for DevTools inspection.
+///
+/// Example:
+/// ```dart
+/// final dut = MyModule(...);
+/// await dut.build();
+/// final sv = SvService(dut);
+///
+/// // Write individual .sv files:
+/// sv.writeFiles('build/');
+///
+/// // Or get the concatenated output (like generateSynth):
+/// print(sv.allContents);
+/// ```
+class SvService {
+  /// The top-level [Module] being synthesized.
+  final Module module;
+
+  /// The underlying [SynthBuilder] that drove synthesis.
+  late final SynthBuilder synthBuilder;
+
+  /// The generated file contents (one per unique module definition).
+  late final List<SynthFileContents> fileContents;
+
+  /// Creates an [SvService] for [module].
+  ///
+  /// [module] must already be built.  Set [register] to `true` (the
+  /// default) to register this service with [ModuleServices] for
+  /// DevTools access.
+  SvService(this.module, {bool register = true}) {
+    if (!module.hasBuilt) {
+      throw Exception('Module must be built before creating SvService. '
+          'Call build() first.');
+    }
+
+    synthBuilder = SynthBuilder(module, SystemVerilogSynthesizer());
+    fileContents = synthBuilder.getSynthFileContents();
+
+    if (register) {
+      ModuleServices.instance.svService = this;
+    }
+  }
+
+  /// All [SynthesisResult]s produced by synthesis.
+  Set<SynthesisResult> get synthesisResults => synthBuilder.synthesisResults;
+
+  /// Returns the concatenated SystemVerilog output as a single string,
+  /// matching the format of [Module.generateSynth].
+  String get allContents => fileContents.map((fc) => fc.contents).join('\n\n');
+
+  /// Returns a map from module definition name to its SV file contents.
+  ///
+  /// Keys are [SynthesisResult.instanceTypeName] (the uniquified definition
+  /// name used in the generated SV).
+  Map<String, String> get contentsByName => {
+        for (final fc in fileContents) fc.name: fc.contents,
+      };
+
+  /// Returns a map from module definition name
+  /// ([Module.definitionName]) to its SV file contents.
+  ///
+  /// This uses the original definition name (not uniquified), matching
+  /// the keys used by FLC trace data.
+  Map<String, String> get contentsByDefinitionName {
+    final result = <String, String>{};
+    for (final sr in synthesisResults) {
+      final defName = sr.module.definitionName;
+      final instanceName = sr.instanceTypeName;
+      // Find the file content matching this instance type name.
+      final fc = fileContents.firstWhereOrNull((f) => f.name == instanceName);
+      if (fc != null) {
+        result[defName] = fc.contents;
+      }
+    }
+    return result;
+  }
+
+  /// Writes each module's SV to a separate file in [directory].
+  ///
+  /// Files are named `<definitionName>.sv`.
+  void writeFiles(String directory) {
+    final dir = Directory(directory)..createSync(recursive: true);
+    for (final fc in fileContents) {
+      File('${dir.path}/${fc.name}.sv').writeAsStringSync(fc.contents);
+    }
+  }
+
+  /// Returns a JSON-serialisable summary of the SV synthesis.
+  ///
+  /// Contains the list of generated module definition names.
+  Map<String, Object> toJson() => <String, Object>{
+        'modules': [
+          for (final fc in fileContents) fc.name,
+        ],
+      };
+}
diff --git a/lib/src/synthesizers/systemverilog/systemverilog.dart b/lib/src/synthesizers/systemverilog/systemverilog.dart
index 281b05df9..e5f772e44 100644
--- a/lib/src/synthesizers/systemverilog/systemverilog.dart
+++ b/lib/src/synthesizers/systemverilog/systemverilog.dart
@@ -1,5 +1,6 @@
 // Copyright (C) 2021-2024 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 
+export 'sv_service.dart';
 export 'systemverilog_mixins.dart';
 export 'systemverilog_synthesizer.dart';
diff --git a/lib/src/synthesizers/systemverilog/systemverilog_synthesizer.dart b/lib/src/synthesizers/systemverilog/systemverilog_synthesizer.dart
index d8b5bae36..062647ac3 100644
--- a/lib/src/synthesizers/systemverilog/systemverilog_synthesizer.dart
+++ b/lib/src/synthesizers/systemverilog/systemverilog_synthesizer.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2025 Intel Corporation
+// Copyright (C) 2021-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // systemverilog_synthesizer.dart
diff --git a/lib/src/synthesizers/utilities/synth_logic.dart b/lib/src/synthesizers/utilities/synth_logic.dart
index c3026a0d5..8fcbc014a 100644
--- a/lib/src/synthesizers/utilities/synth_logic.dart
+++ b/lib/src/synthesizers/utilities/synth_logic.dart
@@ -11,8 +11,8 @@ import 'package:collection/collection.dart';
 import 'package:meta/meta.dart';
 import 'package:rohd/rohd.dart';
 import 'package:rohd/src/synthesizers/utilities/utilities.dart';
+import 'package:rohd/src/utilities/namer.dart';
 import 'package:rohd/src/utilities/sanitizer.dart';
-import 'package:rohd/src/utilities/uniquifier.dart';
 
 /// Represents a logic signal in the generated code within a module.
 @internal
@@ -212,92 +212,25 @@ class SynthLogic {
   /// The name of this, if it has been picked.
   String? _name;
 
-  /// Picks a [name].
+  /// Picks a [name] using the module's signal namer.
   ///
   /// Must be called exactly once.
-  void pickName(Uniquifier uniquifier) {
+  void pickName() {
     assert(_name == null, 'Should only pick a name once.');
 
-    _name = _findName(uniquifier);
+    _name = _findName();
   }
 
   /// Finds the best name from the collection of [Logic]s.
-  String _findName(Uniquifier uniquifier) {
-    // check for const
-    if (_constLogic != null) {
-      if (!_constNameDisallowed) {
-        return _constLogic!.value.toString();
-      } else {
-        assert(
-          logics.length > 1,
-          'If there is a constant, but the const name is not allowed, '
-          'there needs to be another option',
-        );
-      }
-    }
-
-    // check for reserved
-    if (_reservedLogic != null) {
-      return uniquifier.getUniqueName(
-        initialName: _reservedLogic!.name,
-        reserved: true,
-      );
-    }
-
-    // check for renameable
-    if (_renameableLogic != null) {
-      return uniquifier.getUniqueName(
-        initialName: _renameableLogic!.preferredSynthName,
-      );
-    }
-
-    // pick a preferred, available, mergeable name, if one exists
-    final unpreferredMergeableLogics = <Logic>[];
-    final uniquifiableMergeableLogics = <Logic>[];
-    for (final mergeableLogic in _mergeableLogics) {
-      if (Naming.isUnpreferred(mergeableLogic.preferredSynthName)) {
-        unpreferredMergeableLogics.add(mergeableLogic);
-      } else if (!uniquifier.isAvailable(mergeableLogic.preferredSynthName)) {
-        uniquifiableMergeableLogics.add(mergeableLogic);
-      } else {
-        return uniquifier.getUniqueName(
-          initialName: mergeableLogic.preferredSynthName,
-        );
-      }
-    }
-
-    // uniquify a preferred, mergeable name, if one exists
-    if (uniquifiableMergeableLogics.isNotEmpty) {
-      return uniquifier.getUniqueName(
-        initialName: uniquifiableMergeableLogics.first.preferredSynthName,
-      );
-    }
-
-    // pick an available unpreferred mergeable name, if one exists, otherwise
-    // uniquify an unpreferred mergeable name
-    if (unpreferredMergeableLogics.isNotEmpty) {
-      return uniquifier.getUniqueName(
-        initialName: unpreferredMergeableLogics
-                .firstWhereOrNull(
-                  (element) =>
-                      uniquifier.isAvailable(element.preferredSynthName),
-                )
-                ?.preferredSynthName ??
-            unpreferredMergeableLogics.first.preferredSynthName,
+  ///
+  /// Delegates to signal namer which handles constant value naming, priority
+  /// selection, and uniquification via the module's shared namespace.
+  String _findName() =>
+      parentSynthModuleDefinition.module.namer.signalNameOfBest(
+        logics,
+        constValue: _constLogic,
+        constNameDisallowed: _constNameDisallowed,
       );
-    }
-
-    // pick anything (unnamed) and uniquify as necessary (considering preferred)
-    // no need to prefer an available one here, since it's all unnamed
-    return uniquifier.getUniqueName(
-      initialName: _unnamedLogics
-              .firstWhereOrNull(
-                (element) => !Naming.isUnpreferred(element.preferredSynthName),
-              )
-              ?.preferredSynthName ??
-          _unnamedLogics.first.preferredSynthName,
-    );
-  }
 
   /// Creates an instance to represent [initialLogic] and any that merge
   /// into it.
@@ -404,7 +337,7 @@ class SynthLogic {
 
   @override
   String toString() => '${_name == null ? 'null' : '"$name"'}, '
-      'logics contained: ${logics.map((e) => e.preferredSynthName).toList()}';
+      'logics contained: ${logics.map(Namer.baseName).toList()}';
 
   /// Provides a definition for a range in SV from a width.
   static String _widthToRangeDef(int width, {bool forceRange = false}) {
@@ -551,17 +484,3 @@ class SynthLogicArrayElement extends SynthLogic {
       ' parentArray=($parentArray), element ${logic.arrayIndex}, logic: $logic'
       ' logics contained: ${logics.map((e) => e.name).toList()}';
 }
-
-extension on Logic {
-  /// Returns the preferred name for this [Logic] while generating in the synth
-  /// stack.
-  String get preferredSynthName => naming == Naming.reserved
-      // if reserved, keep the exact name
-      ? name
-      : isArrayMember
-          // arrays nicely name their elements already
-          ? name
-          // sanitize to remove any `.` in struct names
-          // the base `name` will be returned if not a structure.
-          : Sanitizer.sanitizeSV(structureName);
-}
diff --git a/lib/src/synthesizers/utilities/synth_module_definition.dart b/lib/src/synthesizers/utilities/synth_module_definition.dart
index 37ebfb323..9ea120646 100644
--- a/lib/src/synthesizers/utilities/synth_module_definition.dart
+++ b/lib/src/synthesizers/utilities/synth_module_definition.dart
@@ -14,7 +14,6 @@ import 'package:meta/meta.dart';
 import 'package:rohd/rohd.dart';
 import 'package:rohd/src/collections/traverseable_collection.dart';
 import 'package:rohd/src/synthesizers/utilities/utilities.dart';
-import 'package:rohd/src/utilities/uniquifier.dart';
 
 /// A version of [BusSubset] that can be used for slicing on [LogicStructure]
 /// ports.
@@ -110,10 +109,6 @@ class SynthModuleDefinition {
   @override
   String toString() => "module name: '${module.name}'";
 
-  /// Used to uniquify any identifiers, including signal names
-  /// and module instances.
-  final Uniquifier _synthInstantiationNameUniquifier;
-
   /// Indicates whether [logic] has a corresponding present [SynthLogic] in
   /// this definition.
   @internal
@@ -289,14 +284,7 @@ class SynthModuleDefinition {
 
   /// Creates a new definition representation for this [module].
   SynthModuleDefinition(this.module)
-      : _synthInstantiationNameUniquifier = Uniquifier(
-          reservedNames: {
-            ...module.inputs.keys,
-            ...module.outputs.keys,
-            ...module.inOuts.keys,
-          },
-        ),
-        assert(
+      : assert(
             !(module is SystemVerilog &&
                 module.generatedDefinitionType ==
                     DefinitionGenerationType.none),
@@ -465,6 +453,7 @@ class SynthModuleDefinition {
 
       final receiverIsSubModuleOutput =
           receiver.isOutput && (receiver.parentModule?.parent == module);
+
       if (receiverIsSubModuleOutput) {
         final subModule = receiver.parentModule!;
 
@@ -513,6 +502,7 @@ class SynthModuleDefinition {
     _collapseArrays();
     _collapseAssignments();
     _assignSubmodulePortMapping();
+
     _pruneUnused();
     process();
     _pickNames();
@@ -767,49 +757,59 @@ class SynthModuleDefinition {
   }
 
   /// Picks names of signals and sub-modules.
+  ///
+  /// Signal names are read from `Namer.signalNameOf` (for user-created
+  /// [Logic] objects) or kept as literal constants and are allocated from
+  /// `Namer.signalNameOf`.  Submodule instance names are allocated
+  /// from `Namer.allocateRawName`.  All names share a single
+  /// namespace managed by the module's `Namer`.
   void _pickNames() {
-    // first ports get priority
+    // Name allocation order matters — earlier claims get the unsuffixed name
+    // when there are collisions.  This matches production ROHD priority:
+    //   1. Ports (reserved by _initNamespace, claimed via signalName)
+    //   2. Reserved submodule instances
+    //   3. Reserved internal signals
+    //   4. Non-reserved submodule instances
+    //   5. Non-reserved internal signals
     for (final input in inputs) {
-      input.pickName(_synthInstantiationNameUniquifier);
+      input.pickName();
     }
     for (final output in outputs) {
-      output.pickName(_synthInstantiationNameUniquifier);
+      output.pickName();
     }
     for (final inOut in inOuts) {
-      inOut.pickName(_synthInstantiationNameUniquifier);
+      inOut.pickName();
     }
 
-    // pick names of *reserved* submodule instances
-    final nonReservedSubmodules = <SynthSubModuleInstantiation>[];
+    // Reserved submodule instances first (they assert their exact name).
     for (final submodule in subModuleInstantiations) {
       if (submodule.module.reserveName) {
-        submodule.pickName(_synthInstantiationNameUniquifier);
+        submodule.pickName(module);
         assert(submodule.module.name == submodule.name,
             'Expect reserved names to retain their name.');
-      } else {
-        nonReservedSubmodules.add(submodule);
       }
     }
 
-    // then *reserved* internal signals get priority
+    // Reserved internal signals next.
     final nonReservedSignals = <SynthLogic>[];
     for (final signal in internalSignals) {
       if (signal.isReserved) {
-        signal.pickName(_synthInstantiationNameUniquifier);
+        signal.pickName();
       } else {
         nonReservedSignals.add(signal);
       }
     }
 
-    // then submodule instances
-    for (final submodule in nonReservedSubmodules
-        .where((element) => element.needsInstantiation)) {
-      submodule.pickName(_synthInstantiationNameUniquifier);
+    // Then non-reserved submodule instances.
+    for (final submodule in subModuleInstantiations) {
+      if (!submodule.module.reserveName && submodule.needsInstantiation) {
+        submodule.pickName(module);
+      }
     }
 
-    // then the rest of the internal signals
+    // Then the rest of the internal signals.
     for (final signal in nonReservedSignals) {
-      signal.pickName(_synthInstantiationNameUniquifier);
+      signal.pickName();
     }
   }
 
diff --git a/lib/src/synthesizers/utilities/synth_sub_module_instantiation.dart b/lib/src/synthesizers/utilities/synth_sub_module_instantiation.dart
index 80a415a09..cf7da28e8 100644
--- a/lib/src/synthesizers/utilities/synth_sub_module_instantiation.dart
+++ b/lib/src/synthesizers/utilities/synth_sub_module_instantiation.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2021-2025 Intel Corporation
+// Copyright (C) 2021-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // synth_sub_module_instantiation.dart
@@ -11,7 +11,6 @@ import 'dart:collection';
 
 import 'package:rohd/rohd.dart';
 import 'package:rohd/src/synthesizers/utilities/utilities.dart';
-import 'package:rohd/src/utilities/uniquifier.dart';
 
 /// Represents an instantiation of a module within another module.
 class SynthSubModuleInstantiation {
@@ -25,13 +24,15 @@ class SynthSubModuleInstantiation {
   String get name => _name!;
 
   /// Selects a name for this module instance. Must be called exactly once.
-  void pickName(Uniquifier uniquifier) {
+  ///
+  /// Names are allocated from [parentModule]'s `Namer`'s shared namespace
+  /// via `Namer.allocateName`.
+  void pickName(Module parentModule) {
     assert(_name == null, 'Should only pick a name once.');
 
-    _name = uniquifier.getUniqueName(
-      initialName: module.uniqueInstanceName,
+    _name = parentModule.namer.allocateRawName(
+      module.uniqueInstanceName,
       reserved: module.reserveName,
-      nullStarter: 'm',
     );
   }
 
diff --git a/lib/src/utilities/namer.dart b/lib/src/utilities/namer.dart
new file mode 100644
index 000000000..efbe8e3e4
--- /dev/null
+++ b/lib/src/utilities/namer.dart
@@ -0,0 +1,233 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// namer.dart
+// Central collision-free naming for signals and instances within a module.
+//
+// 2026 April 10
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:collection/collection.dart';
+import 'package:meta/meta.dart';
+import 'package:rohd/rohd.dart';
+import 'package:rohd/src/utilities/sanitizer.dart';
+import 'package:rohd/src/utilities/uniquifier.dart';
+
+/// Central namer that manages collision-free names for both signals and
+/// submodule instances within a single module scope.
+///
+/// All identifiers (signals and instances) share a single namespace,
+/// ensuring no name collisions in the generated SystemVerilog.
+///
+/// Port names are reserved at construction time.  Internal signal names
+/// are assigned lazily on the first [signalNameOf] call.  Instance names
+/// are allocated explicitly via [allocateRawName].
+@internal
+class Namer {
+  // ─── Shared namespace ───────────────────────────────────────────
+
+  final Uniquifier _uniquifier;
+
+  /// Cache of resolved names for internal (non-port) signals only.
+  /// Port names are returned directly from [_portLogics] and never cached here.
+  final Map<Logic, String> _signalNames = {};
+
+  /// The set of port [Logic] objects, for O(1) port membership tests.
+  final Set<Logic> _portLogics;
+
+  // ─── Construction ───────────────────────────────────────────────
+
+  Namer._({
+    required Uniquifier uniquifier,
+    required Set<Logic> portLogics,
+  })  : _uniquifier = uniquifier,
+        _portLogics = portLogics;
+
+  /// Creates a [Namer] for the given module ports.
+  ///
+  /// Port names are reserved in the shared namespace.  Port names are
+  /// guaranteed sanitary by [Module]'s `_checkForSafePortName`.
+  factory Namer.forModule({
+    required Map<String, Logic> inputs,
+    required Map<String, Logic> outputs,
+    required Map<String, Logic> inOuts,
+  }) {
+    final portLogics = <Logic>{
+      ...inputs.values,
+      ...outputs.values,
+      ...inOuts.values,
+    };
+
+    final uniquifier = Uniquifier();
+    for (final logic in portLogics) {
+      uniquifier.getUniqueName(initialName: logic.name, reserved: true);
+    }
+
+    return Namer._(
+      uniquifier: uniquifier,
+      portLogics: portLogics,
+    );
+  }
+
+  // ─── Name availability / allocation ─────────────────────────────
+
+  /// Returns `true` if [name] has not yet been claimed in the namespace.
+  bool isAvailable(String name) => _uniquifier.isAvailable(name);
+
+  /// Allocates a collision-free name in the shared namespace.
+  ///
+  /// When [reserved] is `true`, the exact [baseName] (after sanitization)
+  /// is claimed without modification; an exception is thrown if it collides.
+  String allocateRawName(String baseName, {bool reserved = false}) =>
+      _uniquifier.getUniqueName(
+        initialName: Sanitizer.sanitizeSV(baseName),
+        reserved: reserved,
+      );
+
+  // ─── Signal naming (Logic → String) ─────────────────────────────
+
+  /// Returns the canonical name for [logic].
+  ///
+  /// The first call for a given [logic] allocates a collision-free name
+  /// via the underlying [Uniquifier].  Subsequent calls return the cached
+  /// result in O(1).
+  String signalNameOf(Logic logic) {
+    final cached = _signalNames[logic];
+    if (cached != null) {
+      return cached;
+    }
+
+    if (_portLogics.contains(logic)) {
+      return logic.name;
+    }
+
+    String base;
+    final isReservedInternal = logic.naming == Naming.reserved && !logic.isPort;
+    if (logic.naming == Naming.reserved || logic.isArrayMember) {
+      base = logic.name;
+    } else {
+      base = Sanitizer.sanitizeSV(logic.structureName);
+    }
+
+    final name = _uniquifier.getUniqueName(
+      initialName: base,
+      reserved: isReservedInternal,
+    );
+    _signalNames[logic] = name;
+    return name;
+  }
+
+  /// The base name that would be used for [logic] before uniquification.
+  static String baseName(Logic logic) =>
+      (logic.naming == Naming.reserved || logic.isArrayMember)
+          ? logic.name
+          : Sanitizer.sanitizeSV(logic.structureName);
+
+  /// Chooses the best name from a pool of merged [Logic] signals.
+  ///
+  /// When [constValue] is provided and [constNameDisallowed] is `false`,
+  /// the constant's value string is used directly as the name (no
+  /// uniquification).  When [constNameDisallowed] is `true`, the constant
+  /// is excluded from the candidate pool and the normal priority applies.
+  ///
+  /// Priority (after constant handling):
+  ///   1. Port of this module (always wins — its name is already reserved).
+  ///   2. Reserved internal signal (exact name, throws on collision).
+  ///   3. Renameable signal.
+  ///   4. Preferred-available mergeable (base name not yet taken).
+  ///   5. Preferred-uniquifiable mergeable.
+  ///   6. Available-unpreferred mergeable.
+  ///   7. First unpreferred mergeable.
+  ///   8. Unnamed (prefer non-unpreferred base name).
+  ///
+  /// The winning name is allocated once and cached for the chosen [Logic].
+  /// All other non-port [Logic]s in [candidates] are also cached to the
+  /// same name.
+  String signalNameOfBest(
+    Iterable<Logic> candidates, {
+    Const? constValue,
+    bool constNameDisallowed = false,
+  }) {
+    if (constValue != null && !constNameDisallowed) {
+      return constValue.value.toString();
+    }
+
+    Logic? port;
+    Logic? reserved;
+    Logic? renameable;
+    final preferredMergeable = <Logic>[];
+    final unpreferredMergeable = <Logic>[];
+    final unnamed = <Logic>[];
+
+    for (final logic in candidates) {
+      if (_portLogics.contains(logic)) {
+        port = logic;
+      } else if (logic.isPort) {
+        if (Naming.isUnpreferred(baseName(logic))) {
+          unpreferredMergeable.add(logic);
+        } else {
+          preferredMergeable.add(logic);
+        }
+      } else if (logic.naming == Naming.reserved) {
+        reserved = logic;
+      } else if (logic.naming == Naming.renameable) {
+        renameable = logic;
+      } else if (logic.naming == Naming.mergeable) {
+        if (Naming.isUnpreferred(baseName(logic))) {
+          unpreferredMergeable.add(logic);
+        } else {
+          preferredMergeable.add(logic);
+        }
+      } else {
+        unnamed.add(logic);
+      }
+    }
+
+    if (port != null) {
+      return _nameAndCacheAll(port, candidates);
+    }
+
+    if (reserved != null) {
+      return _nameAndCacheAll(reserved, candidates);
+    }
+
+    if (renameable != null) {
+      return _nameAndCacheAll(renameable, candidates);
+    }
+
+    if (preferredMergeable.isNotEmpty) {
+      final best = preferredMergeable
+              .firstWhereOrNull((e) => isAvailable(baseName(e))) ??
+          preferredMergeable.first;
+      return _nameAndCacheAll(best, candidates);
+    }
+
+    if (unpreferredMergeable.isNotEmpty) {
+      final best = unpreferredMergeable
+              .firstWhereOrNull((e) => isAvailable(baseName(e))) ??
+          unpreferredMergeable.first;
+      return _nameAndCacheAll(best, candidates);
+    }
+
+    if (unnamed.isNotEmpty) {
+      final best =
+          unnamed.firstWhereOrNull((e) => !Naming.isUnpreferred(baseName(e))) ??
+              unnamed.first;
+      return _nameAndCacheAll(best, candidates);
+    }
+
+    throw StateError('No Logic candidates to name.');
+  }
+
+  /// Names [chosen] via [signalNameOf], then caches the same name for all
+  /// other non-port [Logic]s in [all].
+  String _nameAndCacheAll(Logic chosen, Iterable<Logic> all) {
+    final name = signalNameOf(chosen);
+    for (final logic in all) {
+      if (!identical(logic, chosen) && !_portLogics.contains(logic)) {
+        _signalNames[logic] = name;
+      }
+    }
+    return name;
+  }
+}
diff --git a/rohd_devtools_extension/assets/help/details_help.md b/rohd_devtools_extension/assets/help/details_help.md
new file mode 100644
index 000000000..27689d8df
--- /dev/null
+++ b/rohd_devtools_extension/assets/help/details_help.md
@@ -0,0 +1,28 @@
+# ℹ️ Module Details — Help
+
+<!-- tooltip -->
+
+Signal Details
+  Click module     Select module to view signals
+  Signal list      Shows ports and internal signals
+
+Signal Values
+  Value column     Current signal value (hex/binary)
+  Width column     Bit width of each signal
+
+<!-- details -->
+
+## Signal Details
+
+| Action | Description |
+| --- | --- |
+| Click module (tree) | Select module and populate signal list |
+| Signal list | Shows input ports, output ports, and internal signals |
+| Value column | Displays the current value of each signal |
+| Width column | Shows the bit width of each signal |
+
+## Export
+
+| Action | Description |
+| --- | --- |
+| 📷 Camera | Export signal table as PNG image |
diff --git a/rohd_devtools_extension/assets/help/devtools_help.md b/rohd_devtools_extension/assets/help/devtools_help.md
new file mode 100644
index 000000000..f7845a6bc
--- /dev/null
+++ b/rohd_devtools_extension/assets/help/devtools_help.md
@@ -0,0 +1,34 @@
+# 🛠 ROHD DevTools — Help
+
+<!-- tooltip -->
+
+Module Tree (left panel)
+  Click node       Select module
+  Click ▸ / ▾      Expand / collapse
+  🔃  Refresh      Reload hierarchy from VM
+  Type in search   Filter modules by name
+
+Details (right panel)
+  Signal list      Shows ports and internal signals
+  Search           Filter signals by name
+  Filter           Toggle input / output visibility
+
+<!-- details -->
+
+## Module Tree (left panel)
+
+| Key | Description |
+| --- | --- |
+| Click module | Select module and show signals |
+| Click ▸ / ▾ | Expand or collapse sub-modules |
+| 🔃  Refresh | Reload hierarchy from the VM |
+| Type in search | Filter modules by name |
+
+## Signal Details (right panel)
+
+| Key | Description |
+| --- | --- |
+| Signal list | Shows input ports, output ports, and internal signals |
+| Search | Filter signals by name |
+| Filter icon | Toggle input / output signal visibility |
+| 📷  Export | Export signal details as PNG |
diff --git a/rohd_devtools_extension/lib/rohd_devtools/cubit/rohd_service_cubit.dart b/rohd_devtools_extension/lib/rohd_devtools/cubit/rohd_service_cubit.dart
index 2b8b70b79..f4d8087e2 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/cubit/rohd_service_cubit.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/cubit/rohd_service_cubit.dart
@@ -1,4 +1,4 @@
-// Copyright (C) 2025 Intel Corporation
+// Copyright (C) 2025-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
 // rohd_service_cubit.dart
@@ -7,27 +7,76 @@
 // 2025 January 28
 // Author: Roberto Torres <roberto.torres@intel.com>
 
+import 'dart:async';
+
 import 'package:devtools_app_shared/service.dart';
+import 'package:devtools_app_shared/utils.dart';
 import 'package:devtools_extensions/devtools_extensions.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/models/tree_model.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/services/tree_service.dart';
+import 'package:vm_service/vm_service.dart' as vm;
 
 part 'rohd_service_state.dart';
 
+/// Cubit for managing ROHD service state.
 class RohdServiceCubit extends Cubit<RohdServiceState> {
+  /// The TreeService instance for ROHD.
   TreeService? treeService;
 
+  /// The discovered ROHD isolate ID.
+  ///
+  /// Exposed so other consumers (e.g. waveform data source) can target the
+  /// same isolate that contains the ROHD inspector_service library.
+  String? get rohdIsolateId => _rohdIsolateId;
+  String? _rohdIsolateId;
+
+  /// Listener for service connection state changes.
+  void Function()? _connectionListener;
+
+  /// Constructor for RohdServiceCubit.
   RohdServiceCubit() : super(RohdServiceInitial()) {
-    evalModuleTree();
+    // Listen for service connection state changes.
+    _connectionListener = _onConnectionStateChanged;
+    serviceManager.connectedState.addListener(_connectionListener!);
+    // Check if already connected (in case we missed the event).
+    if (serviceManager.connectedState.value.connected) {
+      unawaited(Future.microtask(evalModuleTree));
+    }
+  }
+
+  void _onConnectionStateChanged() {
+    final connected = serviceManager.connectedState.value.connected;
+    if (connected) {
+      // Reset tree service so we use the new connection.
+      treeService = null;
+      unawaited(evalModuleTree());
+    } else {
+      // VM disconnected — reset stale references.
+      treeService = null;
+      _rohdIsolateId = null;
+      emit(RohdServiceInitial());
+    }
+  }
+
+  @override
+  Future<void> close() {
+    if (_connectionListener != null) {
+      serviceManager.connectedState.removeListener(_connectionListener!);
+      _connectionListener = null;
+    }
+    return super.close();
   }
 
+  /// Evaluate the module tree from the ROHD service.
   Future<void> evalModuleTree() async {
     await _handleModuleTreeOperation(
         (treeService) => treeService.evalModuleTree());
   }
 
+  /// Refresh the module tree from the ROHD service.
   Future<void> refreshModuleTree() async {
     await _handleModuleTreeOperation(
         (treeService) => treeService.refreshModuleTree());
@@ -37,20 +86,72 @@ class RohdServiceCubit extends Cubit<RohdServiceState> {
       Future<TreeModel?> Function(TreeService) operation) async {
     try {
       emit(RohdServiceLoading());
+
       if (serviceManager.service == null) {
-        throw Exception('ServiceManager is not initialized');
+        // When not running in DevTools, emit loaded with null tree.
+        emit(const RohdServiceLoaded(null));
+        return;
+      }
+
+      if (treeService == null) {
+        // Find the isolate that actually has the ROHD library loaded.
+        // With `dart test`, the DevTools "selected" isolate is often the
+        // test-runner controller which doesn't import package:rohd.  We
+        // need to scan all isolates to find the one with inspector_service.
+        final service = serviceManager.service!;
+        ValueListenable<vm.IsolateRef?>? rohdIsolate;
+
+        try {
+          final vmInfo = await service.getVM();
+          final isolates = vmInfo.isolates ?? [];
+
+          for (final isoRef in isolates) {
+            final id = isoRef.id;
+            if (id == null) continue;
+            try {
+              final iso = await service.getIsolate(id);
+              final libs = iso.libraries ?? [];
+              final hasRohd = libs.any((lib) =>
+                  lib.uri ==
+                  'package:rohd/src/diagnostics/inspector_service.dart');
+              if (hasRohd) {
+                debugPrint('[RohdServiceCubit] Found ROHD in '
+                    '${isoRef.name}');
+                rohdIsolate = ValueNotifier(isoRef);
+                _rohdIsolateId = id;
+                break;
+              }
+            } on Exception {
+              // Isolate not loaded yet — skip.
+              continue;
+            }
+          }
+        } on Exception catch (e) {
+          debugPrint('[RohdServiceCubit] VM scan failed: $e');
+        }
+
+        if (rohdIsolate == null) {
+          debugPrint('[RohdServiceCubit] ROHD isolate not found, '
+              'falling back to selected isolate');
+        }
+
+        treeService = TreeService(
+          EvalOnDartLibrary(
+            'package:rohd/src/diagnostics/inspector_service.dart',
+            service,
+            serviceManager: serviceManager,
+            isolate: rohdIsolate,
+          ),
+          Disposable(),
+        );
       }
-      treeService ??= TreeService(
-        EvalOnDartLibrary(
-          'package:rohd/src/diagnostics/inspector_service.dart',
-          serviceManager.service!,
-          serviceManager: serviceManager,
-        ),
-        Disposable(),
-      );
+
       final treeModel = await operation(treeService!);
       emit(RohdServiceLoaded(treeModel));
-    } catch (error, trace) {
+    } on Exception catch (error, trace) {
+      // Reset treeService so next attempt re-scans for the ROHD isolate.
+      treeService = null;
+      _rohdIsolateId = null;
       emit(RohdServiceError(error.toString(), trace));
     }
   }
diff --git a/rohd_devtools_extension/lib/rohd_devtools/services/tree_service.dart b/rohd_devtools_extension/lib/rohd_devtools/services/tree_service.dart
index 578134c52..d83519f96 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/services/tree_service.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/services/tree_service.dart
@@ -10,10 +10,12 @@
 import 'dart:convert';
 
 import 'package:devtools_app_shared/service.dart';
+import 'package:devtools_app_shared/utils.dart';
+import 'package:flutter/foundation.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/models/tree_model.dart';
 
 class TreeService {
-  final invokeFunc = 'ModuleTree.instance.hierarchyJSON';
+  final invokeFunc = 'ModuleServices.instance.hierarchyJSON';
   final EvalOnDartLibrary rohdControllerEval;
   final Disposable evalDisposable;
 
@@ -28,8 +30,7 @@ class TreeService {
     final treeObj = jsonDecode(treeInstance.valueAsString ?? '') as Map;
 
     if (treeObj['status'] == 'fail') {
-      print('error');
-
+      debugPrint('[TreeService] evalModuleTree failed: ${treeObj['message']}');
       return null;
     } else {
       return TreeModel.fromJson(jsonDecode(treeInstance.valueAsString ?? ""));
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/details_help_button.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/details_help_button.dart
new file mode 100644
index 000000000..4834aea35
--- /dev/null
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/details_help_button.dart
@@ -0,0 +1,33 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// details_help_button.dart
+// Help button widget for the Details tab.
+//
+// Content is loaded from assets/help/details_help.md.
+// Edit that markdown file to update hover tooltip and dialog content.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:flutter/material.dart';
+
+import 'package:rohd_devtools_widgets/rohd_devtools_widgets.dart';
+
+/// A help button for the Details tab.
+///
+/// Content is driven by `assets/help/details_help.md`.
+/// Edit that file to update the hover tooltip and click-open dialog.
+class DetailsHelpButton extends StatelessWidget {
+  /// Whether the current theme is dark mode.
+  final bool isDark;
+
+  /// Create a [DetailsHelpButton].
+  const DetailsHelpButton({required this.isDark, super.key});
+
+  @override
+  Widget build(BuildContext context) => MarkdownHelpButton(
+        assetPath: 'assets/help/details_help.md',
+        isDark: isDark,
+      );
+}
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/devtool_appbar.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/devtool_appbar.dart
index 9138fc191..d6f067e28 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/ui/devtool_appbar.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/devtool_appbar.dart
@@ -8,6 +8,7 @@
 // Author: Yao Jing Quek <yao.jing.quek@intel.com>
 
 import 'package:flutter/material.dart';
+import 'package:rohd_devtools_extension/rohd_devtools/ui/devtools_help_button.dart';
 
 class DevtoolAppBar extends StatelessWidget implements PreferredSizeWidget {
   const DevtoolAppBar({
@@ -16,11 +17,17 @@ class DevtoolAppBar extends StatelessWidget implements PreferredSizeWidget {
 
   @override
   Widget build(BuildContext context) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+
     return AppBar(
       backgroundColor: Theme.of(context).colorScheme.onPrimary,
       title: const Text('ROHD DevTool (Beta)'),
       leading: const Icon(Icons.build),
       actions: <Widget>[
+        // ── Help ──
+        DevToolsHelpButton(isDark: isDark),
+
+        // ── Licenses ──
         Padding(
           padding: const EdgeInsets.only(right: 20.0),
           child: MouseRegion(
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/devtools_help_button.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/devtools_help_button.dart
new file mode 100644
index 000000000..138d588b3
--- /dev/null
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/devtools_help_button.dart
@@ -0,0 +1,33 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// devtools_help_button.dart
+// Help button widget for the ROHD DevTools app bar.
+//
+// Content is loaded from assets/help/devtools_help.md.
+// Edit that markdown file to update hover tooltip and dialog content.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:flutter/material.dart';
+
+import 'package:rohd_devtools_widgets/rohd_devtools_widgets.dart';
+
+/// A help button for the ROHD DevTools app bar.
+///
+/// Content is driven by `assets/help/devtools_help.md`.
+/// Edit that file to update the hover tooltip and click-open dialog.
+class DevToolsHelpButton extends StatelessWidget {
+  /// Whether the current theme is dark mode.
+  final bool isDark;
+
+  /// Create a [DevToolsHelpButton].
+  const DevToolsHelpButton({required this.isDark, super.key});
+
+  @override
+  Widget build(BuildContext context) => MarkdownHelpButton(
+        assetPath: 'assets/help/devtools_help.md',
+        isDark: isDark,
+      );
+}
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_card.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_card.dart
index 40f1e72de..a12b25697 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_card.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_card.dart
@@ -74,8 +74,9 @@ class _ModuleTreeCardState extends State<ModuleTreeCard> {
       children: [
         Container(
           decoration: BoxDecoration(
-            color:
-                isSelected ? Colors.blue.withOpacity(0.2) : Colors.transparent,
+            color: isSelected
+                ? Colors.blue.withValues(alpha: 0.2)
+                : Colors.transparent,
             borderRadius: BorderRadius.circular(4.0),
           ),
           padding: const EdgeInsets.symmetric(vertical: 4.0, horizontal: 8.0),
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_details_navbar.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_details_navbar.dart
index f84835e5e..a94935179 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_details_navbar.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/module_tree_details_navbar.dart
@@ -20,7 +20,7 @@ class ModuleTreeDetailsNavbar extends StatelessWidget {
       type: BottomNavigationBarType.fixed,
       backgroundColor: const Color(0x1B1B1FEE),
       selectedItemColor: Colors.white,
-      unselectedItemColor: Colors.white.withOpacity(.60),
+      unselectedItemColor: Colors.white.withValues(alpha: .60),
       selectedFontSize: 10,
       unselectedFontSize: 10,
       onTap: (value) {
diff --git a/rohd_devtools_extension/lib/rohd_devtools/ui/signal_details_card.dart b/rohd_devtools_extension/lib/rohd_devtools/ui/signal_details_card.dart
index 0d3fdeb3a..cafee83c3 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/ui/signal_details_card.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/ui/signal_details_card.dart
@@ -8,6 +8,7 @@
 // Author: Yao Jing Quek <yao.jing.quek@intel.com>
 
 import 'package:flutter/material.dart';
+import 'package:rohd_devtools_widgets/rohd_devtools_widgets.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/models/tree_model.dart';
 
 import 'package:rohd_devtools_extension/rohd_devtools/ui/signal_table_text_field.dart';
@@ -17,9 +18,9 @@ class SignalDetailsCard extends StatefulWidget {
   final TreeModel? module;
 
   const SignalDetailsCard({
-    Key? key,
+    super.key,
     this.module,
-  }) : super(key: key);
+  });
 
   @override
   SignalDetailsCardState createState() => SignalDetailsCardState();
@@ -30,6 +31,7 @@ class SignalDetailsCardState extends State<SignalDetailsCard> {
   ValueNotifier<bool> inputSelected = ValueNotifier<bool>(true);
   ValueNotifier<bool> outputSelected = ValueNotifier<bool>(true);
   ValueNotifier<int> notifier = ValueNotifier<int>(0);
+  final GlobalKey _boundaryKey = GlobalKey();
 
   void toggleNotifier() {
     notifier.value++;
@@ -84,46 +86,61 @@ class SignalDetailsCardState extends State<SignalDetailsCard> {
       );
     }
 
-    return SizedBox(
-      height: MediaQuery.of(context).size.height / 1.4,
-      child: SingleChildScrollView(
-        scrollDirection: Axis.vertical,
-        child: Column(
-          children: [
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Row(
-                children: [
-                  SignalTableTextField(
-                    labelText: 'Search Signals',
-                    onChanged: (value) {
-                      setState(() {
-                        searchTerm = value;
-                      });
-                      toggleNotifier();
-                    },
+    return Stack(
+      children: [
+        RepaintBoundary(
+          key: _boundaryKey,
+          child: SingleChildScrollView(
+            scrollDirection: Axis.vertical,
+            child: Column(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Row(
+                    children: [
+                      SignalTableTextField(
+                        labelText: 'Search Signals',
+                        onChanged: (value) {
+                          setState(() {
+                            searchTerm = value;
+                          });
+                          toggleNotifier();
+                        },
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.filter_list),
+                        onPressed: _showFilterDialog,
+                      ),
+                    ],
                   ),
-                  IconButton(
-                    icon: const Icon(Icons.filter_list),
-                    onPressed: _showFilterDialog,
-                  ),
-                ],
-              ),
+                ),
+                ValueListenableBuilder(
+                  valueListenable: notifier,
+                  builder: (context, _, __) {
+                    return SignalTable(
+                      selectedModule: widget.module!,
+                      searchTerm: searchTerm,
+                      inputSelectedVal: inputSelected.value,
+                      outputSelectedVal: outputSelected.value,
+                    );
+                  },
+                ),
+              ],
             ),
-            ValueListenableBuilder(
-              valueListenable: notifier,
-              builder: (context, _, __) {
-                return SignalTable(
-                  selectedModule: widget.module!,
-                  searchTerm: searchTerm,
-                  inputSelectedVal: inputSelected.value,
-                  outputSelectedVal: outputSelected.value,
-                );
-              },
+          ),
+        ),
+        Positioned(
+          right: 8,
+          bottom: 8,
+          child: ExportPngButton(
+            onPressed: () => captureBoundaryToPng(
+              context,
+              boundaryKey: _boundaryKey,
+              filePrefix: 'signal_details',
             ),
-          ],
+          ),
         ),
-      ),
+      ],
     );
   }
 }
diff --git a/rohd_devtools_extension/lib/rohd_devtools/view/tree_structure_page.dart b/rohd_devtools_extension/lib/rohd_devtools/view/tree_structure_page.dart
index 91c57b1b7..f408b33cf 100644
--- a/rohd_devtools_extension/lib/rohd_devtools/view/tree_structure_page.dart
+++ b/rohd_devtools_extension/lib/rohd_devtools/view/tree_structure_page.dart
@@ -9,6 +9,7 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:rohd_devtools_widgets/rohd_devtools_widgets.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/cubit/rohd_service_cubit.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/cubit/tree_search_term_cubit.dart';
 import 'package:rohd_devtools_extension/rohd_devtools/ui/signal_details_card.dart';
@@ -26,6 +27,7 @@ class TreeStructurePage extends StatelessWidget {
 
   final ScrollController _horizontal = ScrollController();
   final ScrollController _vertical = ScrollController();
+  final GlobalKey _treeBoundaryKey = GlobalKey();
 
   @override
   Widget build(BuildContext context) {
@@ -34,162 +36,179 @@ class TreeStructurePage extends StatelessWidget {
       child: SingleChildScrollView(
         scrollDirection: Axis.horizontal,
         child: Row(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
           children: [
             // Module Tree render here (Left Section)
             SizedBox(
               width: screenSize.width / 2,
-              height: screenSize.width / 2.6,
               child: Card(
                 clipBehavior: Clip.antiAlias,
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    Padding(
-                      padding: const EdgeInsets.all(10),
-                      // Module Tree Menu Bar
-                      child: Row(
-                        children: [
-                          const Icon(Icons.account_tree),
-                          const SizedBox(width: 10),
-                          const Text('Module Tree'),
-                          Expanded(
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.end,
-                              children: [
-                                SizedBox(
-                                  width: 200,
-                                  child: TextField(
-                                    onChanged: (value) {
-                                      context
-                                          .read<TreeSearchTermCubit>()
-                                          .setTerm(value);
-                                    },
-                                    decoration: const InputDecoration(
-                                      labelText: "Search Tree",
-                                    ),
-                                  ),
-                                ),
-                                IconButton(
-                                  icon: const Icon(Icons.refresh),
-                                  onPressed: () => context
-                                      .read<RohdServiceCubit>()
-                                      .evalModuleTree(),
-                                ),
-                              ],
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                    // expand the available column
-                    Expanded(
-                      child: Scrollbar(
-                        thumbVisibility: true,
-                        controller: _vertical,
-                        child: SingleChildScrollView(
-                          scrollDirection: Axis.vertical,
-                          controller: _vertical,
+                child: Stack(children: [
+                  RepaintBoundary(
+                    key: _treeBoundaryKey,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Padding(
+                          padding: const EdgeInsets.all(10),
+                          // Module Tree Menu Bar
                           child: Row(
                             children: [
+                              const Icon(Icons.account_tree),
+                              const SizedBox(width: 10),
+                              const Text('Module Tree'),
                               Expanded(
-                                child: Scrollbar(
-                                  thumbVisibility: true,
-                                  controller: _horizontal,
-                                  child: SingleChildScrollView(
-                                    scrollDirection: Axis.horizontal,
-                                    controller: _horizontal,
-                                    child: BlocBuilder<RohdServiceCubit,
-                                        RohdServiceState>(
-                                      builder: (context, state) {
-                                        if (state is RohdServiceLoading) {
-                                          return const Center(
-                                            child: CircularProgressIndicator(),
-                                          );
-                                        } else if (state is RohdServiceLoaded) {
-                                          final futureModuleTree =
-                                              state.treeModel;
-                                          if (futureModuleTree == null) {
-                                            return Expanded(
-                                              child: Container(
-                                                padding:
-                                                    const EdgeInsets.all(20),
-                                                child: const Text(
-                                                  'Friendly Notice: Please make '
-                                                  'sure that you use build() method '
-                                                  'to build your module and put '
-                                                  'the breakpoint at the '
-                                                  'simulation time.',
-                                                  style:
-                                                      TextStyle(fontSize: 20),
-                                                  textAlign: TextAlign.center,
-                                                ),
-                                              ),
-                                            );
-                                          } else {
-                                            return ModuleTreeCard(
-                                              futureModuleTree:
-                                                  futureModuleTree,
-                                            );
-                                          }
-                                        } else if (state is RohdServiceError) {
-                                          return Center(
-                                            child:
-                                                Text('Error: ${state.error}'),
-                                          );
-                                        } else {
-                                          return const Center(
-                                            child: Text('Unknown state'),
-                                          );
-                                        }
-                                      },
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.end,
+                                  children: [
+                                    SizedBox(
+                                      width: 200,
+                                      child: TextField(
+                                        onChanged: (value) {
+                                          context
+                                              .read<TreeSearchTermCubit>()
+                                              .setTerm(value);
+                                        },
+                                        decoration: const InputDecoration(
+                                          labelText: "Search Tree",
+                                        ),
+                                      ),
                                     ),
-                                  ),
+                                    IconButton(
+                                      icon: const Icon(Icons.refresh),
+                                      onPressed: () => context
+                                          .read<RohdServiceCubit>()
+                                          .evalModuleTree(),
+                                    ),
+                                  ],
                                 ),
                               ),
                             ],
                           ),
                         ),
+                        // expand the available column
+                        Expanded(
+                          child: Scrollbar(
+                            thumbVisibility: true,
+                            controller: _vertical,
+                            child: SingleChildScrollView(
+                              scrollDirection: Axis.vertical,
+                              controller: _vertical,
+                              child: Row(
+                                children: [
+                                  Expanded(
+                                    child: Scrollbar(
+                                      thumbVisibility: true,
+                                      controller: _horizontal,
+                                      child: SingleChildScrollView(
+                                        scrollDirection: Axis.horizontal,
+                                        controller: _horizontal,
+                                        child: BlocBuilder<RohdServiceCubit,
+                                            RohdServiceState>(
+                                          builder: (context, state) {
+                                            if (state is RohdServiceLoading) {
+                                              return const Center(
+                                                child:
+                                                    CircularProgressIndicator(),
+                                              );
+                                            } else if (state
+                                                is RohdServiceLoaded) {
+                                              final futureModuleTree =
+                                                  state.treeModel;
+                                              if (futureModuleTree == null) {
+                                                return Expanded(
+                                                  child: Container(
+                                                    padding:
+                                                        const EdgeInsets.all(
+                                                            20),
+                                                    child: const Text(
+                                                      'Friendly Notice: Please make '
+                                                      'sure that you use build() method '
+                                                      'to build your module and put '
+                                                      'the breakpoint at the '
+                                                      'simulation time.',
+                                                      style: TextStyle(
+                                                          fontSize: 20),
+                                                      textAlign:
+                                                          TextAlign.center,
+                                                    ),
+                                                  ),
+                                                );
+                                              } else {
+                                                return ModuleTreeCard(
+                                                  futureModuleTree:
+                                                      futureModuleTree,
+                                                );
+                                              }
+                                            } else if (state
+                                                is RohdServiceError) {
+                                              return Center(
+                                                child: Text(
+                                                    'Error: ${state.error}'),
+                                              );
+                                            } else {
+                                              return const Center(
+                                                child: Text('Unknown state'),
+                                              );
+                                            }
+                                          },
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                                ],
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  Positioned(
+                    right: 8,
+                    bottom: 8,
+                    child: ExportPngButton(
+                      onPressed: () => captureBoundaryToPng(
+                        context,
+                        boundaryKey: _treeBoundaryKey,
+                        filePrefix: 'module_tree',
                       ),
                     ),
-                  ],
-                ),
+                  ),
+                ]),
               ),
             ),
 
             // Signal Table Right Section Module
             SizedBox(
               width: screenSize.width / 2,
-              height: screenSize.width / 2.6,
               child: Card(
                 clipBehavior: Clip.antiAlias,
-                child: SingleChildScrollView(
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      const ModuleTreeDetailsNavbar(),
-                      Padding(
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const ModuleTreeDetailsNavbar(),
+                    Expanded(
+                      child: Padding(
                         padding: const EdgeInsets.only(left: 20, right: 20),
-                        child: SingleChildScrollView(
-                          scrollDirection: Axis.vertical,
-                          child: BlocBuilder<SelectedModuleCubit,
-                              SelectedModuleState>(
-                            builder: (context, state) {
-                              if (state is SelectedModuleLoaded) {
-                                final selectedModule = state.module;
-                                return SignalDetailsCard(
-                                  module: selectedModule,
-                                );
-                              } else {
-                                return const Center(
-                                  child: Text('No module selected'),
-                                );
-                              }
-                            },
-                          ),
+                        child: BlocBuilder<SelectedModuleCubit,
+                            SelectedModuleState>(
+                          builder: (context, state) {
+                            if (state is SelectedModuleLoaded) {
+                              final selectedModule = state.module;
+                              return SignalDetailsCard(
+                                module: selectedModule,
+                              );
+                            } else {
+                              return const Center(
+                                child: Text('No module selected'),
+                              );
+                            }
+                          },
                         ),
                       ),
-                    ],
-                  ),
+                    ),
+                  ],
                 ),
               ),
             ),
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/analysis_options.yaml b/rohd_devtools_extension/packages/rohd_devtools_widgets/analysis_options.yaml
new file mode 100644
index 000000000..572dd239d
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/analysis_options.yaml
@@ -0,0 +1 @@
+include: package:lints/recommended.yaml
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/rohd_devtools_widgets.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/rohd_devtools_widgets.dart
new file mode 100644
index 000000000..335b890d3
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/rohd_devtools_widgets.dart
@@ -0,0 +1,23 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// rohd_devtools_widgets.dart
+// Barrel file for the rohd_devtools_widgets package.
+// Combines help_api, export_png, and overlay_api into one package.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+// Help
+export 'src/markdown_help_button.dart';
+
+// Overlay
+export 'src/app_bar_overlay.dart';
+
+// PNG export
+export 'src/capture_boundary.dart';
+export 'src/export_button.dart';
+export 'src/export_toast.dart';
+export 'src/save_png_stub.dart'
+    if (dart.library.io) 'src/save_png_native.dart'
+    if (dart.library.js_interop) 'src/save_png_web.dart';
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/app_bar_overlay.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/app_bar_overlay.dart
new file mode 100644
index 000000000..ba210d5b2
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/app_bar_overlay.dart
@@ -0,0 +1,168 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// app_bar_overlay.dart
+// Auto-hiding overlay AppBar that slides in from the top edge.
+//
+// When [autoHide] is true, the bar slides out of view and reappears when
+// the mouse enters a thin trigger zone along the top edge.  When [autoHide]
+// is false the bar behaves like a normal AppBar (always visible, pushes
+// content down).
+//
+// Designed to be reusable across ROHD Wave Viewer, Schematic Viewer, etc.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:flutter/material.dart';
+
+/// Wraps a [body] widget and an [appBar] widget, where the AppBar
+/// auto-hides by sliding up when [autoHide] is true.
+///
+/// When [autoHide] is false the layout is a simple Column (AppBar + body),
+/// matching normal Scaffold behaviour.
+class AppBarOverlay extends StatefulWidget {
+  /// The AppBar-like widget to show/hide.
+  final PreferredSizeWidget appBar;
+
+  /// The main content below the AppBar.
+  final Widget body;
+
+  /// When true, the AppBar auto-hides and slides in on mouse hover.
+  /// When false, the AppBar is always visible.
+  final bool autoHide;
+
+  /// Height of the invisible trigger zone along the top edge (pixels).
+  final double triggerHeight;
+
+  /// Opacity of the overlay AppBar when shown (0.0–1.0).
+  final double panelOpacity;
+
+  /// Duration of the slide animation.
+  final Duration animationDuration;
+
+  const AppBarOverlay({
+    super.key,
+    required this.appBar,
+    required this.body,
+    this.autoHide = false,
+    this.triggerHeight = 12,
+    this.panelOpacity = 0.92,
+    this.animationDuration = const Duration(milliseconds: 200),
+  });
+
+  @override
+  State<AppBarOverlay> createState() => _AppBarOverlayState();
+}
+
+class _AppBarOverlayState extends State<AppBarOverlay>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+  late final Animation<Offset> _slideAnimation;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: widget.animationDuration,
+    );
+    _slideAnimation = Tween<Offset>(
+      begin: const Offset(0, -1), // fully off-screen above
+      end: Offset.zero,
+    ).animate(CurvedAnimation(
+      parent: _controller,
+      curve: Curves.easeOutCubic,
+      reverseCurve: Curves.easeInCubic,
+    ));
+
+    // If not auto-hiding, snap open.
+    if (!widget.autoHide) {
+      _controller.value = 1.0;
+    }
+  }
+
+  @override
+  void didUpdateWidget(covariant AppBarOverlay oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (!widget.autoHide && oldWidget.autoHide) {
+      // Switched from auto-hide → always visible: snap open.
+      _controller.forward();
+    } else if (widget.autoHide && !oldWidget.autoHide) {
+      // Switched from always visible → auto-hide: hide immediately.
+      _controller.reverse();
+    }
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  void _show() {
+    _controller.forward();
+  }
+
+  void _hide() {
+    if (!widget.autoHide) return;
+    _controller.reverse();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // ── When not auto-hiding, simple column layout ──
+    if (!widget.autoHide) {
+      return Column(
+        children: [
+          widget.appBar,
+          Expanded(child: widget.body),
+        ],
+      );
+    }
+
+    // ── Auto-hide mode: overlay with trigger zone ──
+    final appBarHeight =
+        widget.appBar.preferredSize.height + MediaQuery.of(context).padding.top;
+
+    return Stack(
+      fit: StackFit.expand,
+      children: [
+        // Body fills the entire area (no top inset — content goes edge-to-edge)
+        Positioned.fill(child: widget.body),
+
+        // Trigger zone: thin invisible strip along the top edge
+        Positioned(
+          left: 0,
+          right: 0,
+          top: 0,
+          height: widget.triggerHeight,
+          child: MouseRegion(
+            onEnter: (_) => _show(),
+            opaque: false, // let clicks through when AppBar is hidden
+            child: const SizedBox.expand(),
+          ),
+        ),
+
+        // Sliding overlay AppBar
+        Positioned(
+          left: 0,
+          right: 0,
+          top: 0,
+          height: appBarHeight,
+          child: SlideTransition(
+            position: _slideAnimation,
+            child: MouseRegion(
+              onEnter: (_) => _show(),
+              onExit: (_) => _hide(),
+              child: Opacity(
+                opacity: widget.panelOpacity,
+                child: widget.appBar,
+              ),
+            ),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/capture_boundary.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/capture_boundary.dart
new file mode 100644
index 000000000..4512ed207
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/capture_boundary.dart
@@ -0,0 +1,69 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// capture_boundary.dart
+// One-call RepaintBoundary → PNG export with toast feedback.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:math' as math;
+import 'dart:ui' as ui;
+
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart' show RenderRepaintBoundary;
+
+import 'package:rohd_devtools_widgets/rohd_devtools_widgets.dart' as export_png;
+
+/// Capture a [RepaintBoundary] identified by [boundaryKey], encode to PNG,
+/// save/download, and show a toast.
+///
+/// [filePrefix] is used as the first part of the file name
+/// (e.g. `"schematic"` → `schematic_1713052800000.png`).
+///
+/// Returns `true` if the export succeeded.
+Future<bool> captureBoundaryToPng(
+  BuildContext context, {
+  required GlobalKey boundaryKey,
+  String filePrefix = 'export',
+}) async {
+  final boundary =
+      boundaryKey.currentContext?.findRenderObject() as RenderRepaintBoundary?;
+  if (boundary == null) {
+    debugPrint('[ExportPng] No RepaintBoundary found');
+    return false;
+  }
+
+  final pixelRatio = math.min(
+    3.0,
+    MediaQuery.of(context).devicePixelRatio,
+  );
+  final image = await boundary.toImage(pixelRatio: pixelRatio);
+  final byteData = await image.toByteData(format: ui.ImageByteFormat.png);
+  image.dispose();
+
+  if (byteData == null) {
+    debugPrint('[ExportPng] Failed to encode PNG');
+    return false;
+  }
+
+  final pngBytes = byteData.buffer.asUint8List();
+  final fileName = '${filePrefix}_${DateTime.now().millisecondsSinceEpoch}.png';
+
+  try {
+    final savedPath = await export_png.savePngBytes(pngBytes, fileName);
+    final msg =
+        savedPath != null ? 'Saved: $savedPath' : 'Downloaded $fileName';
+    debugPrint('[ExportPng] $msg');
+    if (context.mounted) {
+      export_png.showExportToast(context, msg);
+    }
+    return true;
+  } on Object catch (e) {
+    debugPrint('[ExportPng] Export failed: $e');
+    if (context.mounted) {
+      export_png.showExportToast(context, 'Export failed: $e');
+    }
+    return false;
+  }
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_button.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_button.dart
new file mode 100644
index 000000000..2f93890ed
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_button.dart
@@ -0,0 +1,50 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// export_button.dart
+// Reusable camera-icon button for PNG export.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:flutter/material.dart';
+
+/// Small camera-icon button for triggering PNG export.
+///
+/// Designed to be placed in a [Positioned] overlay.  Calls [onPressed]
+/// when tapped.
+class ExportPngButton extends StatelessWidget {
+  final VoidCallback onPressed;
+  final String tooltip;
+
+  const ExportPngButton({
+    super.key,
+    required this.onPressed,
+    this.tooltip = 'Export as PNG',
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final cs = Theme.of(context).colorScheme;
+    return Tooltip(
+      message: tooltip,
+      child: Material(
+        color: cs.surface.withAlpha(200),
+        shape: const CircleBorder(),
+        elevation: 2,
+        child: InkWell(
+          customBorder: const CircleBorder(),
+          onTap: onPressed,
+          child: Padding(
+            padding: const EdgeInsets.all(8),
+            child: Icon(
+              Icons.camera_alt_outlined,
+              size: 20,
+              color: cs.onSurface,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_toast.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_toast.dart
new file mode 100644
index 000000000..e962a6dd0
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/export_toast.dart
@@ -0,0 +1,48 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// export_toast.dart
+// Overlay-based toast that works without a Scaffold ancestor.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+/// Show a brief floating toast at the bottom of the screen.
+///
+/// Works without a [Scaffold] ancestor by inserting directly into the
+/// root [Overlay].  Auto-removes after [duration].
+void showExportToast(
+  BuildContext context,
+  String message, {
+  Duration duration = const Duration(seconds: 3),
+}) {
+  final overlay = Overlay.of(context, rootOverlay: true);
+  late OverlayEntry entry;
+  entry = OverlayEntry(
+    builder: (ctx) => Positioned(
+      bottom: 32,
+      left: 0,
+      right: 0,
+      child: Center(
+        child: Material(
+          elevation: 4,
+          borderRadius: BorderRadius.circular(8),
+          color: Colors.grey.shade800,
+          child: Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 10),
+            child: Text(
+              message,
+              style: const TextStyle(color: Colors.white, fontSize: 13),
+            ),
+          ),
+        ),
+      ),
+    ),
+  );
+  overlay.insert(entry);
+  Timer(duration, entry.remove);
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/markdown_help_button.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/markdown_help_button.dart
new file mode 100644
index 000000000..713e6b0f1
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/markdown_help_button.dart
@@ -0,0 +1,486 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// markdown_help_button.dart
+// A generic help button driven by a markdown asset file.
+//
+// The markdown file contains two sections separated by <!-- details -->:
+//   - Above the marker: plain-text tooltip shown on hover
+//   - Below the marker: markdown rendered in the click-open dialog
+//
+// The markdown file is also directly viewable in any markdown previewer
+// (GitHub, VS Code, etc.) because both sections are valid markdown and
+// the <!-- details --> separator is an invisible HTML comment.
+//
+// Details section format:
+//   ## Heading           → section heading
+//   | Key | Description | → key–description entry row (markdown table)
+//   Paragraphs           → plain-text description
+//
+// 2026 March
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart' show rootBundle;
+
+/// A help button that loads its content from a markdown asset file.
+///
+/// The markdown file must contain a `<!-- tooltip -->` marker and a
+/// `<!-- details -->` marker. Text between those markers becomes the
+/// hover tooltip; text after `<!-- details -->` is rendered as the
+/// click-open dialog body.
+///
+/// The first line of the file (an `# H1` heading) is used as the dialog
+/// title. Everything before `<!-- tooltip -->` is ignored at runtime
+/// (it serves as the visible title when previewing the raw markdown).
+///
+/// ### Markdown file layout
+///
+/// ```markdown
+/// # 🌳 My Tool — Help          ← dialog title (H1)
+///
+/// <!-- tooltip -->
+///
+/// Short keybinding summary      ← hover tooltip (plain text)
+/// shown on mouse hover.
+///
+/// <!-- details -->
+///
+/// ## Section                    ← dialog section heading
+///
+/// | Key | Description |         ← table header (required before rows)
+/// |-----|-------------|
+/// | F   | Fit to canvas |       ← key–description entry
+///
+/// Any paragraph text.           ← rendered as body text
+/// ```
+class MarkdownHelpButton extends StatefulWidget {
+  /// Path to the markdown asset file (e.g. `assets/help/my_help.md`).
+  final String assetPath;
+
+  /// Whether the current theme is dark mode.
+  final bool isDark;
+
+  /// Optional override for the button label (defaults to `❓`).
+  final String label;
+
+  /// Optional widget to use as the button icon instead of [label].
+  ///
+  /// When non-null, this widget is displayed instead of `Text(label)`.
+  /// Use this on platforms where the emoji [label] would not render
+  /// (e.g. Linux without NotoColorEmoji), passing an `Icon(Icons.help_outline)`
+  /// or similar Material icon.
+  final Widget? labelIcon;
+
+  /// Optional package name that owns the asset.
+  ///
+  /// When non-null the actual asset path becomes
+  /// `packages/$package/$assetPath`, which is how Flutter resolves assets
+  /// declared in dependency packages.
+  final String? package;
+
+  /// Optional widget shown before the dialog title text.
+  ///
+  /// Use this to display a custom icon (e.g. a `CustomPaint` widget)
+  /// next to the dialog title instead of relying on emoji characters
+  /// that may not render on all platforms.
+  final Widget? titleIcon;
+
+  /// Optional text substitutions applied to the markdown before parsing.
+  ///
+  /// Each key `K` replaces all occurrences of `{{K}}` in the raw markdown
+  /// with the corresponding value.  For example:
+  /// ```dart
+  /// substitutions: {'VERSION': '1.2.3'}
+  /// ```
+  /// will replace `{{VERSION}}` → `1.2.3` in the loaded asset.
+  final Map<String, String>? substitutions;
+
+  /// Create a [MarkdownHelpButton].
+  const MarkdownHelpButton({
+    required this.assetPath,
+    required this.isDark,
+    this.label = '❓',
+    this.labelIcon,
+    this.package,
+    this.titleIcon,
+    this.substitutions,
+    super.key,
+  });
+
+  @override
+  State<MarkdownHelpButton> createState() => _MarkdownHelpButtonState();
+}
+
+class _MarkdownHelpButtonState extends State<MarkdownHelpButton> {
+  /// Parsed help content, loaded once from the asset.
+  _HelpContent? _content;
+
+  @override
+  void initState() {
+    super.initState();
+    _loadContent();
+  }
+
+  @override
+  void didUpdateWidget(MarkdownHelpButton oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.assetPath != widget.assetPath ||
+        oldWidget.package != widget.package) {
+      _loadContent();
+    }
+  }
+
+  Future<void> _loadContent() async {
+    try {
+      String raw;
+      if (widget.package != null) {
+        // Try the package-qualified path first (works when embedded as a
+        // dependency in a host app), then fall back to the bare asset path
+        // (standalone mode). This order avoids a spurious 404 on the web
+        // when the bare path doesn't exist.
+        // Use catch-all because rootBundle.loadString throws FlutterError
+        // (an Error, not Exception) when the asset is missing.
+        try {
+          raw = await rootBundle
+              .loadString('packages/${widget.package}/${widget.assetPath}');
+          // ignore: avoid_catches_without_on_clauses
+        } catch (_) {
+          raw = await rootBundle.loadString(widget.assetPath);
+        }
+      } else {
+        raw = await rootBundle.loadString(widget.assetPath);
+      }
+      // Apply substitutions before parsing.
+      final subs = widget.substitutions;
+      if (subs != null) {
+        for (final entry in subs.entries) {
+          raw = raw.replaceAll('{{${entry.key}}}', entry.value);
+        }
+      }
+      if (mounted) {
+        setState(() {
+          _content = _HelpContent.parse(raw);
+        });
+      }
+      // ignore: avoid_catches_without_on_clauses
+    } catch (e) {
+      debugPrint('Failed to load help asset: $e');
+      if (mounted) {
+        setState(() {
+          _content = _HelpContent.parse(
+            '# Help unavailable\n\n<!-- tooltip -->\n\n'
+            'Help content could not be loaded.\n\n<!-- details -->\n\n'
+            'Error: $e',
+          );
+        });
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final isDark = widget.isDark;
+    final tooltip = _content?.tooltip ?? 'Loading help…';
+
+    return Tooltip(
+      message: tooltip,
+      decoration: BoxDecoration(
+        color: isDark ? const Color(0xFF1E1E1E) : const Color(0xFFF5F5F5),
+        borderRadius: BorderRadius.circular(8),
+        border: Border.all(
+          color: isDark ? Colors.white24 : Colors.black12,
+        ),
+        boxShadow: [
+          BoxShadow(
+            color: Colors.black.withValues(alpha: isDark ? 0.4 : 0.15),
+            blurRadius: 8,
+            offset: const Offset(0, 2),
+          ),
+        ],
+      ),
+      textStyle: TextStyle(
+        fontSize: 12,
+        fontFamily: 'monospace',
+        color: isDark ? Colors.white : Colors.black87,
+        height: 1.4,
+      ),
+      child: MouseRegion(
+        cursor: SystemMouseCursors.click,
+        child: GestureDetector(
+          onTap: () {
+            if (_content != null) {
+              _showHelpDialog(context, _content!,
+                  isDark: isDark, titleIcon: widget.titleIcon);
+            }
+          },
+          child: Padding(
+            padding: const EdgeInsets.all(8),
+            child: widget.labelIcon ??
+                Text(widget.label,
+                    style: const TextStyle(fontSize: 18, inherit: false)),
+          ),
+        ),
+      ),
+    );
+  }
+
+  /// Show the help dialog with parsed markdown content.
+  static void _showHelpDialog(
+    BuildContext context,
+    _HelpContent content, {
+    required bool isDark,
+    Widget? titleIcon,
+  }) {
+    final bgColor = isDark ? const Color(0xFF252526) : Colors.white;
+    final fgColor = isDark ? Colors.white : Colors.black87;
+    final headingColor = isDark ? Colors.blue[200]! : Colors.blue[800]!;
+    final keyColor = isDark ? Colors.amber[200]! : Colors.amber[900]!;
+    final dividerColor = isDark ? Colors.white24 : Colors.black12;
+
+    final widgets = <Widget>[];
+    for (final block in content.detailBlocks) {
+      if (block is _HeadingBlock) {
+        widgets.add(Padding(
+          padding: const EdgeInsets.only(top: 16, bottom: 4),
+          child: Text(block.text,
+              style: TextStyle(
+                fontSize: 15,
+                fontWeight: FontWeight.bold,
+                color: headingColor,
+              )),
+        ));
+      } else if (block is _EntryBlock) {
+        widgets.add(Padding(
+          padding: const EdgeInsets.symmetric(vertical: 2),
+          child: Row(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              SizedBox(
+                width: 200,
+                child: Text(block.key,
+                    style: TextStyle(
+                      fontFamily: 'monospace',
+                      fontSize: 13,
+                      color: keyColor,
+                    )),
+              ),
+              Expanded(
+                child: Text(block.description,
+                    style: TextStyle(fontSize: 13, color: fgColor)),
+              ),
+            ],
+          ),
+        ));
+      } else if (block is _ParagraphBlock) {
+        widgets.add(Padding(
+          padding: const EdgeInsets.symmetric(vertical: 4),
+          child:
+              Text(block.text, style: TextStyle(fontSize: 13, color: fgColor)),
+        ));
+      }
+    }
+
+    showDialog<void>(
+      context: context,
+      builder: (ctx) => Dialog(
+        backgroundColor: bgColor,
+        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+        child: ConstrainedBox(
+          constraints: const BoxConstraints(maxWidth: 600, maxHeight: 600),
+          child: Padding(
+            padding: const EdgeInsets.all(24),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // Title row
+                Row(
+                  children: [
+                    if (titleIcon != null) ...[
+                      titleIcon,
+                      const SizedBox(width: 10),
+                    ],
+                    Expanded(
+                      child: Text(content.title,
+                          style: TextStyle(
+                            fontSize: 18,
+                            fontWeight: FontWeight.bold,
+                            color: fgColor,
+                          )),
+                    ),
+                    IconButton(
+                      icon: Icon(Icons.close, color: fgColor, size: 20),
+                      onPressed: () => Navigator.of(ctx).pop(),
+                    ),
+                  ],
+                ),
+                Divider(color: dividerColor),
+                // Scrollable content
+                Flexible(
+                  child: SingleChildScrollView(
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: widgets,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+// ---------------------------------------------------------------------------
+// Parsed help content model
+// ---------------------------------------------------------------------------
+
+/// Parsed representation of a help markdown file.
+class _HelpContent {
+  /// Dialog title (from the `# H1` heading).
+  final String title;
+
+  /// Plain-text tooltip (between `<!-- tooltip -->` and `<!-- details -->`).
+  final String tooltip;
+
+  /// Parsed detail blocks (headings, entries, paragraphs).
+  final List<_DetailBlock> detailBlocks;
+
+  _HelpContent({
+    required this.title,
+    required this.tooltip,
+    required this.detailBlocks,
+  });
+
+  /// Parse a raw markdown string into [_HelpContent].
+  factory _HelpContent.parse(String raw) {
+    const tooltipMarker = '<!-- tooltip -->';
+    const detailsMarker = '<!-- details -->';
+
+    final tooltipIdx = raw.indexOf(tooltipMarker);
+    final detailsIdx = raw.indexOf(detailsMarker);
+
+    // Extract title from the first # heading.
+    String title = 'Help';
+    final titleMatch = RegExp(r'^#\s+(.+)$', multiLine: true).firstMatch(raw);
+    if (titleMatch != null) {
+      title = titleMatch.group(1)!.trim();
+    }
+
+    // Extract tooltip text.
+    String tooltip = '';
+    if (tooltipIdx >= 0 && detailsIdx > tooltipIdx) {
+      tooltip =
+          raw.substring(tooltipIdx + tooltipMarker.length, detailsIdx).trim();
+    }
+
+    // Parse detail blocks.
+    final detailBlocks = <_DetailBlock>[];
+    if (detailsIdx >= 0) {
+      final detailsRaw = raw.substring(detailsIdx + detailsMarker.length);
+      detailBlocks.addAll(_parseDetails(detailsRaw));
+    }
+
+    return _HelpContent(
+      title: title,
+      tooltip: tooltip,
+      detailBlocks: detailBlocks,
+    );
+  }
+
+  /// Parse the details section into blocks.
+  static List<_DetailBlock> _parseDetails(String raw) {
+    final blocks = <_DetailBlock>[];
+    final lines = raw.split('\n');
+
+    for (int i = 0; i < lines.length; i++) {
+      final line = lines[i];
+      final trimmed = line.trim();
+
+      // Skip empty lines
+      if (trimmed.isEmpty) {
+        continue;
+      }
+
+      // ## Heading
+      if (trimmed.startsWith('## ')) {
+        blocks.add(_HeadingBlock(trimmed.substring(3).trim()));
+        continue;
+      }
+
+      // Table separator row (|---|---|) — skip
+      if (RegExp(r'^\|[\s\-:|]+\|$').hasMatch(trimmed)) {
+        continue;
+      }
+
+      // Table header row (| Key | Description |) — skip
+      if (trimmed.startsWith('|') &&
+          trimmed.endsWith('|') &&
+          i + 1 < lines.length &&
+          RegExp(r'^\|[\s\-:|]+\|$').hasMatch(lines[i + 1].trim())) {
+        continue;
+      }
+
+      // Table data row (| key | description |)
+      if (trimmed.startsWith('|') && trimmed.endsWith('|')) {
+        final cells = trimmed
+            .substring(1, trimmed.length - 1) // strip outer pipes
+            .split('|')
+            .map((c) => c.trim())
+            .toList();
+        if (cells.length >= 2) {
+          blocks.add(_EntryBlock(
+            key: _stripInlineCode(cells[0]),
+            description: cells[1],
+          ));
+          continue;
+        }
+      }
+
+      // Plain paragraph text (collect consecutive non-empty lines)
+      final para = StringBuffer(trimmed);
+      while (i + 1 < lines.length && lines[i + 1].trim().isNotEmpty) {
+        final next = lines[i + 1].trim();
+        // Stop at headings, table rows, or markers
+        if (next.startsWith('## ') ||
+            next.startsWith('|') ||
+            next.startsWith('<!--')) {
+          break;
+        }
+        i++;
+        para.write(' ${lines[i].trim()}');
+      }
+      blocks.add(_ParagraphBlock(para.toString()));
+    }
+
+    return blocks;
+  }
+
+  /// Strip backtick inline code markers: `text` → text.
+  static String _stripInlineCode(String s) => s.replaceAll('`', '');
+}
+
+// ---------------------------------------------------------------------------
+// Detail block types
+// ---------------------------------------------------------------------------
+
+sealed class _DetailBlock {}
+
+class _HeadingBlock extends _DetailBlock {
+  final String text;
+  _HeadingBlock(this.text);
+}
+
+class _EntryBlock extends _DetailBlock {
+  final String key;
+  final String description;
+  _EntryBlock({required this.key, required this.description});
+}
+
+class _ParagraphBlock extends _DetailBlock {
+  final String text;
+  _ParagraphBlock(this.text);
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_native.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_native.dart
new file mode 100644
index 000000000..98f0aac5f
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_native.dart
@@ -0,0 +1,20 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// save_png_native.dart
+// Native (Linux/macOS/Windows) implementation: saves PNG bytes to a file.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:io';
+import 'dart:typed_data';
+
+/// Save [pngBytes] to a file named [fileName] in the current directory.
+/// Returns the absolute path of the saved file.
+Future<String?> savePngBytes(Uint8List pngBytes, String fileName) async {
+  final dir = Directory.current.path;
+  final filePath = '$dir/$fileName';
+  await File(filePath).writeAsBytes(pngBytes);
+  return filePath;
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_stub.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_stub.dart
new file mode 100644
index 000000000..1f063d2be
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_stub.dart
@@ -0,0 +1,14 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// save_png_stub.dart
+// Stub for conditional import — never actually imported at runtime.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:typed_data';
+
+/// Stub — always throws.
+Future<String?> savePngBytes(Uint8List pngBytes, String fileName) =>
+    throw UnsupportedError('savePngBytes not supported on this platform');
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_web.dart b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_web.dart
new file mode 100644
index 000000000..5b0b9221e
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/lib/src/save_png_web.dart
@@ -0,0 +1,32 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// save_png_web.dart
+// Web implementation: triggers browser download of PNG bytes.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:js_interop';
+import 'dart:typed_data';
+
+import 'package:web/web.dart' as web;
+
+/// Trigger a browser download of [pngBytes] as [fileName].
+/// Returns `null` (no file path on web).
+Future<String?> savePngBytes(Uint8List pngBytes, String fileName) async {
+  final blob = web.Blob(
+    [pngBytes.toJS].toJS,
+    web.BlobPropertyBag(type: 'image/png'),
+  );
+  final url = web.URL.createObjectURL(blob);
+  final anchor = web.HTMLAnchorElement()
+    ..href = url
+    ..download = fileName
+    ..style.display = 'none';
+  web.document.body!.append(anchor);
+  anchor.click();
+  anchor.remove();
+  web.URL.revokeObjectURL(url);
+  return null;
+}
diff --git a/rohd_devtools_extension/packages/rohd_devtools_widgets/pubspec.yaml b/rohd_devtools_extension/packages/rohd_devtools_widgets/pubspec.yaml
new file mode 100644
index 000000000..264a6ac59
--- /dev/null
+++ b/rohd_devtools_extension/packages/rohd_devtools_widgets/pubspec.yaml
@@ -0,0 +1,13 @@
+name: rohd_devtools_widgets
+description: "Shared widgets for ROHD DevTools sub-packages: help button, PNG export, auto-hiding overlay."
+version: 0.1.0
+publish_to: none
+environment:
+  sdk: '>=3.4.0 <4.0.0'
+  flutter: '>=3.0.0'
+dependencies:
+  flutter: {sdk: flutter}
+  web: ^1.0.0
+dev_dependencies:
+  flutter_test: {sdk: flutter}
+  lints: ^5.0.0
diff --git a/rohd_devtools_extension/pubspec.yaml b/rohd_devtools_extension/pubspec.yaml
index 0aa366e78..761a09043 100644
--- a/rohd_devtools_extension/pubspec.yaml
+++ b/rohd_devtools_extension/pubspec.yaml
@@ -16,12 +16,15 @@ dependencies:
   rohd:
     path: ../../rohd
   # devtools_shared: ^6.0.0
-  devtools_extensions: ^0.3.0
-  devtools_app_shared: ^0.3.0
-  vm_service: ^14.0.0
+  devtools_extensions: ^0.5.0
+  devtools_app_shared: ^0.5.0
+  vm_service: ^14.3.1
   flutter_simple_treeview: ^3.0.2
   equatable: ^2.0.5
   flutter_bloc: ^9.0.0
+  web: ^1.0.0
+  rohd_devtools_widgets:
+    path: packages/rohd_devtools_widgets
 
 dev_dependencies:
   flutter_test:
@@ -29,8 +32,10 @@ dev_dependencies:
   flutter_lints: ^3.0.1
   build_runner: ^2.4.7
   mocktail: ^1.0.2
-  bloc_lint: ^0.1.0
+  bloc_lint: ^0.3.7
   
 flutter:
   uses-material-design: true
+  assets:
+    - assets/help/
 
diff --git a/test/instance_signal_name_collision_test.dart b/test/instance_signal_name_collision_test.dart
new file mode 100644
index 000000000..65747204a
--- /dev/null
+++ b/test/instance_signal_name_collision_test.dart
@@ -0,0 +1,87 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// instance_signal_name_collision_test.dart
+// Tests that submodule instance names and signal names share a single
+// namespace, so a collision between them results in uniquification.
+//
+// 2026 April 18
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:rohd/rohd.dart';
+import 'package:rohd/src/synthesizers/utilities/utilities.dart';
+import 'package:test/test.dart';
+
+// ── Minimal repro modules ────────────────────────────────────────────────────
+
+/// Leaf module whose default instance name is "inner".
+class _Inner extends Module {
+  _Inner(Logic a) : super(name: 'inner') {
+    a = addInput('a', a, width: a.width);
+    addOutput('y', width: a.width) <= a;
+  }
+}
+
+/// Parent module that:
+///   • instantiates [_Inner] (default instance name: "inner")
+///   • names an internal wire "inner" as well
+///
+/// Because both identifiers live in a single shared namespace, one of them
+/// will be suffixed to avoid collision.
+class _CollidingParent extends Module {
+  _CollidingParent(Logic a) : super(name: 'colliding_parent') {
+    a = addInput('a', a, width: a.width);
+
+    // Internal wire explicitly named "inner".
+    final inner = Logic(name: 'inner', width: a.width, naming: Naming.reserved)
+      ..gets(a);
+
+    // Submodule whose uniqueInstanceName will also be "inner".
+    final sub = _Inner(inner);
+
+    addOutput('y', width: a.width) <= sub.output('y');
+  }
+}
+
+// ── Test ─────────────────────────────────────────────────────────────────────
+
+void main() {
+  group('instance / signal name collision (shared namespace)', () {
+    late _CollidingParent mod;
+    late SynthModuleDefinition def;
+
+    setUpAll(() async {
+      mod = _CollidingParent(Logic(width: 8));
+      await mod.build();
+      def = SynthModuleDefinition(mod);
+    });
+
+    test('internal signal named "inner" retains its exact name', () {
+      // The reserved signal should keep its exact name.
+      final sl = def.internalSignals.cast<SynthLogic?>().firstWhere(
+            (s) => s!.logics.any((l) => l.name == 'inner'),
+            orElse: () => null,
+          );
+      expect(sl, isNotNull, reason: 'Expected to find SynthLogic for "inner"');
+      expect(sl!.name, 'inner',
+          reason: 'Reserved signal "inner" must keep its exact name');
+    });
+
+    test(
+        'submodule instance is uniquified because signal '
+        '"inner" already claimed the name', () {
+      final inst = def.subModuleInstantiations
+          .where((s) => s.needsInstantiation)
+          .cast<SynthSubModuleInstantiation?>()
+          .firstWhere(
+            (s) => s!.module.name == 'inner',
+            orElse: () => null,
+          );
+      expect(inst, isNotNull, reason: 'Expected submodule instance for inner');
+      // The instance should be suffixed since the signal took "inner" first.
+      expect(inst!.name, isNot('inner'),
+          reason: 'Instance should be uniquified when signal already '
+              'claims "inner"');
+    });
+  });
+}
diff --git a/test/module_services_test.dart b/test/module_services_test.dart
new file mode 100644
index 000000000..f8994577e
--- /dev/null
+++ b/test/module_services_test.dart
@@ -0,0 +1,132 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// module_services_test.dart
+// Unit tests for ModuleServices and SvService.
+//
+// 2026 April 25
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:rohd/rohd.dart';
+import 'package:test/test.dart';
+
+class SimpleModule extends Module {
+  SimpleModule(Logic a) : super(name: 'simple') {
+    a = addInput('a', a);
+    addOutput('b') <= ~a;
+  }
+}
+
+void main() {
+  tearDown(ModuleServices.instance.reset);
+
+  group('ModuleServices', () {
+    test('rootModule is set after build', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      expect(ModuleServices.instance.rootModule, equals(mod));
+    });
+
+    test('hierarchyJSON returns valid JSON', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final json = ModuleServices.instance.hierarchyJSON;
+      expect(() => jsonDecode(json), returnsNormally);
+    });
+
+    test('inspectorJSON matches hierarchyJSON', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      expect(ModuleServices.instance.inspectorJSON,
+          equals(ModuleServices.instance.hierarchyJSON));
+    });
+
+    test('svJSON returns unavailable when no service registered', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final result =
+          jsonDecode(ModuleServices.instance.svJSON) as Map<String, dynamic>;
+      expect(result['status'], equals('unavailable'));
+    });
+
+    test('reset clears all services', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      expect(ModuleServices.instance.rootModule, isNotNull);
+      ModuleServices.instance.reset();
+      expect(ModuleServices.instance.rootModule, isNull);
+      expect(ModuleServices.instance.svService, isNull);
+    });
+  });
+
+  group('SvService', () {
+    test('registers with ModuleServices on creation', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final sv = SvService(mod);
+      expect(ModuleServices.instance.svService, equals(sv));
+    });
+
+    test('allContents is non-empty', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final sv = SvService(mod);
+      expect(sv.allContents, isNotEmpty);
+    });
+
+    test('contentsByName has entries', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final sv = SvService(mod);
+      expect(sv.contentsByName, isNotEmpty);
+    });
+
+    test('contentsByDefinitionName has entries', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final sv = SvService(mod);
+      expect(sv.contentsByDefinitionName, isNotEmpty);
+      expect(sv.contentsByDefinitionName.containsKey('SimpleModule'), isTrue);
+    });
+
+    test('svJSON returns valid JSON after registration', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      SvService(mod);
+      final result =
+          jsonDecode(ModuleServices.instance.svJSON) as Map<String, dynamic>;
+      expect(result['modules'], isList);
+    });
+
+    test('writeFiles creates SV files', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      final sv = SvService(mod);
+      final dir = Directory.systemTemp.createTempSync('sv_test_');
+      try {
+        sv.writeFiles(dir.path);
+        final files = dir.listSync().whereType<File>().toList();
+        expect(files, isNotEmpty);
+        expect(files.any((f) => f.path.endsWith('.sv')), isTrue);
+      } finally {
+        dir.deleteSync(recursive: true);
+      }
+    });
+
+    test('register false does not register', () async {
+      final mod = SimpleModule(Logic());
+      await mod.build();
+      ModuleServices.instance.reset();
+      SvService(mod, register: false);
+      expect(ModuleServices.instance.svService, isNull);
+    });
+
+    test('throws if module not built', () {
+      final mod = SimpleModule(Logic());
+      expect(() => SvService(mod), throwsException);
+    });
+  });
+}
diff --git a/test/name_test.dart b/test/name_test.dart
index 2742c0ec8..bde8a9c9f 100644
--- a/test/name_test.dart
+++ b/test/name_test.dart
@@ -1,7 +1,7 @@
-// Copyright (C) 2023-2024 Intel Corporation
+// Copyright (C) 2023-2026 Intel Corporation
 // SPDX-License-Identifier: BSD-3-Clause
 //
-// definition_name_test.dart
+// name_test.dart
 // Tests for definition names (including reserving them) of Modules.
 //
 // 2022 March 7
@@ -136,6 +136,11 @@ void main() {
         final nameTypes = [nameType1, nameType2];
 
         // skip ones that actually *should* cause a failure
+        //
+        // Note: SystemVerilog allows using the same identifier for a signal
+        // and an instance because they are different namespaces.  However,
+        // Icarus Verilog rejects that pattern, so ROHD treats those as
+        // conflicts for simulator compatibility.
         final shouldConflict = [
           {
             NameType.internalModuleDefinition,
diff --git a/test/naming_cases_test.dart b/test/naming_cases_test.dart
new file mode 100644
index 000000000..fbc1d9536
--- /dev/null
+++ b/test/naming_cases_test.dart
@@ -0,0 +1,583 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// naming_cases_test.dart
+// Systematic test of all signal-naming cases in the synthesis pipeline.
+//
+// 2026 April 10
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+// ════════════════════════════════════════════════════════
+// NAMING CROSS-PRODUCT TABLE
+// ════════════════════════════════════════════════════════
+//
+// Axis 1 — Naming enum (set at Logic construction time):
+//   reserved    Exact name required; collision → exception.
+//   renameable  Keeps name, uniquified on collision; never merged.
+//   mergeable   May merge with equivalent signals; any merged name chosen.
+//   unnamed     No user name; system generates one.
+//
+// Axis 2 — Context role (per SynthModuleDefinition):
+//   this-port   Port of module being synthesized
+//               (namingOverride → reserved).
+//   sub-port    Port of a child submodule
+//               (namingOverride → mergeable).
+//   internal    Non-port signal inside the module (no override).
+//   const       Const object (separate path via constValue).
+//
+// Axis 3 — Name preference:
+//   preferred     baseName does NOT start with '_'
+//   unpreferred   baseName starts with '_'
+//
+// Axis 4 — Constant context (only for Const):
+//   allowed       Literal value string used as name.
+//   disallowed    Feeding expressionlessInput;
+//                 must use a wire name.
+//
+// ──────────────────────────────────────────────────────
+// Row  Naming       Context   Pref?  Test  Valid?
+//      Effective class → Outcome
+// ──────────────────────────────────────────────────────
+//  1   reserved     this-port  pref    T1    ✓
+//      port (in _portLogics) → exact sanitized name
+//  2   reserved     this-port  unpref  T2    ✓ unusual
+//      port → exact _-prefixed port name
+//  3   reserved     sub-port   pref    T3    ✓
+//      preferred mergeable → merged, uniquified
+//  4   reserved     sub-port   unpref  T4    ✓
+//      unpreferred mergeable → low-priority merge
+//  5   reserved     internal   pref    T5    ✓
+//      reserved internal → exact name, throw on clash
+//  6   reserved     internal   unpref  T6    ✓ unusual
+//      reserved internal → exact _-prefixed name
+//  7   renameable   this-port  pref    —     can't happen*
+//      port → exact port name
+//  8   renameable   sub-port   pref    —     can't happen*
+//      preferred mergeable → merged
+//  9   renameable   internal   pref    T9    ✓
+//      renameable → base name, uniquified
+// 10   renameable   internal   unpref  T10   ✓ unusual
+//      renameable → uniquified _-prefixed
+// 11   mergeable    this-port  pref    T11   ✓
+//      port → exact port name (Logic.port())
+// 12   mergeable    this-port  unpref  T12   ✓ unusual
+//      port → exact _-prefixed port name
+// 13   mergeable    sub-port   pref    T3    ✓ (=row 3)
+//      preferred mergeable → best-available merge
+// 14   mergeable    sub-port   unpref  T4    ✓ (=row 4)
+//      unpreferred mergeable → low-priority merge
+// 15   mergeable    internal   pref    T15   ✓
+//      preferred mergeable → prefer available name
+// 16   mergeable    internal   unpref  T16   ✓
+//      unpreferred mergeable → low-priority merge
+// 17   unnamed      this-port  —       —     ✗ impossible**
+//      port → exact port name
+// 18   unnamed      sub-port   —       —     ✗ impossible**
+//      mergeable → merged
+// 19   unnamed      internal   (unpf)  T19   ✓
+//      unnamed → generated _s name
+// 20   —(Const)     —          —       T20   ✓
+//      const allowed → literal value e.g. 8'h42
+// 21   —(Const)     —          —       T21   ✓
+//      const disallowed → wire name (not literal)
+// ──────────────────────────────────────────────────────
+//
+//  *  Rows 7-8: addInput/addOutput always create
+//     Logic with Naming.reserved, so a port can
+//     never have intrinsic Naming.renameable.
+//     The namingOverride makes it moot anyway.
+//
+//  ** Rows 17-18: addInput/addOutput require a
+//     non-null, non-empty name. chooseName() only
+//     yields Naming.unnamed for null/empty names,
+//     so a port can never be unnamed.
+//
+//  ✗  unnamed + reserved: Logic(naming: reserved)
+//     with null/empty name throws
+//     NullReservedNameException /
+//     EmptyReservedNameException at construction
+//     time.  Never reaches synthesizer.
+//
+// Additional cross-cutting concerns:
+//   COL   Collision between mergeables
+//         → uniquified suffix (_0)
+//   MG    Merge: directly-connected signals
+//         share SynthLogic
+//   INST  Submodule instance names: unique,
+//         don't collide with ports
+//   ST    Structure element: structureName
+//         = "parent.field" → sanitized ("_")
+//   AR    Array element: isArrayMember
+//         → uses logic.name (index-based)
+//
+// ════════════════════════════════════════════════════════
+
+import 'package:rohd/rohd.dart';
+import 'package:rohd/src/synthesizers/utilities/utilities.dart';
+import 'package:test/test.dart';
+
+// ── Leaf sub-modules ──────────────────────────────
+
+/// A leaf module whose `in0` is an "expressionless input" —
+/// meaning any constant driving it must get a real wire name, not a literal.
+class _ExpressionlessSub extends Module with SystemVerilog {
+  @override
+  List<String> get expressionlessInputs => const ['in0'];
+
+  _ExpressionlessSub(Logic a, Logic b) : super(name: 'exprsub') {
+    a = addInput('in0', a, width: a.width);
+    b = addInput('in1', b, width: b.width);
+    addOutput('out', width: a.width) <= a & b;
+  }
+}
+
+/// A simple sub-module with preferred-name ports.
+class _SimpleSub extends Module {
+  _SimpleSub(Logic x) : super(name: 'simplesub') {
+    x = addInput('x', x, width: x.width);
+    addOutput('y', width: x.width) <= ~x;
+  }
+}
+
+/// A sub-module with an unpreferred-name port.
+class _UnprefSub extends Module {
+  _UnprefSub(Logic a) : super(name: 'unprefsub') {
+    a = addInput('_uport', a, width: a.width);
+    addOutput('uout', width: a.width) <= ~a;
+  }
+}
+
+// ── Main test module ──────────────────────────────
+// One module that exercises every valid naming case in a minimal design.
+// Each signal is tagged with the row number from the table above.
+
+class _AllNamingCases extends Module {
+  // Exposed for test inspection.
+  // Row 1 / Row 2: ports (accessed via mod.input / mod.output).
+  // Row 5:
+  late final Logic reservedInternal;
+  // Row 6:
+  late final Logic reservedInternalUnpref;
+  // Row 9:
+  late final Logic renameableInternal;
+  // Row 10:
+  late final Logic renameableInternalUnpref;
+  // Row 15:
+  late final Logic mergeablePref;
+  // Row 15 collision partner:
+  late final Logic mergeablePrefCollide;
+  // Row 16:
+  late final Logic mergeableUnpref;
+  // Row 19:
+  late final Logic unnamed;
+  // Row 20:
+  late final Logic constAllowed;
+  // Row 21:
+  late final Logic constDisallowed;
+  // MG:
+  late final Logic mergeTarget;
+
+  // Structure/array elements (ST, AR):
+  late final LogicStructure structPort;
+  late final LogicArray arrayPort;
+
+  _AllNamingCases() : super(name: 'allcases') {
+    // ── Row 1: reserved + this-port + preferred ──────────────────
+    final inp = addInput('inp', Logic(width: 8), width: 8);
+    final out = addOutput('out', width: 8);
+
+    // ── Row 2: reserved + this-port + unpreferred ────────────────
+    final uInp = addInput('_uinp', Logic(width: 8), width: 8);
+
+    // ── Row 11: mergeable + this-port + preferred ────────────────
+    // (This is the Logic.port() → connectIO path.  addInput forces
+    //  Naming.reserved regardless of the source's naming, so intrinsic
+    //  mergeable is overridden to reserved.  We test the port keeps its
+    //  exact name.)
+    final mPortInp = addInput('mport', Logic(width: 8), width: 8);
+
+    // ── Row 12: mergeable + this-port + unpreferred ──────────────
+    final mPortUnpref = addInput('_muprt', Logic(width: 8), width: 8);
+
+    // ── Row 5: reserved + internal + preferred ───────────────────
+    reservedInternal = Logic(name: 'resv', width: 8, naming: Naming.reserved)
+      ..gets(inp ^ Const(0x01, width: 8));
+
+    // ── Row 6: reserved + internal + unpreferred ─────────────────
+    reservedInternalUnpref =
+        Logic(name: '_resvu', width: 8, naming: Naming.reserved)
+          ..gets(inp ^ Const(0x02, width: 8));
+
+    // ── Row 9: renameable + internal + preferred ─────────────────
+    renameableInternal = Logic(name: 'ren', width: 8, naming: Naming.renameable)
+      ..gets(inp ^ Const(0x03, width: 8));
+
+    // ── Row 10: renameable + internal + unpreferred ──────────────
+    renameableInternalUnpref =
+        Logic(name: '_renu', width: 8, naming: Naming.renameable)
+          ..gets(inp ^ Const(0x04, width: 8));
+
+    // ── Row 15: mergeable + internal + preferred ─────────────────
+    mergeablePref = Logic(name: 'mname', width: 8, naming: Naming.mergeable)
+      ..gets(inp ^ Const(0x05, width: 8));
+
+    // ── COL: collision partner — same base name 'mname' ──────────
+    mergeablePrefCollide =
+        Logic(name: 'mname', width: 8, naming: Naming.mergeable)
+          ..gets(inp ^ Const(0x06, width: 8));
+
+    // ── Row 16: mergeable + internal + unpreferred ───────────────
+    mergeableUnpref = Logic(name: '_hidden', width: 8, naming: Naming.mergeable)
+      ..gets(inp ^ Const(0x07, width: 8));
+
+    // ── Row 19: unnamed + internal ───────────────────────────────
+    unnamed = Logic(width: 8)..gets(inp ^ Const(0x08, width: 8));
+
+    // ── Rows 3/13: sub-port preferred (via _SimpleSub.x / .y) ───
+    // ── Row 4/14: sub-port unpreferred (via _UnprefSub._uport) ──
+    final sub = _SimpleSub(renameableInternal);
+    final subOut = sub.output('y');
+    // Use a distinct expression so the submodule port doesn't merge with
+    // renameableInternal (which is renameable and would win).
+    final unpSub = _UnprefSub(inp ^ Const(0x0a, width: 8));
+
+    // ── MG: merge behavior — mergeTarget merges with subOut ──────
+    mergeTarget = Logic(name: 'mmerge', width: 8, naming: Naming.mergeable)
+      ..gets(subOut);
+
+    // ── Row 20: constant with name allowed ───────────────────────
+    constAllowed =
+        Const(0x42, width: 8).named('const_ok', naming: Naming.mergeable);
+
+    // ── Row 21: constant with name disallowed (expressionlessInput)
+    constDisallowed =
+        Const(0x09, width: 8).named('const_wire', naming: Naming.mergeable);
+    // ignore: unused_local_variable
+    final exprSub = _ExpressionlessSub(constDisallowed, inp);
+
+    // ── ST: structure element (structureName = "parent.field") ────
+    structPort = _SimpleStruct();
+    addInput('stIn', structPort, width: structPort.width);
+
+    // ── AR: array element (isArrayMember, uses logic.name) ───────
+    arrayPort = LogicArray([3], 8, name: 'arIn');
+    addInputArray('arIn', arrayPort, dimensions: [3], elementWidth: 8);
+
+    // Drive output to use all signals (prevents pruning).
+    out <=
+        mergeTarget |
+            mergeablePrefCollide |
+            mergeableUnpref |
+            unnamed |
+            constAllowed |
+            uInp |
+            mPortInp |
+            mPortUnpref |
+            reservedInternalUnpref |
+            renameableInternalUnpref |
+            unpSub.output('uout');
+  }
+}
+
+/// A minimal LogicStructure for testing structureName sanitization.
+class _SimpleStruct extends LogicStructure {
+  final Logic field1;
+  final Logic field2;
+
+  factory _SimpleStruct({String name = 'st'}) => _SimpleStruct._(
+        Logic(name: 'a', width: 4),
+        Logic(name: 'b', width: 4),
+        name: name,
+      );
+
+  _SimpleStruct._(this.field1, this.field2, {required super.name})
+      : super([field1, field2]);
+
+  @override
+  LogicStructure clone({String? name}) =>
+      _SimpleStruct(name: name ?? this.name);
+}
+
+// ── Helpers ───────────────────────────────────────
+
+/// Collects a map from Logic → picked name for all SynthLogics.
+Map<Logic, String> _collectNames(SynthModuleDefinition def) {
+  final names = <Logic, String>{};
+  for (final sl in [
+    ...def.inputs,
+    ...def.outputs,
+    ...def.inOuts,
+    ...def.internalSignals,
+  ]) {
+    try {
+      final n = sl.name;
+      for (final logic in sl.logics) {
+        names[logic] = n;
+      }
+      // ignore: avoid_catches_without_on_clauses
+    } catch (_) {
+      // name not picked (pruned/replaced)
+    }
+  }
+  return names;
+}
+
+/// Finds a SynthLogic that contains [logic].
+SynthLogic? _findSynthLogic(SynthModuleDefinition def, Logic logic) {
+  for (final sl in [
+    ...def.inputs,
+    ...def.outputs,
+    ...def.inOuts,
+    ...def.internalSignals,
+  ]) {
+    if (sl.logics.contains(logic)) {
+      return sl;
+    }
+  }
+  return null;
+}
+
+// ── Tests ────────────────────────────────────────
+
+void main() {
+  late _AllNamingCases mod;
+  late SynthModuleDefinition def;
+  late Map<Logic, String> names;
+
+  setUp(() async {
+    mod = _AllNamingCases();
+    await mod.build();
+    def = SynthModuleDefinition(mod);
+    names = _collectNames(def);
+  });
+
+  group('naming cases', () {
+    // ── Row 1: reserved + this-port + preferred ────────────────
+
+    test('T1: reserved preferred port keeps exact name', () {
+      expect(names[mod.input('inp')], 'inp');
+      expect(names[mod.output('out')], 'out');
+    });
+
+    // ── Row 2: reserved + this-port + unpreferred ──────────────
+
+    test('T2: reserved unpreferred port keeps exact _-prefixed name', () {
+      expect(names[mod.input('_uinp')], '_uinp');
+    });
+
+    // ── Rows 3/13: sub-port + preferred (reserved or mergeable) ─
+
+    test('T3: submodule preferred port gets a name in parent', () {
+      final subX = mod.subModules.whereType<_SimpleSub>().first.input('x');
+      final n = names[subX];
+      expect(n, isNotNull, reason: 'Submodule port must be named');
+      // Treated as preferred mergeable — name should not start with _.
+      expect(n, isNot(startsWith('_')),
+          reason: 'Preferred submodule port name should not be unpreferred');
+    });
+
+    // ── Row 4/14: sub-port + unpreferred ────────────────────────
+
+    test('T4: submodule unpreferred port gets an unpreferred name', () {
+      final subUPort =
+          mod.subModules.whereType<_UnprefSub>().first.input('_uport');
+      final n = names[subUPort];
+      expect(n, isNotNull, reason: 'Submodule port must be named');
+      expect(n, startsWith('_'),
+          reason: 'Unpreferred submodule port should keep _-prefix');
+    });
+
+    // ── Row 5: reserved + internal + preferred ──────────────────
+
+    test('T5: reserved preferred internal keeps exact name', () {
+      expect(names[mod.reservedInternal], 'resv');
+    });
+
+    // ── Row 6: reserved + internal + unpreferred ────────────────
+
+    test('T6: reserved unpreferred internal keeps exact _-prefixed name', () {
+      expect(names[mod.reservedInternalUnpref], '_resvu');
+    });
+
+    // ── Row 9: renameable + internal + preferred ────────────────
+
+    test('T9: renameable preferred internal gets its name', () {
+      final n = names[mod.renameableInternal];
+      expect(n, isNotNull);
+      expect(n, contains('ren'));
+    });
+
+    // ── Row 10: renameable + internal + unpreferred ─────────────
+
+    test('T10: renameable unpreferred internal keeps _-prefix', () {
+      final n = names[mod.renameableInternalUnpref];
+      expect(n, isNotNull);
+      expect(n, startsWith('_'),
+          reason: 'Unpreferred renameable should keep _-prefix');
+      expect(n, contains('renu'));
+    });
+
+    // ── Row 11: mergeable + this-port + preferred ───────────────
+
+    test('T11: mergeable-origin port (Logic.port) keeps exact port name', () {
+      // addInput overrides naming to reserved; the port name is exact.
+      expect(names[mod.input('mport')], 'mport');
+    });
+
+    // ── Row 12: mergeable + this-port + unpreferred ─────────────
+
+    test('T12: mergeable-origin unpreferred port keeps exact name', () {
+      expect(names[mod.input('_muprt')], '_muprt');
+    });
+
+    // ── Row 15: mergeable + internal + preferred ────────────────
+
+    test('T15: mergeable preferred internal gets its name', () {
+      final n = names[mod.mergeablePref];
+      expect(n, isNotNull);
+      expect(n, contains('mname'));
+    });
+
+    // ── COL: name collision → uniquified suffix ─────────────────
+
+    test('COL: collision between two mergeables gets uniquified', () {
+      final n1 = names[mod.mergeablePref];
+      final n2 = names[mod.mergeablePrefCollide];
+      expect(n1, isNot(n2), reason: 'Colliding names must be uniquified');
+      expect({n1, n2}, containsAll(['mname', 'mname_0']));
+    });
+
+    // ── Row 16: mergeable + internal + unpreferred ──────────────
+
+    test('T16: mergeable unpreferred internal keeps _-prefix', () {
+      final n = names[mod.mergeableUnpref];
+      expect(n, isNotNull);
+      expect(n, startsWith('_'),
+          reason: 'Unpreferred mergeable should keep _-prefix');
+    });
+
+    // ── Row 19: unnamed + internal ──────────────────────────────
+
+    test('T19: unnamed signal gets a generated name', () {
+      final n = names[mod.unnamed];
+      expect(n, isNotNull, reason: 'Unnamed signal must still get a name');
+      // chooseName() gives unnamed signals a name starting with '_s'.
+      expect(n, startsWith('_'),
+          reason: 'Unnamed signals get unpreferred generated names');
+    });
+
+    // ── Row 20: constant with name allowed ──────────────────────
+
+    test('T20: constant with name allowed uses literal value', () {
+      final sl = _findSynthLogic(def, mod.constAllowed);
+      expect(sl, isNotNull);
+      if (sl != null && !sl.constNameDisallowed) {
+        expect(sl.name, contains("8'h42"),
+            reason: 'Allowed constant should use value literal');
+      }
+    });
+
+    // ── Row 21: constant with name disallowed ───────────────────
+
+    test('T21: constant with name disallowed uses wire name', () {
+      final sl = _findSynthLogic(def, mod.constDisallowed);
+      expect(sl, isNotNull);
+      if (sl != null) {
+        if (sl.constNameDisallowed) {
+          expect(sl.name, isNot(contains("8'h09")),
+              reason: 'Disallowed constant should not use value literal');
+          expect(sl.name, isNotEmpty);
+        }
+      }
+    });
+
+    // ── MG: merge behavior ──────────────────────────────────────
+
+    test('MG: merged signals share the same SynthLogic', () {
+      final sl = _findSynthLogic(def, mod.mergeTarget);
+      expect(sl, isNotNull);
+      if (sl != null && sl.logics.length > 1) {
+        expect(sl.name, isNotEmpty);
+      }
+    });
+
+    // ── INST: submodule instance naming ─────────────────────────
+
+    test('INST: submodule instances get collision-free names', () {
+      final instNames = def.subModuleInstantiations
+          .where((s) => s.needsInstantiation)
+          .map((s) => s.name)
+          .toList();
+      expect(instNames.toSet().length, instNames.length,
+          reason: 'Instance names must be unique');
+      final portNames = {...mod.inputs.keys, ...mod.outputs.keys};
+      for (final name in instNames) {
+        expect(portNames, isNot(contains(name)),
+            reason: 'Instance "$name" should not collide with a port');
+      }
+    });
+
+    // ── ST: structure element naming ────────────────────────────
+
+    test('ST: structure element structureName is sanitized', () {
+      // structureName for field1 is "st.a" → sanitized to "st_a".
+      final stIn = mod.input('stIn');
+      final n = names[stIn];
+      expect(n, isNotNull);
+      // The port itself should keep its reserved name 'stIn'.
+      expect(n, 'stIn');
+    });
+
+    // ── AR: array element naming ────────────────────────────────
+
+    test('AR: array port keeps its name', () {
+      // Array ports are registered via addInputArray with Naming.reserved.
+      final arIn = mod.input('arIn');
+      final n = names[arIn];
+      expect(n, isNotNull);
+      expect(n, 'arIn');
+    });
+
+    // ── Impossible cases ────────────────────────────────────────
+
+    test('unnamed + reserved throws at construction time', () {
+      expect(
+        () => Logic(naming: Naming.reserved),
+        throwsA(isA<NullReservedNameException>()),
+      );
+      expect(
+        () => Logic(name: '', naming: Naming.reserved),
+        throwsA(isA<EmptyReservedNameException>()),
+      );
+    });
+
+    // ── Golden SV snapshot ──────────────────────────────────────
+
+    test('golden SV output snapshot', () {
+      final sv = mod.generateSynth();
+
+      // Port declarations.
+      expect(sv, contains('input logic [7:0] inp'));
+      expect(sv, contains('output logic [7:0] out'));
+      expect(sv, contains('_uinp'));
+      expect(sv, contains('mport'));
+      expect(sv, contains('_muprt'));
+
+      // Reserved internals.
+      expect(sv, contains('resv'));
+      expect(sv, contains('_resvu'));
+
+      // Renameable internals.
+      expect(sv, contains('ren'));
+      expect(sv, contains('_renu'));
+
+      // Constant literal (T20).
+      expect(sv, contains("8'h42"));
+
+      // Submodule instantiations.
+      expect(sv, contains('simplesub'));
+      expect(sv, contains('exprsub'));
+      expect(sv, contains('unprefsub'));
+    });
+  });
+}
diff --git a/test/naming_consistency_test.dart b/test/naming_consistency_test.dart
new file mode 100644
index 000000000..f0d7b2d31
--- /dev/null
+++ b/test/naming_consistency_test.dart
@@ -0,0 +1,247 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// naming_consistency_test.dart
+// Validates that both the SystemVerilog synthesizer and a base
+// SynthModuleDefinition (used by the netlist synthesizer) produce
+// consistent signal names via the shared Module.namer.
+//
+// 2026 April 10
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:rohd/rohd.dart';
+import 'package:rohd/src/synthesizers/systemverilog/systemverilog_synth_module_definition.dart';
+import 'package:rohd/src/synthesizers/utilities/utilities.dart';
+import 'package:test/test.dart';
+
+// ── Helper modules ──────────────────────────────────────────────────
+
+/// A simple module with ports, internal wires, and a sub-module.
+class _Inner extends Module {
+  _Inner(Logic a, Logic b) : super(name: 'inner') {
+    a = addInput('a', a, width: a.width);
+    b = addInput('b', b, width: b.width);
+    addOutput('y', width: a.width) <= a & b;
+  }
+}
+
+class _Outer extends Module {
+  _Outer(Logic a, Logic b) : super(name: 'outer') {
+    a = addInput('a', a, width: a.width);
+    b = addInput('b', b, width: b.width);
+    final inner = _Inner(a, b);
+    addOutput('y', width: a.width) <= inner.output('y');
+  }
+}
+
+/// A module with a constant assignment (exercises const naming).
+class _ConstModule extends Module {
+  _ConstModule(Logic a) : super(name: 'constmod') {
+    a = addInput('a', a, width: 8);
+    final c = Const(0x42, width: 8).named('myConst', naming: Naming.mergeable);
+    addOutput('y', width: 8) <= a + c;
+  }
+}
+
+/// A module with Naming.renameable and Naming.mergeable signals.
+class _MixedNaming extends Module {
+  _MixedNaming(Logic a) : super(name: 'mixednaming') {
+    a = addInput('a', a, width: 8);
+    final r = Logic(name: 'renamed', width: 8, naming: Naming.renameable)
+      ..gets(a);
+    final m = Logic(name: 'merged', width: 8, naming: Naming.mergeable)
+      ..gets(r);
+    addOutput('y', width: 8) <= m;
+  }
+}
+
+/// A module with a FlipFlop sub-module.
+class _FlopOuter extends Module {
+  _FlopOuter(Logic clk, Logic d) : super(name: 'flopouter') {
+    clk = addInput('clk', clk);
+    d = addInput('d', d, width: 8);
+    addOutput('q', width: 8) <= flop(clk, d);
+  }
+}
+
+/// Builds [SynthModuleDefinition]s from both bases and collects a
+/// Logic→name mapping for all present SynthLogics.
+///
+/// Returns maps from Logic to its resolved signal name.
+Map<Logic, String> _collectNames(SynthModuleDefinition def) {
+  final names = <Logic, String>{};
+  for (final sl in [
+    ...def.inputs,
+    ...def.outputs,
+    ...def.inOuts,
+    ...def.internalSignals,
+  ]) {
+    // Skip SynthLogics whose name was never picked (replaced/pruned).
+    try {
+      final n = sl.name;
+      for (final logic in sl.logics) {
+        names[logic] = n;
+      }
+      // ignore: avoid_catches_without_on_clauses
+    } catch (_) {
+      // name not picked — skip
+    }
+  }
+  return names;
+}
+
+void main() {
+  group('naming consistency', () {
+    test('SV and base SynthModuleDefinition agree on port names', () async {
+      final mod = _Outer(Logic(width: 8), Logic(width: 8));
+      await mod.build();
+
+      // SV synthesizer path
+      final svDef = SystemVerilogSynthModuleDefinition(mod);
+
+      // Base path (same as netlist synthesizer uses)
+      // Since namer is late final, the second constructor reuses
+      // the same naming state — names must be consistent.
+      final baseDef = SynthModuleDefinition(mod);
+
+      final svNames = _collectNames(svDef);
+      final baseNames = _collectNames(baseDef);
+
+      // Every Logic present in both must have the same name.
+      for (final logic in svNames.keys) {
+        if (baseNames.containsKey(logic)) {
+          expect(baseNames[logic], svNames[logic],
+              reason: 'Name mismatch for ${logic.name} '
+                  '(${logic.runtimeType}, naming=${logic.naming})');
+        }
+      }
+
+      // Port names specifically must match.
+      for (final port in [...mod.inputs.values, ...mod.outputs.values]) {
+        expect(svNames[port], isNotNull,
+            reason: 'SV def should have port ${port.name}');
+        expect(baseNames[port], isNotNull,
+            reason: 'Base def should have port ${port.name}');
+        expect(svNames[port], baseNames[port],
+            reason: 'Port name must match for ${port.name}');
+      }
+    });
+
+    test('constant naming is consistent', () async {
+      final mod = _ConstModule(Logic(width: 8));
+      await mod.build();
+
+      final svDef = SystemVerilogSynthModuleDefinition(mod);
+      final baseDef = SynthModuleDefinition(mod);
+
+      final svNames = _collectNames(svDef);
+      final baseNames = _collectNames(baseDef);
+
+      for (final logic in svNames.keys) {
+        if (baseNames.containsKey(logic)) {
+          expect(baseNames[logic], svNames[logic],
+              reason: 'Name mismatch for ${logic.name}');
+        }
+      }
+    });
+
+    test('mixed naming (renameable + mergeable) is consistent', () async {
+      final mod = _MixedNaming(Logic(width: 8));
+      await mod.build();
+
+      final svDef = SystemVerilogSynthModuleDefinition(mod);
+      final baseDef = SynthModuleDefinition(mod);
+
+      final svNames = _collectNames(svDef);
+      final baseNames = _collectNames(baseDef);
+
+      for (final logic in svNames.keys) {
+        if (baseNames.containsKey(logic)) {
+          expect(baseNames[logic], svNames[logic],
+              reason: 'Name mismatch for ${logic.name}');
+        }
+      }
+    });
+
+    test('flop module naming is consistent', () async {
+      final mod = _FlopOuter(Logic(), Logic(width: 8));
+      await mod.build();
+
+      final svDef = SystemVerilogSynthModuleDefinition(mod);
+      final baseDef = SynthModuleDefinition(mod);
+
+      final svNames = _collectNames(svDef);
+      final baseNames = _collectNames(baseDef);
+
+      for (final logic in svNames.keys) {
+        if (baseNames.containsKey(logic)) {
+          expect(baseNames[logic], svNames[logic],
+              reason: 'Name mismatch for ${logic.name}');
+        }
+      }
+    });
+
+    test('namer is shared across multiple SynthModuleDefinitions', () async {
+      final mod = _Outer(Logic(width: 8), Logic(width: 8));
+      await mod.build();
+
+      // Build one def, then build another — same namer instance.
+      final def1 = SynthModuleDefinition(mod);
+      final def2 = SynthModuleDefinition(mod);
+
+      final names1 = _collectNames(def1);
+      final names2 = _collectNames(def2);
+
+      for (final logic in names1.keys) {
+        if (names2.containsKey(logic)) {
+          expect(names2[logic], names1[logic],
+              reason: 'Shared namer should produce same name for '
+                  '${logic.name}');
+        }
+      }
+    });
+
+    test('Namer.signalNameOf matches SynthLogic.name for ports', () async {
+      final mod = _Outer(Logic(width: 8), Logic(width: 8));
+      await mod.build();
+
+      final def = SynthModuleDefinition(mod);
+      final synthNames = _collectNames(def);
+
+      // Module.namer.signalNameOf uses Namer directly
+      for (final port in [...mod.inputs.values, ...mod.outputs.values]) {
+        final moduleName = mod.namer.signalNameOf(port);
+        final synthName = synthNames[port];
+        expect(synthName, moduleName,
+            reason: 'SynthLogic.name and Module.namer.signalNameOf must agree '
+                'for port ${port.name}');
+      }
+    });
+
+    test('submodule instance names are allocated from the shared namespace',
+        () async {
+      // Instance names come from Module.namer.allocateName, which
+      // shares the same namespace as signal names.
+      final mod = _Outer(Logic(width: 8), Logic(width: 8));
+      await mod.build();
+
+      final def = SynthModuleDefinition(mod);
+
+      final instNames = def.subModuleInstantiations
+          .where((s) => s.needsInstantiation)
+          .map((s) => s.name)
+          .toSet();
+
+      // The inner module instance should have a name
+      expect(instNames, isNotEmpty,
+          reason: 'Should have at least one submodule instance');
+
+      // Instance names are claimed in the shared namespace.
+      for (final name in instNames) {
+        expect(mod.namer.isAvailable(name), isFalse,
+            reason: 'Instance name "$name" should be claimed in the '
+                'namespace');
+      }
+    });
+  });
+}
diff --git a/test/naming_namespace_test.dart b/test/naming_namespace_test.dart
new file mode 100644
index 000000000..a5263a998
--- /dev/null
+++ b/test/naming_namespace_test.dart
@@ -0,0 +1,129 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// naming_namespace_test.dart
+// Tests for constant naming via nameOfBest and shared instance/signal
+// namespace uniquification.
+//
+// 2026 April
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:rohd/rohd.dart';
+import 'package:test/test.dart';
+
+/// A simple submodule whose instance name can collide with a signal name.
+class _Inner extends Module {
+  _Inner(Logic a, {super.name = 'inner'}) {
+    a = addInput('a', a);
+    addOutput('b') <= ~a;
+  }
+}
+
+/// Top module that has a signal named the same as a submodule instance.
+class _InstanceSignalCollision extends Module {
+  _InstanceSignalCollision({String instanceName = 'inner'})
+      : super(name: 'top') {
+    final a = addInput('a', Logic());
+    final o = addOutput('o');
+
+    // Create a signal whose name matches the submodule instance name.
+    final sig = Logic(name: instanceName);
+    sig <= ~a;
+
+    final sub = _Inner(sig, name: instanceName);
+    o <= sub.output('b');
+  }
+}
+
+/// Top module with two submodule instances that have the same name.
+class _DuplicateInstances extends Module {
+  _DuplicateInstances() : super(name: 'top') {
+    final a = addInput('a', Logic());
+    final o = addOutput('o');
+
+    final sub1 = _Inner(a, name: 'blk');
+    final sub2 = _Inner(sub1.output('b'), name: 'blk');
+    o <= sub2.output('b');
+  }
+}
+
+/// Module that uses a constant in a connection chain, exercising constant
+/// naming through nameOfBest.
+class _ConstantNamingModule extends Module {
+  _ConstantNamingModule() : super(name: 'const_mod') {
+    final a = addInput('a', Logic());
+    final o = addOutput('o');
+
+    // A constant "1" drives one input of the AND gate.
+    o <= a & Const(1);
+  }
+}
+
+/// Module with a mux where one input is a constant, exercising the
+/// constNameDisallowed path — the mux output cannot use the constant's
+/// literal as its name because it also carries non-constant values.
+class _ConstNameDisallowedModule extends Module {
+  _ConstNameDisallowedModule() : super(name: 'const_disallow') {
+    final a = addInput('a', Logic());
+    final sel = addInput('sel', Logic());
+    final o = addOutput('o');
+
+    // mux output can be the constant OR a, so the constant name is disallowed.
+    o <= mux(sel, Const(1), a);
+  }
+}
+
+void main() {
+  tearDown(() async {
+    await Simulator.reset();
+  });
+
+  group('constant naming via nameOfBest', () {
+    test('constant value appears as literal in SV output', () async {
+      final dut = _ConstantNamingModule();
+      await dut.build();
+      final sv = dut.generateSynth();
+
+      // The constant "1" should appear as a literal 1'h1 in the output,
+      // not as a declared signal.
+      expect(sv, contains("1'h1"));
+    });
+
+    test('constNameDisallowed falls through to signal naming', () async {
+      final dut = _ConstNameDisallowedModule();
+      await dut.build();
+      final sv = dut.generateSynth();
+
+      // The output assignment should NOT use the raw constant literal
+      // as a wire name; a proper signal name should be used instead.
+      // The constant still appears as a literal in the mux expression.
+      expect(sv, contains("1'h1"));
+      // The output 'o' should be assigned from something.
+      expect(sv, contains('o'));
+    });
+  });
+
+  group('shared instance and signal namespace', () {
+    test(
+        'signal and instance with same name get uniquified '
+        'in the shared namespace', () async {
+      final dut = _InstanceSignalCollision();
+      await dut.build();
+      final sv = dut.generateSynth();
+
+      // With a single shared namespace, one of the two "inner" identifiers
+      // must be suffixed to avoid collision.
+      expect(sv, contains('inner_0'));
+    });
+
+    test('duplicate instance names get uniquified', () async {
+      final dut = _DuplicateInstances();
+      await dut.build();
+      final sv = dut.generateSynth();
+
+      // Two instances named 'blk' — one should be 'blk', the other 'blk_0'.
+      expect(sv, contains('blk'));
+      expect(sv, contains(RegExp(r'blk_\d')));
+    });
+  });
+}
diff --git a/test/signal_registry_test.dart b/test/signal_registry_test.dart
new file mode 100644
index 000000000..d1719c85e
--- /dev/null
+++ b/test/signal_registry_test.dart
@@ -0,0 +1,143 @@
+// Copyright (C) 2026 Intel Corporation
+// SPDX-License-Identifier: BSD-3-Clause
+//
+// signal_registry_test.dart
+// Tests for Module canonical naming (Namer).
+//
+// 2026 April 14
+// Author: Desmond Kirkpatrick <desmond.a.kirkpatrick@intel.com>
+
+import 'package:rohd/rohd.dart';
+import 'package:test/test.dart';
+
+// ────────────────────────────────────────────────────────────────
+// Simple test modules
+// ────────────────────────────────────────────────────────────────
+
+class _GateMod extends Module {
+  _GateMod(Logic a, Logic b) : super(name: 'gatetestmodule') {
+    a = addInput('a', a);
+    b = addInput('b', b);
+    final aBar = addOutput('a_bar');
+    final aAndB = addOutput('a_and_b');
+    aBar <= ~a;
+    aAndB <= a & b;
+  }
+}
+
+class _Counter extends Module {
+  _Counter(Logic en, Logic reset, {int width = 8}) : super(name: 'counter') {
+    en = addInput('en', en);
+    reset = addInput('reset', reset);
+    final val = addOutput('val', width: width);
+    final nextVal = Logic(name: 'nextVal', width: width);
+    nextVal <= val + 1;
+    Sequential.multi([
+      SimpleClockGenerator(10).clk,
+      reset,
+    ], [
+      If(reset, then: [
+        val < 0,
+      ], orElse: [
+        If(en, then: [val < nextVal]),
+      ]),
+    ]);
+  }
+}
+
+void main() {
+  tearDown(() async {
+    await Simulator.reset();
+  });
+
+  group('signalName basics', () {
+    test('returns port names after build', () async {
+      final mod = _GateMod(Logic(), Logic());
+      await mod.build();
+
+      expect(mod.namer.signalNameOf(mod.input('a')), equals('a'));
+      expect(mod.namer.signalNameOf(mod.input('b')), equals('b'));
+      expect(mod.namer.signalNameOf(mod.output('a_bar')), equals('a_bar'));
+      expect(mod.namer.signalNameOf(mod.output('a_and_b')), equals('a_and_b'));
+    });
+
+    test('returns internal signal names', () async {
+      final mod = _Counter(Logic(), Logic());
+      await mod.build();
+
+      expect(mod.namer.signalNameOf(mod.input('en')), equals('en'));
+      expect(mod.namer.signalNameOf(mod.input('reset')), equals('reset'));
+      expect(mod.namer.signalNameOf(mod.output('val')), equals('val'));
+    });
+
+    test('agrees with signalName after synth', () async {
+      final mod = _Counter(Logic(), Logic());
+      await mod.build();
+
+      for (final entry in mod.inputs.entries) {
+        expect(
+          mod.namer.signalNameOf(entry.value),
+          isNotNull,
+          reason: 'signalName should work for input ${entry.key}',
+        );
+      }
+      for (final entry in mod.outputs.entries) {
+        expect(
+          mod.namer.signalNameOf(entry.value),
+          isNotNull,
+          reason: 'signalName should work for output ${entry.key}',
+        );
+      }
+    });
+  });
+
+  group('allocateName', () {
+    test('avoids collision with existing names', () async {
+      final mod = _Counter(Logic(), Logic());
+      await mod.build();
+
+      final allocated = mod.namer.allocateRawName('en');
+      expect(allocated, isNot(equals('en')),
+          reason: 'Should not collide with existing port name');
+      expect(allocated, contains('en'),
+          reason: 'Should be based on the requested name');
+    });
+
+    test('successive allocations are unique', () async {
+      final mod = _Counter(Logic(), Logic());
+      await mod.build();
+
+      final a = mod.namer.allocateRawName('wire');
+      final b = mod.namer.allocateRawName('wire');
+      expect(a, isNot(equals(b)), reason: 'Each allocation should be unique');
+    });
+  });
+
+  group('sparse storage', () {
+    test('identity names not stored in renames', () async {
+      final mod = _GateMod(Logic(), Logic());
+      await mod.build();
+
+      expect(mod.namer.signalNameOf(mod.input('a')), equals('a'));
+      expect(mod.input('a').name, equals('a'));
+    });
+  });
+
+  group('determinism', () {
+    test('same module produces identical canonical names', () async {
+      Future<Map<String, String>> buildAndGetNames() async {
+        final mod = _Counter(Logic(), Logic());
+        await mod.build();
+        return {
+          for (final sig in mod.signals) sig.name: mod.namer.signalNameOf(sig),
+        };
+      }
+
+      final names1 = await buildAndGetNames();
+      await Simulator.reset();
+      final names2 = await buildAndGetNames();
+
+      expect(names1, equals(names2));
+    });
+  });
+}
diff --git a/tool/gh_actions/devtool/build_web.sh b/tool/gh_actions/devtool/build_web.sh
index f11186c63..a74c59ad3 100755
--- a/tool/gh_actions/devtool/build_web.sh
+++ b/tool/gh_actions/devtool/build_web.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2024 Intel Corporation
+# Copyright (C) 2024-2026 Intel Corporation
 # SPDX-License-Identifier: BSD-3-Clause
 #
 # build_web.sh
@@ -15,4 +15,40 @@ cd rohd_devtools_extension
 
 flutter pub get
 
-dart run devtools_extensions build_and_copy --source=. --dest=../extension/devtools
\ No newline at end of file
+dart run devtools_extensions build_and_copy --source=. --dest=../extension/devtools
+
+# ---------------------------------------------------------------------------
+# Strip service-worker / PWA artefacts.
+#
+# Why: DevTools extensions are loaded inside an iframe served by the DevTools
+# server.  Flutter's default build emits a service worker that aggressively
+# caches every asset.  Inside the DevTools iframe this causes two problems:
+#   1. The SW intercepts fetch requests and can serve stale cached responses,
+#      preventing the extension from picking up new builds.
+#   2. The SW registration itself can block or delay the initial iframe load,
+#      causing the extension tab to never appear in the DevTools UI.
+#
+# The fix replaces the caching SW with a tiny stub that unregisters itself,
+# removes the PWA manifest, and injects cleanup scripts so any previously
+# registered worker is also evicted.
+# ---------------------------------------------------------------------------
+DEST=../extension/devtools/build
+
+# 1. Replace the full caching service-worker with a self-unregistering stub.
+cat > "$DEST/flutter_service_worker.js" << 'SWEOF'
+self.addEventListener('install',function(e){self.skipWaiting()});
+self.addEventListener('activate',function(e){e.waitUntil(caches.keys().then(function(n){return Promise.all(n.map(function(k){return caches.delete(k)}))}).then(function(){return self.registration.unregister()}).then(function(){return self.clients.matchAll()}).then(function(c){c.forEach(function(cl){cl.navigate(cl.url)})}))});
+SWEOF
+
+# 2. Remove PWA manifest (not needed inside DevTools).
+rm -f "$DEST/manifest.json"
+
+# 3. Strip manifest link from index.html.
+sed -i '/<link rel="manifest"/d' "$DEST/index.html"
+
+# 4. Inject service-worker cleanup script before </body>.
+sed -i 's|</body>|<script>if("serviceWorker"in navigator){navigator.serviceWorker.getRegistrations().then(function(r){r.forEach(function(w){w.unregister()})})}</script>\n</body>|' "$DEST/index.html"
+
+# 5. Add iframe-redirect guard in <head> (redirects to debugger/ when opened
+#    outside of DevTools).
+sed -i '/<head>/a\  <script>if(window.parent===window){window.stop();if("serviceWorker"in navigator){navigator.serviceWorker.getRegistrations().then(function(r){r.forEach(function(w){w.unregister()});if(typeof caches!=="undefined"){caches.keys().then(function(n){n.forEach(function(k){caches.delete(k)})})}})}window.location.replace("debugger/")}</script>' "$DEST/index.html"
diff --git a/tool/gh_actions/install_node.sh b/tool/gh_actions/install_node.sh
index c98ce3e24..cb4fe8157 100755
--- a/tool/gh_actions/install_node.sh
+++ b/tool/gh_actions/install_node.sh
@@ -15,7 +15,9 @@ set -euo pipefail
 # based on https://deb.nodesource.com/ to get a recent version of node
 
 sudo apt-get update && sudo apt-get install -y ca-certificates curl gnupg
-curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-NODE_MAJOR=20
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --batch --yes --dearmor -o /etc/apt/keyrings/nodesource.gpg
+NODE_MAJOR=24
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
-sudo apt-get update && sudo apt-get install nodejs -y
\ No newline at end of file
+sudo apt-get update
+sudo apt-get remove -y libnode-dev libnode72 || true
+sudo apt-get install nodejs -y
\ No newline at end of file