diff --git a/Annex60/Experimental/Pipe/Validation/ValidationMSLAIT.mo b/Annex60/Experimental/Pipe/Validation/ValidationMSLAIT.mo
index 8785d3c44e..4534044271 100644
--- a/Annex60/Experimental/Pipe/Validation/ValidationMSLAIT.mo
+++ b/Annex60/Experimental/Pipe/Validation/ValidationMSLAIT.mo
@@ -25,7 +25,7 @@ model ValidationMSLAIT
   Fluid.Sources.MassFlowSource_T Point3(
     redeclare package Medium = Medium,
     use_m_flow_in=true,
-    nPorts=2) annotation (Placement(transformation(
+    nPorts=1) annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
         origin={-46,-50})));
@@ -60,7 +60,7 @@ model ValidationMSLAIT
         rotation=90,
         origin={50,-20})));
   Fluid.Sources.FixedBoundary ExcludedBranch(redeclare package Medium = Medium,
-      nPorts=2) annotation (Placement(transformation(
+      nPorts=1) annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=-90,
         origin={80,70})));
@@ -233,7 +233,7 @@ equation
   connect(pip0.port_a, Point1.ports[1])
     annotation (Line(points={{80,-20},{80,-32},{82,-32}}, color={0,127,255}));
   connect(pip0.port_b, ExcludedBranch.ports[1])
-    annotation (Line(points={{80,0},{80,60},{82,60}}, color={0,127,255}));
+    annotation (Line(points={{80,0},{80,60},{80,60}}, color={0,127,255}));
   connect(prescribedTemperature.port, res0.port_b) annotation (Line(points={{60,
           -90},{60,-90},{146,-90},{146,-10},{140,-10}}, color={191,0,0}));
   connect(pip0.heatPorts, col0.port_a) annotation (Line(points={{84.4,-9.9},{
@@ -259,7 +259,7 @@ equation
   connect(res2.port_b, res0.port_b) annotation (Line(points={{-20,34},{-16,34},{
           -16,124},{-12,124},{146,124},{146,-10},{140,-10}}, color={191,0,0}));
   connect(pip3.port_b, Point3.ports[1]) annotation (Line(points={{-46,-22},{-46,
-          -40},{-48,-40}}, color={0,127,255}));
+          -40},{-46,-40}}, color={0,127,255}));
   connect(pip3.port_a, pip2.port_a) annotation (Line(points={{-46,-2},{-46,
           10},{-70,10},{-70,30}}, color={0,127,255}));
   connect(pip3.heatPorts, col3.port_a) annotation (Line(points={{-41.6,-12.1},
diff --git a/Annex60/Resources/Scripts/Dymola/Experimental/Pipe/Validation/ValidationMSLAIT.mos b/Annex60/Resources/Scripts/Dymola/Experimental/Pipe/Validation/ValidationMSLAIT.mos
index 52bd42c278..c1816d3f54 100644
--- a/Annex60/Resources/Scripts/Dymola/Experimental/Pipe/Validation/ValidationMSLAIT.mos
+++ b/Annex60/Resources/Scripts/Dymola/Experimental/Pipe/Validation/ValidationMSLAIT.mos
@@ -17,7 +17,7 @@ plotExpression(apply(ValidationMSLAIT[end].DataReader.y[1]-273.15), false, "Meas
 createPlot(id = 5,
  position = {50, 50, 500, 500},
  x = "time",
- y = {"MSLpip0.port_a.m_flow"},
+ y = {"pip0.port_a.m_flow"},
  range = {0, 600, 1, 0},
  autoscale = true,
  autoerase = true,
@@ -41,11 +41,11 @@ createPlot(id = 5,
  subPlot=1,
  leftTitleType = 1,
  bottomTitleType = 1);
-plotExpression(apply(ValidationMSLpipeAIT[end].DataReader.y[2]-273.15), false, "Measured data: Temperature at point 2 in degrees", 6); 
+plotExpression(apply(ValidationMSLAIT[end].DataReader.y[2]-273.15), false, "Measured data: Temperature at point 2 in degrees", 6); 
 createPlot(id = 6,
  position = {600, 50, 500, 500},
  x = "time",
- y = {"MSLpip2.port_a.m_flow"},
+ y = {"pip2.port_a.m_flow"},
  range = {0, 600, 1, 0},
  autoscale = true,
  autoerase = true,
@@ -76,7 +76,7 @@ plotExpression(apply(ValidationMSLAIT[end].DataReader.y[3]-273.15), false, "Meas
 createPlot(id = 7,
  position = {55, 600, 500, 500},
  x = "time",
- y = {"MSLpip3.port_a.m_flow"},
+ y = {"pip3.port_a.m_flow"},
  range = {0, 600, 1, 0},
  autoscale = true,
  autoerase = true,
@@ -105,7 +105,7 @@ plotExpression(apply(ValidationMSLAIT[end].DataReader.y[4]-273.15), false, "Meas
 createPlot(id = 8,
  position = {600, 600, 500, 500},
  x = "time",
- y = {"MSLpip4.port_a.m_flow"},
+ y = {"pip4.port_a.m_flow"},
  range = {0, 600, 1, 0},
  autoscale = true,
  autoerase = true,