diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
index 1ef89f5d93d..d472224865f 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/EnergyTransferStations/Combined/Subsystems/Validation/HeatPumpDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank",
+simulateModel("Buildings.Experimental.DHC.EnergyTransferStations.Combined.Subsystems.Validation.HeatPumpDHWTank",
     method="cvode",
     tolerance=1e-6,
     startTime=0,
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
index 81774979e34..7bf0c32967e 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
+++ b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/Combined/Examples/BuildingTimeSeriesWithETSDHWTank.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
+simulateModel("Buildings.Experimental.DHC.Loads.Combined.Examples.BuildingTimeSeriesWithETSDHWTank", tolerance=1e-6, startTime=0, stopTime=864000, method="CVode", resultFile="BuildingTimeSeriesWithETSDHWTank");
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.ets.proHeaWat.heaPum.QCon_flow_nominal", "bui.ets.proHeaWat.heaPum.QCon_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.bui.QReqHea_flow", "bui.bui.QReqCoo_flow", "bui.bui.QHea_flow", "bui.bui.QCoo_flow"}, range={0.0, 10.0, -200000.0, 400000.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}}, timeUnit="d", displayUnits={"W", "W", "W", "W"});
 createPlot(id=1, position={540, 9, 784, 617}, y={"bui.PHea", "bui.PPum"}, range={0.0, 10.0, -50000.0, 100000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="d", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
index c50aa8b0041..577826ef250 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
+++ b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/HeaterAndFixtureDirectHeatExchangerWithElectricHeat.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
+simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.HeaterAndFixtureDirectHeatExchangerWithElectricHeat", stopTime=172800, numberOfIntervals=0, outputInterval=60, tolerance=1e-06, resultFile="HeaterAndFixtureDirectHeatExchangerWithElectricHeat");
 createPlot(id=1, position={560, 11, 592, 621}, y={"theMixValNoEle.conPID.y", "theMixVal.conPID.y"}, range={0.0, 900000.0, 0.7000000000000001, 1.1}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}}, timeUnit="s");
 createPlot(id=1, position={560, 11, 592, 621}, y={"genNoEle.THexOut", "souDisHot.T"}, range={0.0, 900000.0, 290.0, 330.0}, grid=true, subPlot=102, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"", "K"});
 createPlot(id=1, position={560, 11, 592, 621}, y={"gen.PEle", "genNoEle.PEle"}, range={0.0, 900000.0, -20000.0, 80000.0}, grid=true, subPlot=103, colors={{28,108,200}, {238,46,47}}, timeUnit="s", displayUnits={"W", "W"});
diff --git a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
index 71a870809dc..985230bc842 100644
--- a/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
+++ b/Buildings/Resources/Scripts/Dymola/Experimental/DHC/Loads/HotWater/Examples/StorageTankWithExternalHeatExchanger.mos
@@ -1,4 +1,4 @@
-simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
+simulateModel("Buildings.Experimental.DHC.Loads.HotWater.Examples.StorageTankWithExternalHeatExchanger", stopTime=172800, tolerance=1e-06, resultFile="StorageTankWithExternalHeatExchanger");
 createPlot(id=1, position={532, 19, 592, 614}, y={"theMixVal.TMixSet", "theMixVal.senTMix.T", "domHotWatTan.senTemHot.T", "domHotWatTan.TTanTop.T", "domHotWatTan.TTanBot.T", "domHotWatTan.conCha.TTanTopSet"}, range={0.0, 180000.0, 0.0, 60.0}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}, {0,140,72}, {217,67,180}, {0,0,0}, {162,29,33}}, timeUnit="s", displayUnits={"degC", "degC", "degC", "degC", "degC", "degC"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"hea.Q_flow"}, range={0.0, 180000.0, -500.0, 1000.0}, grid=true, subPlot=102, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});
 createPlot(id=1, position={532, 19, 592, 614}, y={"domHotWatTan.PEle"}, range={0.0, 180000.0, 0.0, 1.0}, grid=true, subPlot=103, colors={{28,108,200}}, timeUnit="s", displayUnits={"W"});