diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
index 315671a6..9ad5806a 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftSnapshotFactoryTests.cs
@@ -45,7 +45,7 @@ public sealed class DraftSnapshotFactoryTests : IDisposable
 
         snapshot.Tags.Count.ShouldBe(1);
         snapshot.VirtualTags.Count.ShouldBe(2);
-        DraftValidator.Validate(snapshot).ShouldContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(snapshot).ShouldContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
     /// <summary>Distinct VirtualTag names under the same equipment do not collide, so the snapshot
@@ -62,7 +62,7 @@ public sealed class DraftSnapshotFactoryTests : IDisposable
 
         snapshot.Tags.Count.ShouldBe(1);
         snapshot.VirtualTags.Count.ShouldBe(1);
-        DraftValidator.Validate(snapshot).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(snapshot).ShouldNotContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
     /// <summary>Seeds one active and one released reservation for the same equipment context;
diff --git a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
index deb977a4..adcf5dd8 100644
--- a/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
+++ b/tests/Core/ZB.MOM.WW.OtOpcUa.Configuration.Tests/DraftValidatorTests.cs
@@ -168,7 +168,7 @@ public sealed class DraftValidatorTests
     }
 
     // ------------------------------------------------------------------------------------
-    // ValidateNoEquipmentSignalNameCollision — v3: VirtualTag name uniqueness within equipment
+    // ValidateNoUnsEffectiveNameCollision — v3: VirtualTag name uniqueness within equipment
     // ------------------------------------------------------------------------------------
 
     /// <summary>Two VirtualTags sharing (EquipmentId, Name) collide on a single OPC UA NodeId.</summary>
@@ -185,7 +185,7 @@ public sealed class DraftValidatorTests
             ],
         };
 
-        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(draft).ShouldContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
     /// <summary>VirtualTags with the same name under DIFFERENT equipment do not collide.</summary>
@@ -202,7 +202,7 @@ public sealed class DraftValidatorTests
             ],
         };
 
-        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "EquipmentSignalNameCollision");
+        DraftValidator.Validate(draft).ShouldNotContain(e => e.Code == "UnsEffectiveNameCollision");
     }
 
     private static VirtualTag BuildVirtualTag(string equipmentId, string name, string suffix = "") => new()