diff --git a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
index 8ae41497..3de19921 100644
--- a/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
+++ b/src/Server/ZB.MOM.WW.OtOpcUa.ControlPlane/AdminOperations/EquipmentTagConfigInspector.cs
@@ -21,11 +21,11 @@ public static class EquipmentTagConfigInspector
         new Dictionary<string, Func<string, IReadOnlyList<string>>>(StringComparer.OrdinalIgnoreCase)
         {
             ["Modbus"]   = ModbusTagDefinitionFactory.Inspect,
-            ["S7"]       = S7EquipmentTagParser.Inspect,
-            ["AbCip"]    = AbCipEquipmentTagParser.Inspect,
-            ["AbLegacy"] = AbLegacyEquipmentTagParser.Inspect,
-            ["TwinCat"]  = TwinCATEquipmentTagParser.Inspect,
-            ["Focas"]    = FocasEquipmentTagParser.Inspect,
+            ["S7"]       = S7TagDefinitionFactory.Inspect,
+            ["AbCip"]    = AbCipTagDefinitionFactory.Inspect,
+            ["AbLegacy"] = AbLegacyTagDefinitionFactory.Inspect,
+            ["TwinCat"]  = TwinCATTagDefinitionFactory.Inspect,
+            ["Focas"]    = FocasTagDefinitionFactory.Inspect,
         };
 
     /// <summary>Inspects a tag's <c>TagConfig</c> for the given driver type. Returns the driver's warnings,