diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/FirstOrderAMIGO.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/FirstOrderAMIGO.mo
index b4d935883c6..24020b8febc 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/FirstOrderAMIGO.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/FirstOrderAMIGO.mo
@@ -253,7 +253,7 @@ This block starts the PID tuning process when a request for performing autotunin
 <code>false</code> to <code>true</code>.
 During the autotuning process, the output of the block changes into that of a relay controller (see <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.Controller\">
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.Controller</a>).
-The PID tuning process ends automatically (see details in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
+The PID tuning process ends automatically (see details in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.BaseClasses.Relay.TunMonitor</a>).
 Since then, this block turns back to a PID controller but with tuned PID parameters.
 </p>
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TunMonitor.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo
similarity index 99%
rename from Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TunMonitor.mo
rename to Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo
index bf3d0900854..60f3f1df7b1 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TunMonitor.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo
@@ -1,5 +1,5 @@
 within Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses;
-block TunMonitor "Monitor the tuning process"
+block TuningMonitor "Monitor the tuning process"
   Buildings.Controls.OBC.CDL.Interfaces.RealInput tOn(
     final quantity="Time",
     final unit="s",
@@ -157,4 +157,4 @@ or <code>t<sub>off</sub></code> changes after the tuning period starts, as illus
 \"Automatic Controller Tuning using Relay-based Model Identification.\"
 Department of Automatic Control, Lund Institute of Technology, Lund University. </p>
 </html>"));
-end TunMonitor;
+end TuningMonitor;
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/HalfPeriodRatio.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/HalfPeriodRatio.mo
index 654b4738b16..bd31dd38a63 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/HalfPeriodRatio.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/HalfPeriodRatio.mo
@@ -79,7 +79,7 @@ Validation test for the block
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.HalfPeriodRatio</a>.
 </p>
 <p>
-This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor\">
+This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor\">
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor</a>.
 The lengths of the On period and the Off period are sampled at <i>0.9</i>s to calculate the half period ratio.
 </p>
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mo
similarity index 95%
rename from Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mo
rename to Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mo
index 4b4f6aedbfb..eb3f3292e29 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mo
@@ -1,5 +1,5 @@
 within Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation;
-model TunMonitor "Test model for the tuning period management"
+model TuningMonitor "Test model for the tuning period management"
   Buildings.Controls.OBC.CDL.Reals.Sources.Pulse tOnSig1(
     amplitude=-0.1,
     width=0.1,
@@ -25,7 +25,7 @@ model TunMonitor "Test model for the tuning period management"
     offset=0.5)
     "The length of the Off period"
     annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
-  Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor
+  Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor
     tunMan "Manage the tuning process"
     annotation (Placement(transformation(extent={{20,-10},{40,10}})));
   Buildings.Controls.OBC.CDL.Logical.Latch tunSta "Display when tuning process starts"
@@ -56,7 +56,7 @@ equation
       StopTime=1.0,
       Tolerance=1e-06),
     __Dymola_Commands(
-      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mos" "Simulate and plot"),
+      file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mos" "Simulate and plot"),
       Icon(
       coordinateSystem(
         preserveAspectRatio=false,
@@ -84,8 +84,8 @@ First implementation<br/>
 </html>", info="<html>
 <p>
 Validation test for the block
-<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
-Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor</a>.
+<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
+Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor</a>.
 </p>
 <ul>
 <li>
@@ -102,4 +102,4 @@ This triggers the tuning period to end.
 </li>
 </ul>
 </html>"));
-end TunMonitor;
+end TuningMonitor;
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/package.order b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/package.order
index 9b1c887574a..07bed6f4f00 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/package.order
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/package.order
@@ -2,4 +2,4 @@ HalfPeriodRatio
 NormalizedTimeDelay
 OnOffPeriod
 SamplerWithResetThreshold
-TunMonitor
+TuningMonitor
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/package.order b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/package.order
index 710b86ac453..db7cea3e9e5 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/package.order
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/package.order
@@ -2,5 +2,5 @@ HalfPeriodRatio
 NormalizedTimeDelay
 OnOffPeriod
 SamplerWithResetThreshold
-TunMonitor
+TuningMonitor
 Validation
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Controller.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Controller.mo
index b272584a088..250f782b247 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Controller.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Controller.mo
@@ -29,7 +29,7 @@ block Controller
     "Control error"
     annotation (Placement(transformation(extent={{100,0},{140,40}}),
     iconTransformation(extent={{100,-20},{140,20}})));
-    
+
 protected
   Buildings.Controls.OBC.CDL.Logical.OnOffController greMeaSet(
     final bandwidth=deaBan*2,
@@ -121,8 +121,8 @@ equation
           fillPattern=FillPattern.Solid,
           fillColor={175,175,175},
           textString="Relay"),
-        Line(points={{-70,24},{-34,24},{-34,58},{38,58},{38,24},{66,24}}, color=
-             {28,108,200})}), Diagram(
+        Line(points={{-70,24},{-34,24},{-34,58},{38,58},{38,24},{66,24}}, color
+            ={28,108,200})}), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
 Documentation(info="<html>
 <p>
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/ResponseProcess.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/ResponseProcess.mo
index c2926be0d64..0a7464ad876 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/ResponseProcess.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/ResponseProcess.mo
@@ -53,8 +53,8 @@ protected
      final gamma=max(yHig, yLow)/min(yLow, yHig))
     "Block that calculates the normalized time delay"
     annotation (Placement(transformation(extent={{40,0},{60,20}})));
-  Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor TunMon
-    "Block that detects when the tuning period starts and ends"
+  Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor
+    TunMon "Block that detects when the tuning period starts and ends"
     annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));
 
 equation
@@ -153,8 +153,8 @@ Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.NormalizedT
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.OnOffPeriod</a>.
 </li>
 <li>
-<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
-Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor</a>.
+<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
+Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor</a>.
 </li>
 </ul>
 </html>"));
diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Validation/ResponseProcess.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Validation/ResponseProcess.mo
index 3c1101229a0..22853711572 100644
--- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Validation/ResponseProcess.mo
+++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/Validation/ResponseProcess.mo
@@ -82,7 +82,7 @@ Validation test for the block
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.ResponseProcess</a>.
 </p>
 <p>
-This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor\">
+This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor\">
 Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor</a>.
 </p>
 </html>"));
diff --git a/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_Utilities_PIDWithAutotuning_Relay_BaseClasses_Validation_TunMonitor.txt b/Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_Utilities_PIDWithAutotuning_Relay_BaseClasses_Validation_TuningMonitor.txt
similarity index 100%
rename from Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_Utilities_PIDWithAutotuning_Relay_BaseClasses_Validation_TunMonitor.txt
rename to Buildings/Resources/ReferenceResults/Dymola/Buildings_Controls_OBC_Utilities_PIDWithAutotuning_Relay_BaseClasses_Validation_TuningMonitor.txt
diff --git a/Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mos b/Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mos
similarity index 50%
rename from Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mos
rename to Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mos
index ec30dd94b5b..0825b99350a 100644
--- a/Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mos
+++ b/Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mos
@@ -1,3 +1,3 @@
-simulateModel("Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor", method="Cvode", tolerance=1e-06,resultFile="TunMonitor");
-createPlot(id=1, position={0, 0, 1392, 452}, y={"tOn.y", "tOff.y"}, range={0.0, 1.0, -0.2, 0.6000000000000001}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}});
-createPlot(id=1, position={0, 0, 1392, 452}, y={"tunSta.y", "tunEnd.y"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});
\ No newline at end of file
+simulateModel("Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor", method="Cvode", tolerance=1e-06,resultFile="TunMonitor");
+createPlot(id=1, position={0, 0, 1392, 452}, y={"tOn.y", "tOff.y"}, range={0.0, 1.0, -0.2, 0.6}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}});
+createPlot(id=1, position={0, 0, 1392, 452}, y={"tunSta.y", "tunEnd.y"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});
diff --git a/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor.mos b/Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor.mos
similarity index 100%
rename from Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor.mos
rename to Buildings/Resources/Scripts/OpenModelica/compareVars/Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor.mos