diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
index c0f63cc00cd..b4fa559eb64 100644
--- a/Buildings/.copiedFiles.txt
+++ b/Buildings/.copiedFiles.txt
@@ -1756,6 +1756,7 @@ Buildings/Fluid/Storage/BaseClasses/Examples/package.mo
 Buildings/Fluid/Storage/BaseClasses/Examples/package.order
 Buildings/Fluid/Storage/BaseClasses/IndirectTankHeatExchanger.mo
 Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
+Buildings/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
 Buildings/Fluid/Storage/BaseClasses/ThirdOrderStratifier.mo
 Buildings/Fluid/Storage/BaseClasses/package.mo
 Buildings/Fluid/Storage/BaseClasses/package.order
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
index e9aa7e4ffdb..8f84f4eaf40 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse0.mo
@@ -13,74 +13,72 @@ model SimpleHouse0
         ModelicaServices.ExternalReferences.loadResource(
         "modelica://Buildings/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"))
     "Weather data reader"
-    annotation (Placement(transformation(extent={{-200,-20},{-180,0}})));
+    annotation (Placement(transformation(extent={{-180,-10},{-160,10}})));
   Buildings.BoundaryConditions.WeatherData.Bus weaBus "Weather data bus"
-    annotation (Placement(transformation(extent={{-160,-20},{-140,0}})));
+    annotation (Placement(transformation(extent={{-140,-10},{-120,10}}),
+        iconTransformation(extent={{-152,-10},{-132,10}})));
   Buildings.HeatTransfer.Sources.PrescribedTemperature TOut
     "Exterior temperature boundary condition"
     annotation (Placement(transformation(extent={{-80,-10},{-60,10}})));
 equation
   connect(weaDat.weaBus, weaBus) annotation (Line(
-      points={{-180,-10},{-150,-10}},
+      points={{-160,0},{-130,0}},
       color={255,204,51},
       thickness=0.5));
   connect(TOut.T, weaBus.TDryBul)
-    annotation (Line(points={{-82,0},{-150,0},{-150,-10}},color={0,0,127}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}}), graphics={
+    annotation (Line(points={{-82,0},{-130,0}},           color={0,0,127}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}}), graphics={
         Rectangle(
-          extent={{-220,40},{-38,-40}},
+          extent={{-200,60},{-20,-60}},
           fillColor={238,238,238},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-220,-60},{180,-200}},
+          extent={{-200,-80},{200,-200}},
           fillColor={238,238,238},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-220,180},{180,60}},
+          extent={{-200,200},{200,80}},
           fillColor={238,238,238},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Rectangle(
-          extent={{-20,40},{180,-40}},
+          extent={{0,60},{200,-60}},
           fillColor={238,238,238},
           fillPattern=FillPattern.Solid,
           pattern=LinePattern.None),
         Text(
-          extent={{22,22},{-23,39}},
+          extent={{57.25,40.25},{2.75,59.75}},
           textColor={0,0,127},
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
-          textString="Wall"),
+          textString="Building"),
         Text(
-          extent={{-157,-79},{-223,-61}},
+          extent={{-137,-99},{-203,-81}},
           textColor={0,0,127},
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
           textString="Heating"),
         Text(
-          extent={{-118,18},{-214,40}},
+          extent={{-102,39},{-198,61}},
           textColor={0,0,127},
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
           textString="Weather inputs"),
         Text(
-          extent={{-76,158},{-214,180}},
+          extent={{-61,179},{-199,201}},
           textColor={0,0,127},
           fillColor={255,213,170},
           fillPattern=FillPattern.Solid,
           textString="Cooling and ventilation")}),
     experiment(Tolerance=1E-6, StopTime=1e+06),
-    __Dymola_Commands(file=
-          "modelica://Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse0.mos"
-        "Simulate and plot"),
     Documentation(revisions="<html>
 <ul>
 <li>
 September 4, 2023, by Jelger Jansen:<br/>
-Replace IDEAS by Buildings models.
+Replace IDEAS by Buildings models and general revision/update of the model.
 </li>
 <li>
 October 11, 2016, by Filip Jorissen:<br/>
@@ -95,5 +93,8 @@ that allows the user to connect thermal components to the dry bulb temperature.
 It was based on from the Modelica crash course organised by KU Leuven
 (<a href=\"https://github.com/open-ideas/__CrashCourse__\">https://github.com/open-ideas/__CrashCourse__</a>).
 </p>
-</html>"));
+</html>"),
+    __Dymola_Commands(file=
+          "modelica://Buildings/Resources/Scripts/Dymola/Examples/Tutorial/SimpleHouse/SimpleHouse0.mos"
+        "Simulate and plot"));
 end SimpleHouse0;
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo
index 35b07a8c7ab..08cc3c22dc1 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse1.mo
@@ -7,17 +7,17 @@ model SimpleHouse1 "Building wall model"
     "Thermal mass of wall"
     annotation (Placement(transformation(extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={150,0})));
+        origin={170,0})));
   Modelica.Thermal.HeatTransfer.Components.ThermalResistor walRes(R=dWall/AWall
         /kWall) "Thermal resistor for wall: 25 cm of rockwool"
-    annotation (Placement(transformation(extent={{80,-10},{100,10}})));
+    annotation (Placement(transformation(extent={{60,-10},{80,10}})));
 equation
-  connect(walRes.port_b, walCap.port) annotation (Line(points={{100,0},{112,0},
-          {112,1.77636e-15},{140,1.77636e-15}}, color={191,0,0}));
+  connect(walRes.port_b, walCap.port) annotation (Line(points={{80,0},{100,0},{100,
+          1.77636e-15},{160,1.77636e-15}},      color={191,0,0}));
   connect(TOut.port, walRes.port_a)
-    annotation (Line(points={{0,0},{80,0}}, color={191,0,0}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+    annotation (Line(points={{-60,0},{60,0}}, color={191,0,0}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo
index f1ed7671ce8..1b19fc1226a 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse2.mo
@@ -6,24 +6,23 @@ model SimpleHouse2 "Building window model"
 
   Modelica.Blocks.Math.Gain gaiWin(k=AWin)
     "Gain for solar irradiance through the window"
-    annotation (Placement(transformation(extent={{0,-30},{20,-10}})));
+    annotation (Placement(transformation(extent={{20,-50},{40,-30}})));
   Modelica.Thermal.HeatTransfer.Sources.PrescribedHeatFlow win
     "Very simple window model"
-    annotation (Placement(transformation(extent={{40,-30},{60,-10}})));
+    annotation (Placement(transformation(extent={{60,-50},{80,-30}})));
 equation
   connect(gaiWin.y, win.Q_flow)
-    annotation (Line(points={{21,-20},{40,-20}},   color={0,0,127}));
-  connect(win.port, walCap.port) annotation (Line(points={{60,-20},{130,-20},{
-          130,1.77636e-15},{140,1.77636e-15}},
-                                           color={191,0,0}));
-  connect(gaiWin.u, weaBus.HDirNor) annotation (Line(points={{-2,-20},{-150,-20},
-          {-150,-10}}, color={0,0,127}), Text(
+    annotation (Line(points={{41,-40},{60,-40}},   color={0,0,127}));
+  connect(gaiWin.u, weaBus.HDirNor) annotation (Line(points={{18,-40},{-130,-40},
+          {-130,0}},   color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+  connect(win.port, walCap.port) annotation (Line(points={{80,-40},{110,-40},{110,
+          1.77636e-15},{160,1.77636e-15}}, color={191,0,0}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
index 59f9b7e35e3..1f1b0287cc8 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse3.mo
@@ -13,20 +13,20 @@ model SimpleHouse3 "Air model"
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={130,20})));
+        origin={110,20})));
   Buildings.Fluid.MixingVolumes.MixingVolume zon(
     redeclare package Medium = MediumAir,
     V=VZone,
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     m_flow_nominal=mAir_flow_nominal) "Very simple zone air model"
-    annotation (Placement(transformation(extent={{110,130},{90,150}})));
+    annotation (Placement(transformation(extent={{160,50},{180,30}})));
 equation
-  connect(conRes.port_b, walCap.port) annotation (Line(points={{130,10},{130,
-          1.77636e-15},{140,1.77636e-15}}, color={191,0,0}));
   connect(zon.heatPort, conRes.port_a)
-    annotation (Line(points={{110,140},{130,140},{130,30}}, color={191,0,0}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+    annotation (Line(points={{160,40},{110,40},{110,30}},   color={191,0,0}));
+  connect(conRes.port_b, walCap.port) annotation (Line(points={{110,10},{110,1.77636e-15},
+          {160,1.77636e-15}}, color={191,0,0}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
index 4b8008fe12b..873d58c7d07 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse4.mo
@@ -16,7 +16,7 @@ model SimpleHouse4 "Heating model"
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     allowFlowReversal=false,
     Q_flow_nominal=QHea_flow_nominal)                          "Radiator"
-    annotation (Placement(transformation(extent={{110,-110},{130,-90}})));
+    annotation (Placement(transformation(extent={{140,-140},{160,-120}})));
   Buildings.Fluid.HeatExchangers.HeaterCooler_u heaWat(
     redeclare package Medium = MediumWater,
     m_flow_nominal=mWat_flow_nominal,
@@ -24,7 +24,7 @@ model SimpleHouse4 "Heating model"
     allowFlowReversal=false,
     dp_nominal=5000,
     Q_flow_nominal=QHea_flow_nominal) "Heater for water circuit"
-    annotation (Placement(transformation(extent={{60,-110},{80,-90}})));
+    annotation (Placement(transformation(extent={{60,-140},{80,-120}})));
   Buildings.Fluid.Movers.FlowControlled_m_flow pum(
     redeclare package Medium = MediumWater,
     use_inputFilter=false,
@@ -33,32 +33,32 @@ model SimpleHouse4 "Heating model"
     allowFlowReversal=false,
     nominalValuesDefineDefaultPressureCurve=true,
     inputType=Buildings.Fluid.Types.InputType.Constant) "Pump"
-    annotation (Placement(transformation(extent={{110,-180},{90,-160}})));
+    annotation (Placement(transformation(extent={{160,-190},{140,-170}})));
   Buildings.Fluid.Sources.Boundary_pT bouWat(redeclare package Medium = MediumWater, nPorts=1)
     "Pressure bound for water circuit" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        origin={10,-170})));
+        origin={20,-180})));
   Modelica.Blocks.Sources.Constant conHea(k=1)
-    annotation (Placement(transformation(extent={{80,-80},{60,-60}})));
+    annotation (Placement(transformation(extent={{80,-110},{60,-90}})));
 equation
-  connect(heaWat.port_b,rad. port_a) annotation (Line(points={{80,-100},{110,-100}},
+  connect(heaWat.port_b,rad. port_a) annotation (Line(points={{80,-130},{140,-130}},
                        color={0,127,255}));
-  connect(rad.port_b, pum.port_a) annotation (Line(points={{130,-100},{148,-100},
-          {148,-170},{110,-170}}, color={0,127,255}));
-  connect(heaWat.port_a, pum.port_b) annotation (Line(points={{60,-100},{49.75,
-          -100},{49.75,-170},{90,-170}}, color={0,127,255}));
-  connect(rad.heatPortCon, zon.heatPort) annotation (Line(points={{118,-92.8},{
-          118,140},{110,140}}, color={191,0,0}));
-  connect(rad.heatPortRad, walCap.port) annotation (Line(points={{122,-92.8},{122,
-          -20},{130,-20},{130,1.77636e-15},{140,1.77636e-15}}, color={191,0,0}));
+  connect(rad.port_b, pum.port_a) annotation (Line(points={{160,-130},{175,-130},
+          {175,-180},{160,-180}}, color={0,127,255}));
+  connect(heaWat.port_a, pum.port_b) annotation (Line(points={{60,-130},{39.75,-130},
+          {39.75,-180},{140,-180}},      color={0,127,255}));
+  connect(rad.heatPortCon, zon.heatPort) annotation (Line(points={{148,-122.8},{
+          148,40},{160,40}},   color={191,0,0}));
+  connect(rad.heatPortRad, walCap.port) annotation (Line(points={{152,-122.8},{152,
+          1.77636e-15},{160,1.77636e-15}},                     color={191,0,0}));
   if use_constantHeater then
-    connect(conHea.y, heaWat.u) annotation (Line(points={{59,-70},{50,-70},{50,
-            -94},{58,-94}}, color={0,0,127}));
+      connect(conHea.y, heaWat.u) annotation (Line(points={{59,-100},{40,-100},{40,-124},
+          {58,-124}}, color={0,0,127}));
   end if;
   connect(bouWat.ports[1], pum.port_b)
-    annotation (Line(points={{20,-170},{90,-170}}, color={0,127,255}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+    annotation (Line(points={{30,-180},{140,-180}},color={0,127,255}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo
index 266f8114602..cf90827e6e5 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse5.mo
@@ -4,35 +4,35 @@ model SimpleHouse5 "Heating controller model"
         massFlowRates=mWat_flow_nominal*{1}), final use_constantHeater=false);
 
   Modelica.Blocks.Math.BooleanToInteger booInt "Boolean to integer"
-    annotation (Placement(transformation(extent={{0,-150},{20,-130}})));
+    annotation (Placement(transformation(extent={{0,-160},{20,-140}})));
   Modelica.Blocks.Math.BooleanToReal booRea "Boolean to real"
-    annotation (Placement(transformation(extent={{0,-110},{20,-90}})));
+    annotation (Placement(transformation(extent={{0,-120},{20,-100}})));
   Modelica.Blocks.Logical.Hysteresis hysRad(uLow=273.15 + 21, uHigh=273.15 + 23)
     "Hysteresis controller for radiator"
-    annotation (Placement(transformation(extent={{-80,-110},{-60,-90}})));
+    annotation (Placement(transformation(extent={{-80,-120},{-60,-100}})));
   Modelica.Blocks.Logical.Not not1
     "Negation for enabling heating when temperature is low"
-    annotation (Placement(transformation(extent={{-40,-110},{-20,-90}})));
+    annotation (Placement(transformation(extent={{-40,-120},{-20,-100}})));
   Modelica.Thermal.HeatTransfer.Sensors.TemperatureSensor senTemZonAir
     "Zone air temperature sensor"
-    annotation (Placement(transformation(extent={{90,150},{70,170}})));
+    annotation (Placement(transformation(extent={{90,160},{70,180}})));
 equation
-  connect(booInt.y, pum.stage) annotation (Line(points={{21,-140},{100,-140},{
-          100,-158}}, color={255,127,0}));
-  connect(booInt.u, not1.y) annotation (Line(points={{-2,-140},{-11.5,-140},{-11.5,
-          -100},{-19,-100}}, color={255,0,255}));
-  connect(booRea.y, heaWat.u) annotation (Line(points={{21,-100},{40.5,-100},{
-          40.5,-94},{58,-94}}, color={0,0,127}));
-  connect(not1.u,hysRad. y) annotation (Line(points={{-42,-100},{-59,-100}},
+  connect(booInt.y, pum.stage) annotation (Line(points={{21,-150},{150,-150},{150,
+          -168}},     color={255,127,0}));
+  connect(booInt.u, not1.y) annotation (Line(points={{-2,-150},{-11.5,-150},{-11.5,
+          -110},{-19,-110}}, color={255,0,255}));
+  connect(not1.u,hysRad. y) annotation (Line(points={{-42,-110},{-59,-110}},
                   color={255,0,255}));
-  connect(senTemZonAir.T,hysRad. u) annotation (Line(points={{69,160},{-230,160},
-          {-230,-100},{-82,-100}},            color={0,0,127}));
+  connect(senTemZonAir.T,hysRad. u) annotation (Line(points={{69,170},{-210,170},
+          {-210,-110},{-82,-110}},            color={0,0,127}));
   connect(senTemZonAir.port, zon.heatPort)
-    annotation (Line(points={{90,160},{110,160},{110,140}}, color={191,0,0}));
+    annotation (Line(points={{90,170},{160,170},{160,40}},  color={191,0,0}));
   connect(not1.y, booRea.u)
-    annotation (Line(points={{-19,-100},{-2,-100}}, color={255,0,255}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+    annotation (Line(points={{-19,-110},{-2,-110}}, color={255,0,255}));
+  connect(booRea.y, heaWat.u) annotation (Line(points={{21,-110},{40,-110},{40,-124},
+          {58,-124}}, color={0,0,127}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
index 8b8d38f8e68..47cd8a4cd04 100644
--- a/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
+++ b/Buildings/Examples/Tutorial/SimpleHouse/SimpleHouse6.mo
@@ -14,7 +14,7 @@ model SimpleHouse6 "Free cooling model"
     m_flow_nominal=mAir_flow_nominal,
     dpDamper_nominal=dpAir_nominal)
     "Damper" annotation (Placement(transformation(extent={{-10,10},{10,
-            -10}}, origin={50,110})));
+            -10}}, origin={110,130})));
   Buildings.Fluid.Movers.FlowControlled_dp fan(
     redeclare package Medium = MediumAir,
     show_T=true,
@@ -25,9 +25,9 @@ model SimpleHouse6 "Free cooling model"
     m_flow_nominal=mAir_flow_nominal)
                  "Constant head fan" annotation (Placement(transformation(
         extent={{-10,10},{10,-10}},
-        origin={-50,110})));
+        origin={0,130})));
   Modelica.Blocks.Sources.Constant con_dp(k=dpAir_nominal) "Pressure head"
-    annotation (Placement(transformation(extent={{-90,70},{-70,90}})));
+    annotation (Placement(transformation(extent={{-60,90},{-40,110}})));
   Buildings.Fluid.HeatExchangers.ConstantEffectiveness hexRec(
     redeclare package Medium1 = MediumAir,
     redeclare package Medium2 = MediumAir,
@@ -36,7 +36,7 @@ model SimpleHouse6 "Free cooling model"
     m1_flow_nominal=mAir_flow_nominal,
     m2_flow_nominal=mAir_flow_nominal,
     eps=0.85)      "Heat exchanger for heat recuperation"
-    annotation (Placement(transformation(extent={{-80,104},{-110,136}})));
+    annotation (Placement(transformation(extent={{-55,124},{-85,156}})));
   Buildings.Fluid.Sources.Boundary_pT
                       bouAir(
     redeclare package Medium = MediumAir,
@@ -44,37 +44,40 @@ model SimpleHouse6 "Free cooling model"
     nPorts=2)      "Air boundary with constant temperature"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
-        origin={-130,130})));
+        origin={-110,140})));
   Modelica.Blocks.Logical.Hysteresis hysAir(uLow=273.15 + 23, uHigh=273.15 + 25)
     "Hysteresis controller for damper"
-    annotation (Placement(transformation(extent={{-20,70},{0,90}})));
+    annotation (Placement(transformation(extent={{40,90},{60,110}})));
   Modelica.Blocks.Math.BooleanToReal booToRea1 "Boolean to real"
-    annotation (Placement(transformation(extent={{20,70},{40,90}})));
+    annotation (Placement(transformation(extent={{80,90},{100,110}})));
 equation
   connect(con_dp.y, fan.dp_in)
-    annotation (Line(points={{-69,80},{-50,80},{-50,98}}, color={0,0,127}));
-  connect(hexRec.port_a1, zon.ports[1]) annotation (Line(points={{-80,129.6},{
-          97,129.6},{97,130},{100,130}}, color={0,127,255}));
-  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-142,134},{
-          -150,134},{-150,-10}},color={0,0,127}));
-  connect(hexRec.port_b2, fan.port_a) annotation (Line(points={{-80,110.4},{-69,
-          110.4},{-69,110},{-60,110}}, color={0,127,255}));
-  connect(vavDam.port_b, zon.ports[2]) annotation (Line(points={{60,110},{100,
-          110},{100,130}}, color={0,127,255}));
+    annotation (Line(points={{-39,100},{0,100},{0,118}},  color={0,0,127}));
+  connect(hexRec.port_a1, zon.ports[1]) annotation (Line(points={{-55,149.6},{169,
+          149.6},{169,50},{170,50}},     color={0,127,255}));
+  connect(bouAir.T_in, weaBus.TDryBul) annotation (Line(points={{-122,144},{-130,
+          144},{-130,0}},       color={0,0,127}));
+  connect(vavDam.port_b, zon.ports[2]) annotation (Line(points={{120,130},{142,130},
+          {142,50},{170,50}},
+                           color={0,127,255}));
   connect(booToRea1.y, vavDam.y)
-    annotation (Line(points={{41,80},{50,80},{50,98}}, color={0,0,127}));
+    annotation (Line(points={{101,100},{110,100},{110,118}},
+                                                       color={0,0,127}));
   connect(hysAir.y, booToRea1.u)
-    annotation (Line(points={{1,80},{18,80}}, color={255,0,255}));
+    annotation (Line(points={{61,100},{78,100}},
+                                              color={255,0,255}));
   connect(vavDam.port_a, fan.port_b)
-    annotation (Line(points={{40,110},{-40,110}}, color={0,127,255}));
-  connect(hysAir.u, hysRad.u) annotation (Line(points={{-22,80},{-30,80},{-30,
-          160},{-230,160},{-230,-100},{-82,-100}}, color={0,0,127}));
-  connect(bouAir.ports[1], hexRec.port_b1) annotation (Line(points={{-120,129},
-          {-119,129},{-119,129.6},{-110,129.6}}, color={0,127,255}));
-  connect(bouAir.ports[2], hexRec.port_a2) annotation (Line(points={{-120,131},
-          {-120,110.4},{-110,110.4}}, color={0,127,255}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-240,
-            -220},{200,200}})),
+    annotation (Line(points={{100,130},{10,130}}, color={0,127,255}));
+  connect(hysAir.u, hysRad.u) annotation (Line(points={{38,100},{30,100},{30,170},
+          {-210,170},{-210,-110},{-82,-110}},      color={0,0,127}));
+  connect(bouAir.ports[1], hexRec.port_a2) annotation (Line(points={{-100,139},{
+          -100,130.4},{-85,130.4}},   color={0,127,255}));
+  connect(fan.port_a, hexRec.port_b2) annotation (Line(points={{-10,130},{-32,130},
+          {-32,130.4},{-55,130.4}}, color={0,127,255}));
+  connect(hexRec.port_b1, bouAir.ports[2]) annotation (Line(points={{-85,149.6},
+          {-100,149.6},{-100,141}}, color={0,127,255}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-220,
+            -220},{220,220}})),
     experiment(Tolerance=1e-6, StopTime=1e+06),
     Documentation(revisions="<html>
 <ul>
diff --git a/Buildings/Fluid/Interfaces/PartialFourPort.mo b/Buildings/Fluid/Interfaces/PartialFourPort.mo
index 31bc2b5f1e4..c350a8f510c 100644
--- a/Buildings/Fluid/Interfaces/PartialFourPort.mo
+++ b/Buildings/Fluid/Interfaces/PartialFourPort.mo
@@ -34,44 +34,26 @@ partial model PartialFourPort "Partial model with four ports"
                      m_flow(min=if allowFlowReversal1 then -Modelica.Constants.inf else 0),
                      h_outflow(start = Medium1.h_default, nominal = Medium1.h_default))
     "Fluid connector a1 (positive design flow direction is from port_a1 to port_b1)"
-    annotation (Placement(transformation(extent={{port_a1_x-10,port_a1_y-10},{port_a1_x+10,port_a1_y+10}})));
+    annotation (Placement(transformation(extent={{-110,50},{-90,70}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b1(
                      redeclare final package Medium = Medium1,
                      m_flow(max=if allowFlowReversal1 then +Modelica.Constants.inf else 0),
                      h_outflow(start = Medium1.h_default, nominal = Medium1.h_default))
     "Fluid connector b1 (positive design flow direction is from port_a1 to port_b1)"
-    annotation (Placement(transformation(extent={{port_b1_x-10,port_b1_y-10},{port_b1_x+10,port_b1_y+10}})));
+    annotation (Placement(transformation(extent={{110,50},{90,70}})));
 
   Modelica.Fluid.Interfaces.FluidPort_a port_a2(
                      redeclare final package Medium = Medium2,
                      m_flow(min=if allowFlowReversal2 then -Modelica.Constants.inf else 0),
                      h_outflow(start = Medium2.h_default, nominal = Medium2.h_default))
     "Fluid connector a2 (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{port_a2_x-10,port_a2_y-10},{port_a2_x+10,port_a2_y+10}})));
+    annotation (Placement(transformation(extent={{90,-70},{110,-50}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b2(
                      redeclare final package Medium = Medium2,
                      m_flow(max=if allowFlowReversal2 then +Modelica.Constants.inf else 0),
                      h_outflow(start = Medium2.h_default, nominal = Medium2.h_default))
     "Fluid connector b2 (positive design flow direction is from port_a2 to port_b2)"
-    annotation (Placement(transformation(extent={{port_b2_x-10,port_b2_y-10},{port_b2_x+10,port_b2_y+10}})));
-
-protected
-  constant Integer port_a1_x = -100
-    "x-coordinate of port_a1 center";
-  constant Integer port_a1_y = 60
-    "y-coordinate of port_a1 center";
-  constant Integer port_b1_x = 100
-    "x-coordinate of port_b1 center";
-  constant Integer port_b1_y = 60
-    "y-coordinate of port_b1 center";
-  constant Integer port_a2_x = 100
-    "x-coordinate of port_a2 center";
-  constant Integer port_a2_y = -60
-    "y-coordinate of port_a2 center";
-  constant Integer port_b2_x = -100
-    "x-coordinate of port_b2 center";
-  constant Integer port_b2_y = -60
-    "y-coordinate of port_b2 center";
+    annotation (Placement(transformation(extent={{-90,-70},{-110,-50}})));
 
   annotation (
     preferredView="info",
@@ -101,11 +83,6 @@ are not implemented.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 April 6, 2020, by Filip Jorissen:<br/>
 Added arrows to the icon indicating the intended flow direction
 when <code>allowFlowReversal=false</code>.
diff --git a/Buildings/Fluid/Interfaces/PartialTwoPort.mo b/Buildings/Fluid/Interfaces/PartialTwoPort.mo
index 56b195c9daf..019219a6463 100644
--- a/Buildings/Fluid/Interfaces/PartialTwoPort.mo
+++ b/Buildings/Fluid/Interfaces/PartialTwoPort.mo
@@ -20,23 +20,13 @@ partial model PartialTwoPort "Partial component with two ports"
      m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
      h_outflow(start = Medium.h_default, nominal = Medium.h_default))
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{port_a_x-10,port_a_y-10},{port_a_x+10,port_a_y+10}})));
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
   Modelica.Fluid.Interfaces.FluidPort_b port_b(
     redeclare final package Medium = Medium,
     m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
      h_outflow(start = Medium.h_default, nominal = Medium.h_default))
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{port_b_x-10,port_b_y-10},{port_b_x+10,port_b_y+10}})));
-
-protected
-  constant Integer port_a_x = -100
-    "x-coordinate of port_a center";
-  constant Integer port_a_y = 0
-    "y-coordinate of port_a center";
-  constant Integer port_b_x = 100
-    "x-coordinate of port_b center";
-  constant Integer port_b_y = 0
-    "y-coordinate of port_b center";
+    annotation (Placement(transformation(extent={{110,-10},{90,10}})));
 
   annotation (
     Documentation(info="<html>
@@ -58,11 +48,6 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 January 18, 2019, by Jianjun Hu:<br/>
 Limited the media choice.
 See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1050\">#1050</a>.
diff --git a/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo b/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
index a8be8d9ab14..22818b05ee6 100644
--- a/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
+++ b/Buildings/Fluid/Interfaces/PartialTwoPortVector.mo
@@ -11,7 +11,6 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
           property_T=293.15,
           X_a=0.40)
           "Propylene glycol water, 40% mass fraction")));
-
   parameter Integer nPorts "Number of ports"
     annotation(Evaluate=true, Dialog(connectorSizing=true, tab="General",group="Ports"));
   parameter Boolean allowFlowReversal=true
@@ -23,14 +22,14 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
     m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
     h_outflow(start=Medium.h_default, nominal=Medium.h_default))
     "Fluid connector a (positive design flow direction is from port_a to ports_b)"
-    annotation (Placement(transformation(extent={{port_a_x-10,port_a_y-10},{port_a_x+10,port_a_y+10}})));
+    annotation (Placement(transformation(extent={{-110,-10},{-90,10}})));
 
   Modelica.Fluid.Interfaces.FluidPorts_b ports_b[nPorts](
     redeclare each package Medium = Medium,
     each m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
     each h_outflow(start=Medium.h_default, nominal=Medium.h_default))
     "Fluid connectors b (positive design flow direction is from port_a to ports_b)"
-    annotation (Placement(transformation(extent={{port_b_x-10,port_b_y-40},{port_b_x+10,port_b_y+40}})));
+    annotation (Placement(transformation(extent={{90,-40},{110,40}})));
 
   // Diagnostics
    parameter Boolean show_T = false
@@ -50,17 +49,6 @@ partial model PartialTwoPortVector "Partial component with two ports, one of whi
                           noEvent(actualStream(ports_b.h_outflow)),
                           noEvent(actualStream(ports_b.Xi_outflow)))
       if show_T "Medium properties in ports_b";
-
-protected
-  constant Integer port_a_x = -100
-    "x-coordinate of port_a center";
-  constant Integer port_a_y = 0
-    "y-coordinate of port_a center";
-  constant Integer port_b_x = 100
-    "x-coordinate of port_b center";
-  constant Integer port_b_y = 0
-    "y-coordinate of port_b center";
-
   annotation (
     Documentation(info="<html>
 <p>
@@ -85,11 +73,6 @@ users have not used this global definition to assign parameters.
 </html>", revisions="<html>
 <ul>
 <li>
-September 1, 2023, by Antoine Gautier:<br/>
-Added constants for parameterization of port placement.
-See <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1781\">#1781</a>.
-</li>
-<li>
 March 30, 2021, by Michael Wetter:<br/>
 Added annotation <code>HideResult=true</code>.<br/>
 This is for
diff --git a/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo b/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
index 2756c9ce6f2..adfbdc00025 100644
--- a/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
+++ b/Buildings/Fluid/Storage/BaseClasses/PartialStratified.mo
@@ -1,11 +1,11 @@
 within Buildings.Fluid.Storage.BaseClasses;
 model PartialStratified
   "Partial model of a stratified tank for thermal energy storage"
-  extends Buildings.Fluid.Interfaces.PartialTwoPortInterface(
-    port_a_x=0, port_a_y=100, port_b_x=0, port_b_y=-100);
+  extends Buildings.Fluid.Storage.BaseClasses.PartialTwoPortInterface;
 
   import Modelica.Fluid.Types;
   import Modelica.Fluid.Types.Dynamics;
+
   parameter Modelica.Units.SI.Volume VTan "Tank volume";
   parameter Modelica.Units.SI.Length hTan "Height of tank (without insulation)";
   parameter Modelica.Units.SI.Length dIns "Thickness of insulation";
@@ -77,6 +77,7 @@ model PartialStratified
     each final m_flow_small=m_flow_small,
     each final allowFlowReversal=allowFlowReversal) "Tank segment"
     annotation (Placement(transformation(extent={{6,-16},{26,4}})));
+
 protected
   parameter Medium.ThermodynamicState sta_default = Medium.setState_pTX(
     T=Medium.T_default,
@@ -393,5 +394,8 @@ Icon(graphics={
         Line(
           points={{22,-74},{70,-74},{70,72}},
           color={127,0,0},
-          pattern=LinePattern.Dot)}));
+          pattern=LinePattern.Dot),     Text(
+        extent={{-100,100},{-8,70}},
+        textString="%name",
+        textColor={0,0,255})}));
 end PartialStratified;
diff --git a/Buildings/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo b/Buildings/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
new file mode 100644
index 00000000000..484e402ced4
--- /dev/null
+++ b/Buildings/Fluid/Storage/BaseClasses/PartialTwoPortInterface.mo
@@ -0,0 +1,113 @@
+within Buildings.Fluid.Storage.BaseClasses;
+partial model PartialTwoPortInterface
+  "Partial model transporting fluid between two ports without storing mass or energy"
+
+  replaceable package Medium =
+    Modelica.Media.Interfaces.PartialMedium "Medium in the component"
+      annotation (choices(
+        choice(redeclare package Medium = Buildings.Media.Air "Moist air"),
+        choice(redeclare package Medium = Buildings.Media.Water "Water"),
+        choice(redeclare package Medium =
+            Buildings.Media.Antifreeze.PropyleneGlycolWater (
+              property_T=293.15,
+              X_a=0.40)
+              "Propylene glycol water, 40% mass fraction")));
+
+  parameter Boolean allowFlowReversal = true
+    "= false to simplify equations, assuming, but not enforcing, no flow reversal"
+    annotation(Dialog(tab="Assumptions"), Evaluate=true);
+
+  Modelica.Fluid.Interfaces.FluidPort_a port_a(
+    redeclare final package Medium = Medium,
+    m_flow(min=if allowFlowReversal then -Modelica.Constants.inf else 0),
+    p(start=Medium.p_default),
+    h_outflow(start = Medium.h_default, nominal = Medium.h_default))
+    "Fluid connector a (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{-10,90},{10,110}})));
+  Modelica.Fluid.Interfaces.FluidPort_b port_b(
+    redeclare final package Medium = Medium,
+    m_flow(max=if allowFlowReversal then +Modelica.Constants.inf else 0),
+    p(start=Medium.p_default),
+    h_outflow(start = Medium.h_default, nominal = Medium.h_default))
+    "Fluid connector b (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{10,-110},{-10,-90}})));
+
+  parameter Modelica.Units.SI.MassFlowRate m_flow_nominal
+    "Nominal mass flow rate" annotation (Dialog(group="Nominal condition"));
+  parameter Modelica.Units.SI.MassFlowRate m_flow_small(min=0) = 1E-4*abs(
+    m_flow_nominal) "Small mass flow rate for regularization of zero flow"
+    annotation (Dialog(tab="Advanced"));
+  // Diagnostics
+   parameter Boolean show_T = false
+    "= true, if actual temperature at port is computed"
+    annotation (
+      Dialog(tab="Advanced", group="Diagnostics"),
+      HideResult=true);
+
+  Modelica.Units.SI.MassFlowRate m_flow(start=_m_flow_start) = port_a.m_flow
+    "Mass flow rate from port_a to port_b (m_flow > 0 is design flow direction)";
+
+  Modelica.Units.SI.PressureDifference dp(
+    start=_dp_start,
+    displayUnit="Pa") = port_a.p - port_b.p
+    "Pressure difference between port_a and port_b";
+
+  Medium.ThermodynamicState sta_a=
+    if allowFlowReversal then
+      Medium.setState_phX(port_a.p,
+                          noEvent(actualStream(port_a.h_outflow)),
+                          noEvent(actualStream(port_a.Xi_outflow)))
+    else
+      Medium.setState_phX(port_a.p,
+                          noEvent(inStream(port_a.h_outflow)),
+                          noEvent(inStream(port_a.Xi_outflow)))
+      if show_T "Medium properties in port_a";
+
+  Medium.ThermodynamicState sta_b=
+    if allowFlowReversal then
+      Medium.setState_phX(port_b.p,
+                          noEvent(actualStream(port_b.h_outflow)),
+                          noEvent(actualStream(port_b.Xi_outflow)))
+    else
+      Medium.setState_phX(port_b.p,
+                          noEvent(port_b.h_outflow),
+                          noEvent(port_b.Xi_outflow))
+       if show_T "Medium properties in port_b";
+
+protected
+  final parameter Modelica.Units.SI.MassFlowRate _m_flow_start=0
+    "Start value for m_flow, used to avoid a warning if not set in m_flow, and to avoid m_flow.start in parameter window";
+  final parameter Modelica.Units.SI.PressureDifference _dp_start(displayUnit=
+        "Pa") = 0
+    "Start value for dp, used to avoid a warning if not set in dp, and to avoid dp.start in parameter window";
+
+  annotation (
+    preferredView="info",
+    Documentation(info="<html>
+<p>
+This partial class implements the same functionality as 
+<a href=\"modelica://Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger\">
+Buildings.Fluid.Interfaces.StaticTwoPortHeatMassExchanger</a>,
+except that <code>port_a</code> and <code>port_b</code> are placed at the top and bottom
+of the component.
+</p>
+<h4>Implementation</h4>
+<p>
+The implementation is done in this package as opposed to
+<a href=\"modelica://Buildings.Fluid.Interfaces\">
+Buildings.Fluid.Interfaces</a>
+as it is only used by the storage model, and may be removed when the tool limitations
+that are discussed in
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1794\">IBPSA, #1794</a>.
+are removed.
+</p>
+</html>", revisions="<html>
+<ul>
+<li>
+September 20, 2023, by Michael Wetter:<br/>
+First implementation to address
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1794\">IBPSA, #1794</a>.
+</li>
+</ul>
+</html>"));
+end PartialTwoPortInterface;
diff --git a/Buildings/Fluid/Storage/BaseClasses/package.order b/Buildings/Fluid/Storage/BaseClasses/package.order
index 23ec1825ad5..62b42b3b735 100644
--- a/Buildings/Fluid/Storage/BaseClasses/package.order
+++ b/Buildings/Fluid/Storage/BaseClasses/package.order
@@ -1,5 +1,6 @@
 Buoyancy
 IndirectTankHeatExchanger
 PartialStratified
+PartialTwoPortInterface
 ThirdOrderStratifier
 Examples