ToString( ) methods of all components are equal, start with ClassName.

TBF/Rig/Uni/Diverter/Diverter.cs

@@ -16,7 +16,7 @@ namespace TBF.Rig.Uni.Diverter
     public class Diverter : ComponentBase, IDevice, GenericDevices.IDiverter, GenericDevices.ISequenceCondition, GenericDevices.IHasCalendarEvents, IDrawingItCmpnt
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(Diverter));
-        public override string ToString() { return string.Format("Diverter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
         /// Configuration and wrappers
 		readonly DiverterCfg divCfg;

TBF/Rig/Uni/FlowMeter/FlowMeter.cs

@@ -14,7 +14,7 @@ namespace TBF.Rig.Uni.FlowMeter
     public class FlowMeter : ComponentBase, GenericDevices.IFlowMeter, GenericDevices.IHasCalendarEvents, IDrawingItCmpntWithMeasuredVal
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter));
-        public override string ToString() { return string.Format("FlowMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly FlowMeterCfg flowMeterCfg;
         public int Idx1 { get { return (flowMeterCfg != null) ? flowMeterCfg.Idx1 : 0; } }

TBF/Rig/Uni/FlowMetersInParallel/FlowMeter.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Uni.FlowMetersInParallel
 	public class FlowMeter : ComponentBase, IFlowMeter
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(FlowMeter));
-        public override string ToString() { return string.Format("FlowMeter({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly FlowMeterCfg flowMeterCfg;
         readonly UniCB uniCB;

TBF/Rig/Uni/RegValve/RegValve.cs

@@ -13,8 +13,7 @@ namespace TBF.Rig.Uni.RegValve
     public class RegValve : ComponentBase, Generic.IDevice, GenericDevices.IRegValve, IDrawingItCmpntWithSetpoint
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegValve));
-        public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(-1)); }
-
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public readonly RegValveCfg regValveCfg;
         public IDrawingItem DrawingItem { get { return regValveCfg as IDrawingItem; } }

TBF/Rig/Uni/RegValveAnalog/RegValve.cs

@@ -13,8 +13,7 @@ namespace TBF.Rig.Uni.RegValveAnalog
     public class RegValve : ComponentBase, GenericDevices.IRegValve, IDrawingItCmpntWithSetpoint
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegValve));
-        public override string ToString() { return string.Format("RegulValve({0})", Cfg.ToString(-1)); }
-
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		readonly RegValveCfg regValveCfg;
         public ValveCategory Category { get { return regValveCfg.Category; } }

TBF/Rig/Uni/RegValveTandem/RegValveTandem.cs

@@ -13,7 +13,7 @@ namespace TBF.Rig.Uni.RegValveTandem
 	public class RegValveTandem : ComponentBase, GenericDevices.IRegValve
 	{
 		private static readonly ILog log = LogManager.GetLogger(typeof(RegValveTandem));
-        public override string ToString() { return string.Format("RegValveTandem({0})", Cfg.ToString(-1)); }
+        public override string ToString() { return string.Format("{0}({1})", ClassName, Cfg.ToString(-1)); }
 
 		public readonly RegValveTandemCfg RegulValveTandemCfg;