diff --git a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
index a3257157c..857ceb22b 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
@@ -176,7 +176,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
         {            
             foreach (var test in results)
             {
-                if (test.MetersKind != Entities.MetersKind.Standard) continue;
+                if (test.MetersKind != Entities.MetersKind.Single) continue;
 
                 int nrMtrsToUpdate = Math.Max(waterMeters.Count, test.Meters.Count);
                 for (int i = 0; i < nrMtrsToUpdate; i++)
diff --git a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
index 610731f35..bfeda429a 100644
--- a/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
+++ b/TestBenchFramework/BenchControl/DataEntry/Standard/EntryForm.cs
@@ -165,7 +165,7 @@ namespace TBF.BenchControl.DataEntry.Standard
         {            
             foreach (var test in results)
             {
-                if (test.MetersKind != Entities.MetersKind.Standard) continue;
+                if (test.MetersKind != Entities.MetersKind.Single) continue;
 
                 int nrMtrsToUpdate = Math.Max(waterMeters.Count, test.Meters.Count);
                 for (int i = 0; i < nrMtrsToUpdate; i++)
diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
index 282c1b6d6..a8f75245f 100644
--- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
+++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
@@ -54,7 +54,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
 
 			dateTime = DateTime.Now;
 
-			if ((unsortedResults != null) && (unsortedResults.Count != 0) && (unsortedResults[0].MetersKind == Entities.MetersKind.Standard))
+			if ((unsortedResults != null) && (unsortedResults.Count != 0) && (unsortedResults[0].MetersKind == Entities.MetersKind.Single))
 			{
 				resultItems = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Printer_SingleWM);
 				combined = false;
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index 13ffe7f2d..d6f2442c8 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -65,7 +65,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
 			tstRslt.DoNotEvaluate = true;
 			tstRslt.DoNotPublish = true;
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
index d2f6e7677..d309d4c86 100644
--- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/TestMethod.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
 
 		public bool Evaluate { get { return false; } }
 		public bool Publish { get { return false; } }
-		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
+		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
 
 		public TestMethod(TestMethodCfg cfg)
             : base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
index 1e4513dd7..87877198e 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
 			//====================================
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
 			tstRslt.DoNotEvaluate = true;
 			tstRslt.DoNotPublish = true;
 
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 7bcfcf9a1..dd06c3d94 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -59,7 +59,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
         loop:
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
 
 
 			int flowSetTime0 = StateMachine.Time;
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
index ae492778a..916390455 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/TestMethod.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
 
 		public bool Evaluate { get { return true; } }
 		public bool Publish { get { return true; } }
-		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
+		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
 
 		public TestMethod(TestMethodCfg cfg)
             : base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index df4203fb8..2a13afa43 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
         loop:
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
 
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Setting_the_flow);
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
index e1cba3187..a965d4241 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/TestMethod.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
 
 		public bool Evaluate { get { return true; } }
 		public bool Publish { get { return true; } }
-		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
+		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
 
 		public TestMethod(TestMethodCfg cfg)
             : base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 8d7809936..974b1ee34 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
         loop:
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
 
 
 			int flowSetTime0 = StateMachine.Time;
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
index 106995fb2..844a48d2c 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/TestMethod.cs
@@ -12,7 +12,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
 
 		public bool Evaluate { get { return true; } }
 		public bool Publish { get { return true; } }
-		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Standard; }
+		public bool CanTest(Entities.MetersKind meters) { return meters == Entities.MetersKind.Single; }
 
 		public TestMethod(TestMethodCfg cfg)
             : base(cfg)
diff --git a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
index e3800dcb8..6b46412fc 100644
--- a/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
 
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
 
 			//------------------------------------------------
 			Bridge.OnActivity(this, Strings.Starting_the_pump);
diff --git a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
index db8ba87c7..f38a01b0d 100644
--- a/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
@@ -43,7 +43,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
 
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, 1, inPath, benchPath, outPath, sensPath, 0));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, 1, Entities.MetersKind.Single);
 
             //------------------------------------------------
             Bridge.OnActivity(this, Strings.Starting_the_pump);
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index 857e35a7c..3713fabef 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -56,7 +56,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
         loop:
 			/// Start the test, initialize test results
 			Bridge.OnTestSelected(this, new TestSelectedEventArgs(test, repetitionNr, inPath, benchPath, outPath, sensPath, totalPulses));
-			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Standard);
+			Entities.TestResult tstRslt = new Entities.TestResult(test, repetitionNr, Entities.MetersKind.Single);
 
 
 			int flowSetTime0 = StateMachine.Time;
diff --git a/TestBenchFramework/Entities/Enums.cs b/TestBenchFramework/Entities/Enums.cs
index 560727b80..7cde614aa 100644
--- a/TestBenchFramework/Entities/Enums.cs
+++ b/TestBenchFramework/Entities/Enums.cs
@@ -8,7 +8,7 @@ namespace TBF.Entities
 	/// </summary>
 	public enum MetersKind
 	{
-		Standard,
+		Single,
 		Combined,
 	}
 
diff --git a/TestBenchFramework/Entities/Procedure.cs b/TestBenchFramework/Entities/Procedure.cs
index 897f74a6a..56da17ec1 100644
--- a/TestBenchFramework/Entities/Procedure.cs
+++ b/TestBenchFramework/Entities/Procedure.cs
@@ -48,7 +48,7 @@ namespace TBF.Entities
 			CreationTime = DateTime.Now;
 			LastChgUser = CreationUser;
 			LastChgTime = CreationTime;
-			MetersKind = Entities.MetersKind.Standard;
+			MetersKind = Entities.MetersKind.Single;
 			ProtocolTitle = "Watermeter test protocol";
         }
 
diff --git a/TestBenchFramework/Entities/TestResult.cs b/TestBenchFramework/Entities/TestResult.cs
index 4f241d1ab..aceac36a7 100644
--- a/TestBenchFramework/Entities/TestResult.cs
+++ b/TestBenchFramework/Entities/TestResult.cs
@@ -106,7 +106,7 @@ namespace TBF.Entities
         {
 			MetersKind = kind;
 
-			if (kind == MetersKind.Standard)
+			if (kind == MetersKind.Single)
 			{
 				for (int i = 0; i < Program.WMsCount; i++) Meters.Add(new MeterTestResult(this));
 			}
diff --git a/TestBenchFramework/ProcedureDlg.cs b/TestBenchFramework/ProcedureDlg.cs
index 646ee2968..5ea56654a 100644
--- a/TestBenchFramework/ProcedureDlg.cs
+++ b/TestBenchFramework/ProcedureDlg.cs
@@ -288,7 +288,7 @@ namespace TBF
 			}
 			watermetersTextBox.Text = LoadedProcedure.Watermeters;
 			protocolTitleTextBox.Text = LoadedProcedure.ProtocolTitle;
-            metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Standard);
+            metersKindRadioButton1.Checked = (LoadedProcedure.MetersKind == MetersKind.Single);
             metersKindRadioButton2.Checked = (LoadedProcedure.MetersKind == MetersKind.Combined);
             notesTextBox.Text = LoadedProcedure.LongDescription;
             dataEntryComboBox.Text = string.IsNullOrEmpty(LoadedProcedure.DataEntry) ? "---" : LoadedProcedure.DataEntry;
@@ -310,7 +310,7 @@ namespace TBF
 			LoadedProcedure.Watermeters = watermetersTextBox.Text;
 			LoadedProcedure.ProtocolTitle = protocolTitleTextBox.Text;
 
-            LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Standard : MetersKind.Combined);
+            LoadedProcedure.MetersKind = (metersKindRadioButton1.Checked ? MetersKind.Single : MetersKind.Combined);
 
 			if (dataEntryComboBox.Items.Contains(dataEntryComboBox.Text))
             {
diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs
index 127bb9e25..bd7d54e8f 100644
--- a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs
@@ -23,7 +23,7 @@ namespace TBF.Screens
 		/// </summary>
 		public ProcessTabPageCtrl()
         {
-            currentMetersKind = Entities.MetersKind.Standard;
+            currentMetersKind = Entities.MetersKind.Single;
 
             InitializeComponent();
 
@@ -103,7 +103,7 @@ namespace TBF.Screens
 
             scaleCmpntLabel.Text = "---";
 
-            if (currentMetersKind == Entities.MetersKind.Standard)
+            if (currentMetersKind == Entities.MetersKind.Single)
             {
                 watermeterPictureBox1z.Visible = false;
                 watermeterPictureBox2z.Visible = false;
@@ -232,7 +232,7 @@ namespace TBF.Screens
                 passed1zLabel.Text = "---";
             }
 
-            if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 3) ||
+            if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 3) ||
                 (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4))
             {
                 pulses3Label.Text = "---";
@@ -258,7 +258,7 @@ namespace TBF.Screens
                 passed2zLabel.Text = "---";
             }
 
-            if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 5) ||
+            if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 5) ||
                 (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6))
             {
                 pulses5Label.Text = "---";
@@ -372,7 +372,7 @@ namespace TBF.Screens
 				error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString();
             }
 
-            if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 3) ||
+            if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 3) ||
                 (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4))
             {
 				pulses3Label.Text = args.TestResult.Meters[2].PulsesMeter.ToString();
@@ -393,7 +393,7 @@ namespace TBF.Screens
 				error2zLabel.Text = args.TestResult.CombinedMeters[1].VolumeErrorPct.ToString();
 			}
 
-            if ((currentMetersKind == Entities.MetersKind.Standard && Program.WMsCount >= 5) ||
+            if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 5) ||
                 (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6))
             {
 				pulses5Label.Text = args.TestResult.Meters[4].PulsesMeter.ToString();
@@ -462,7 +462,7 @@ namespace TBF.Screens
             volumeCtvLabel.Text = args.TestResult.VolumeCTV.ToString("F1");
             refErrorLabel.Text = (tRes.ErrorMaster == 0) ? "---" : tRes.ErrorMaster.ToString("F2");
 
-            if (tRes.MetersKind == Entities.MetersKind.Standard)
+            if (tRes.MetersKind == Entities.MetersKind.Single)
 			{
 				pulses1Label.Text = tRes.Meters[0].PulsesMeter.ToString("F0");
                 refPulses1Label.Text = tRes.Meters[0].PulsesMaster.ToString("F0");