diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Data/TableData2D/Generic.mo b/IBPSA/Fluid/Chillers/ModularReversible/Data/TableData2D/Generic.mo
index a7b8e9b5bc..4df44a3d1b 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/Data/TableData2D/Generic.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/Data/TableData2D/Generic.mo
@@ -3,7 +3,7 @@ record Generic "Basic chiller data"
   extends IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.Generic;
 
   parameter Real tabQEva_flow[:,:]
-    "Cooling power consumption table, T in degC, Q_flow in W";
+    "Cooling power consumption table, T in K, Q_flow in W";
   parameter Real tabLowBou[:,2]
     "Points to define lower boundary for source temperature";
   parameter Boolean use_TEvaOutForOpeEnv=false
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo b/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo
index d7fe8e4ddb..1fbe56e9da 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/LargeScaleWaterToWater.mo
@@ -38,7 +38,7 @@ model LargeScaleWaterToWater "Large scale water to water chiller"
     final autCalVCon=max(2E-7*QUse_flow_nominal - 84E-4, autCalVMin),
     final autCalVEva=max(1E-7*QUse_flow_nominal - 66E-4, autCalVMin));
   replaceable parameter
-    IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.EN14511.Carrier30XWP1012_1MW
+    IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.Generic
     datTab constrainedby Data.TableData2D.Generic "Data Table of Chiller"
     annotation (choicesAllMatching=true,
     Placement(transformation(extent={{42,12},{58,28}})));
@@ -75,16 +75,10 @@ model LargeScaleWaterToWater "Large scale water to water chiller"
   UsersGuide</a>.
 </p>
 <p>
-  The documentation of the model for heating is at
+  The documentation of the model for cooling is at
   <a href=\"modelica://IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D\">
   IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2D</a>.
 </p>
-<p>
-  Currently the only data sheets for chillers that large is the record
-  <a href=\"modelica://IBPSA.Fluid.Chillers.ModularReversible.Data.TableData2D.EN14511.Carrier30XWP1012_1MW\">
-  IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.TableData2DData.EN14511.Carrier30XWP1012_1MW</a>,
-  hence, the default value.
-</p>
 <h4>Assumptions</h4>
 <ul>
 <li>
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
index 15961e69b1..f6f8e78af3 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
@@ -8,29 +8,25 @@ partial model PartialChillerCycle
   IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.CalculateCOP
     calEER(PEleMin=PEle_nominal*0.1)  if calEff
                                       "Calculate the EER"
-    annotation (Placement(transformation(extent={{-60,-60},{-80,-80}})));
+    annotation (Placement(transformation(extent={{-80,-80},{-100,-100}})));
 equation
-  connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-69,-40},
-          {-72,-40},{-72,-26},{-102,-26},{-102,104},{1,104}},      color={0,0,
+  connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-81.2,-50},
+          {-72,-50},{-72,-30},{-110,-30},{-110,120},{1,120}},      color={0,0,
           127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-81,-70},{-102,-70},{
-          -102,104},{1,104}},  color={0,0,127}), Text(
+  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-101,-90},{-110,-90},{
+          -110,120},{1,120}},  color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(calEER.QUse_flow, proRedQEva.y) annotation (Line(points={{-58,-74},{-46,
-          -74},{-46,-88},{-20,-88},{-20,-81}}, color={0,0,127}));
-  annotation (Icon(graphics={Rectangle(
-        extent={{-100,-100},{100,100}},
-        lineColor={0,0,255},
-        fillColor={255,255,255},
-        fillPattern=FillPattern.Solid)}),
-      Documentation(
+  connect(calEER.QUse_flow, proRedQEva.y) annotation (Line(points={{-78,-94},{-60,
+          -94},{-60,-108},{-30,-108},{-30,-101}},
+                                               color={0,0,127}));
+  annotation (Documentation(
   info="<html>
 <p>
   Partial refrigerant cycle model for chillers.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
index a6d742701c..5fde4abc06 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -18,59 +18,65 @@ model ConstantQualityGrade "Carnot EER with a constant qualtiy grade"
     "Nominal EER";
 
 equation
-  connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-26,
-          22},{-26,34},{1,34},{1,104}}, color={255,0,255}), Text(
+  connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-50,30},
+          {0,30},{0,120},{1,120}},      color={255,0,255}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
   connect(swiPEle.y, redQCon.u2) annotation (Line(points={{50,-1},{50,-36},{64,
-          -36},{64,-58}}, color={0,0,127}));
-  connect(swiPEle.y, PEle) annotation (Line(points={{50,-1},{50,-8},{0,-8},{0,-110}},
+          -36},{64,-78}}, color={0,0,127}));
+  connect(swiPEle.y, PEle) annotation (Line(points={{50,-1},{50,-8},{0,-8},{0,
+          -130}},
         color={0,0,127}));
-  connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,48},
-          {1,48},{1,104}}, color={255,0,255}), Text(
+  connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,30},{
+          0,30},{0,120},{1,120}},
+                           color={255,0,255}), Text(
       string="%second",
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
   connect(pasThrYSet.u, sigBus.ySet) annotation (Line(points={{18,70},{1,70},{1,
-          104}}, color={0,0,127}), Text(
+          120}}, color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
   if useInChi then
-    connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,90},{-30,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,102},{
+            -30,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-3,6},{-3,6}},
         horizontalAlignment=TextAlignment.Right));
-    connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,90},{-70,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,102},{
+            -70,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-3,6},{-3,6}},
         horizontalAlignment=TextAlignment.Right));
   else
-    connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,90},{-30,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,102},{
+            -30,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-3,6},{-3,6}},
         horizontalAlignment=TextAlignment.Right));
-    connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,90},{-70,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,102},{
+            -70,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-3,6},{-3,6}},
         horizontalAlignment=TextAlignment.Right));
   end if;
   connect(swiQUse.y, proRedQEva.u2) annotation (Line(points={{-50,-1},{-50,-30},{
-          -14,-30},{-14,-58}},  color={0,0,127}));
-  connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-78,-66},{-50,-66},{
-          -50,-52},{0,-52},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
+          -24,-30},{-24,-78}},  color={0,0,127}));
+  connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-78,-86},{-60,-86},{
+          -60,-60},{0,-60},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
   annotation (Documentation(revisions="<html><ul>
   <li>
     <i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
index b765489a6b..3525138f85 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -30,84 +30,81 @@ model TableData2D
 equation
 
   connect(scaFacTimPel.y, PEle) annotation (Line(points={{-40,-9},{-40,-26},{-30,
-          -26},{-30,-94},{0,-94},{0,-110}}, color={0,0,127}));
+          -26},{-30,-94},{0,-94},{0,-130}}, color={0,0,127}));
   connect(scaFacTimPel.y, redQCon.u2) annotation (Line(points={{-40,-9},{-40,-26},
-          {-30,-26},{-30,-48},{64,-48},{64,-58}}, color={0,0,127}));
+          {-30,-26},{-30,-48},{64,-48},{64,-78}}, color={0,0,127}));
   connect(scaFacTimQUse_flow.y, proRedQEva.u2) annotation (Line(points={{40,-9},{
-          40,-40},{-14,-40},{-14,-58}},  color={0,0,127}));
-  connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-64,48},{-64,
-          100},{-10,100},{-10,104},{1,104}}, color={0,0,127}), Text(
+          40,-40},{-24,-40},{-24,-78}},  color={0,0,127}));
+  connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-54,62},{-54,
+          72},{-70,72},{-70,120},{1,120}},   color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
-  connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-20,92},
-          {-20,104},{1,104}}, color={0,0,127}), Text(
+  connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-10,102},
+          {-10,120},{1,120}}, color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,92},
-          {-50,106},{0,106},{0,104},{1,104}}, color={0,0,127}), Text(
+  connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,102},
+          {-50,120},{1,120}},                 color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{40,92},{
-          40,104},{1,104}},  color={0,0,127}), Text(
+  connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{50,102},
+          {50,120},{1,120}}, color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{70,92},
-          {70,104},{1,104}}, color={0,0,127}), Text(
+  connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{90,102},
+          {90,120},{1,120}}, color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-66},
-          {-58,-66}},                                         color={0,0,127}));
+  connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-26},
+          {-60,-26},{-60,-86},{-78,-86}},                     color={0,0,127}));
 
   if useInChi then
     connect(reaPasThrTConOut.y, tabPEle.u2)
-      annotation (Line(points={{70,69},{70,48},{74,48},{74,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{84,70},{84,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabPEle.u2)
-      annotation (Line(points={{40,69},{40,48},{74,48},{74,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{84,70},{84,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabQUse_flow.u2)
-      annotation (Line(points={{40,69},{40,48},{34,48},{34,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{44,70},{44,62}}, color={0,0,127}));
     connect(reaPasThrTConOut.y, tabQUse_flow.u2)
-      annotation (Line(points={{70,69},{70,48},{34,48},{34,42}}, color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-20,69},
-            {-20,66},{40,66},{40,48},{46,48},{46,42}},
-                                      color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,69},
-            {-50,62},{40,62},{40,48},{46,48},{46,42}},
+      annotation (Line(points={{90,79},{90,70},{44,70},{44,62}}, color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-10,79},
+            {-10,70},{56,70},{56,62}},color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,79},
+            {-50,70},{56,70},{56,62}},
                                   color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-20,69},{
-            -20,66},{86,66},{86,42}},
+    connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-10,79},{
+            -10,70},{96,70},{96,62}},
                               color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,69},{-50,
-            62},{86,62},{86,42}},
+    connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,79},{-50,
+            70},{96,70},{96,62}},
                                 color={0,0,127}));
   else
     connect(reaPasThrTConOut.y, tabPEle.u1)
-      annotation (Line(points={{70,69},{70,48},{86,48},{86,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{96,70},{96,62}}, color={0,0,127}));
     connect(reaPasThrTConOut.y, tabQUse_flow.u1)
-      annotation (Line(points={{70,69},{70,48},{46,48},{46,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{56,70},{56,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabQUse_flow.u1)
-      annotation (Line(points={{40,69},{40,48},{46,48},{46,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{56,70},{56,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabPEle.u1)
-      annotation (Line(points={{40,69},{40,48},{86,48},{86,42}}, color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-20,69},{
-            -20,66},{40,66},{40,48},{74,48},{74,42}},
-                                              color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-20,69},
-            {-20,66},{40,66},{40,48},{34,48},{34,42}},color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,69},
-            {-50,62},{40,62},{40,48},{34,48},{34,42}},
-                                                  color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,69},{-50,
-            62},{74,62},{74,42}},             color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{96,70},{96,62}}, color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-10,79},{
+            -10,70},{84,70},{84,62}},         color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-10,79},
+            {-10,70},{44,70},{44,62}},                color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,79},
+            {-50,70},{44,70},{44,62}},            color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,79},{-50,
+            70},{84,70},{84,62}},             color={0,0,127}));
   end if;
   annotation (Icon(graphics={
     Line(points={{-60.0,40.0},{-60.0,-40.0},{60.0,-40.0},{60.0,40.0},
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo
index 6be9f93580..abb0df08a2 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/RefrigerantCycle.mo
@@ -23,19 +23,19 @@ model RefrigerantCycle
   annotation (Placement(transformation(extent={{60,40},{20,80}}, rotation=0)));
   RefrigerantCycleHeatPumpCooling refCycHeaPumCoo
     "Refrigerant cycle instance for cooling"
-  annotation (Placement(transformation(extent={{-19,42},{-60,82}}, rotation=0)));
+  annotation (Placement(transformation(extent={{-19,40},{-60,80}}, rotation=0)));
   Modelica.Blocks.Math.Gain gainEva(final k=-1)
     "Negate QEva to match definition of heat flow direction" annotation (
       Placement(transformation(
-        extent={{-8,-8},{8,8}},
+        extent={{-10,-10},{10,10}},
         rotation=180,
-        origin={-32,8})));
+        origin={-30,10})));
   Modelica.Blocks.Math.Gain gainCon(final k=-1)
     "Negate QCon to match definition of heat flow direction" annotation (
       Placement(transformation(
-        extent={{-8,-8},{8,8}},
+        extent={{-10,-10},{10,10}},
         rotation=0,
-        origin={30,-8})));
+        origin={30,-10})));
 protected
   IBPSA.Utilities.IO.Strings.StringPassThrough strPasThr
     "String pass through to enable conditional string data";
@@ -56,36 +56,39 @@ equation
  end if;
   connect(pasTrhModSet.u, sigBus.hea);
   connect(refCycHeaPumHea.QCon_flow, swiQCon.u1)
-    annotation (Line(points={{56,38},{56,8},{58,8}}, color={0,0,127}));
-  connect(refCycHeaPumHea.PEle, swiPEle.u1) annotation (Line(points={{40,38},{
-          40,30},{86,30},{86,-52},{8,-52},{8,-58}}, color={0,0,127}));
+    annotation (Line(points={{53.3333,38.3333},{53.3333,8},{58,8}},
+                                                     color={0,0,127}));
+  connect(refCycHeaPumHea.PEle, swiPEle.u1) annotation (Line(points={{40,38.3333},
+          {40,30},{86,30},{86,-52},{8,-52},{8,-58}},color={0,0,127}));
   connect(refCycHeaPumCoo.PEle, swiPEle.u3) annotation (Line(
-      points={{-39.5,40},{-40,40},{-40,30},{-90,30},{-90,-50},{-8,-50},{-8,-58}},
+      points={{-39.5,38.3333},{-40,38.3333},{-40,30},{-90,30},{-90,-50},{-8,-50},
+          {-8,-58}},
       color={0,0,127},
       pattern=LinePattern.Dash));
 
   connect(refCycHeaPumCoo.QEva_flow, swiQEva.u3) annotation (Line(
-      points={{-55.9,40},{-56,40},{-56,24},{-52,24},{-52,-8},{-58,-8}},
+      points={{-53.1667,38.3333},{-52,38.3333},{-52,-8},{-58,-8}},
       color={0,0,127},
       pattern=LinePattern.Dash));
   connect(gainEva.y, swiQEva.u1)
-    annotation (Line(points={{-40.8,8},{-58,8}}, color={0,0,127}));
+    annotation (Line(points={{-41,10},{-50,10},{-50,8},{-58,8}},
+                                                 color={0,0,127}));
   connect(swiQCon.u3, gainCon.y) annotation (Line(
-      points={{58,-8},{38.8,-8}},
+      points={{58,-8},{50,-8},{50,-10},{41,-10}},
       color={0,0,127},
       pattern=LinePattern.Dash));
   connect(refCycHeaPumCoo.QCon_flow, gainCon.u) annotation (Line(
-      points={{-23.1,40},{-24,40},{-24,32},{10,32},{10,-8},{20.4,-8}},
+      points={{-25.8333,38.3333},{-26,38.3333},{-26,30},{10,30},{10,-10},{18,-10}},
       color={0,0,127},
       pattern=LinePattern.Dash));
-  connect(refCycHeaPumHea.QEva_flow, gainEva.u) annotation (Line(points={{24,38},
-          {24,8},{-22.4,8}},                color={0,0,127}));
+  connect(refCycHeaPumHea.QEva_flow, gainEva.u) annotation (Line(points={{26.6667,
+          38.3333},{26.6667,10},{-18,10}},  color={0,0,127}));
   connect(sigBus,refCycHeaPumCoo.sigBus)  annotation (Line(
-      points={{0,100},{0,90},{-40,90},{-40,86},{-39.705,86},{-39.705,82.8}},
+      points={{0,100},{0,90},{-40,90},{-40,86},{-39.6708,86},{-39.6708,80}},
       color={255,204,51},
       thickness=0.5));
   connect(sigBus,refCycHeaPumHea.sigBus)  annotation (Line(
-      points={{0,100},{0,90},{39.8,90},{39.8,80.8}},
+      points={{0,100},{0,90},{39.8333,90},{39.8333,80}},
       color={255,204,51},
       thickness=0.5));
   connect(swiQCon.u2, sigBus.hea) annotation (Line(points={{58,0},{0,0},{0,100}},
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo
index 74021622c1..044fff4cab 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/BaseClasses/PartialOperationalEnvelope.mo
@@ -2,9 +2,9 @@
 partial model PartialOperationalEnvelope
   "Indicates if the device operation is within a defined envelope"
   extends BaseClasses.PartialSafetyWithCounter;
-  parameter Real tabUppHea[:,2]
+  parameter Modelica.Units.SI.Temperature tabUppHea[:,2]
     "Upper boundary for heating with second column as useful temperature side";
-  parameter Real tabLowCoo[:,2]
+  parameter Modelica.Units.SI.Temperature tabLowCoo[:,2]
     "Lower boundary for cooling with second column as useful temperature side";
   parameter Boolean use_TUseSidOut=false
     "=true to use useful side outlet temperature for envelope, false for inlet";
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
index e7a659809d..c0770d6d25 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Generic.mo
@@ -21,7 +21,7 @@ record Generic "Generic record definition for safety control blocks"
   parameter Integer maxCycRat "Maximum cycle rate"
     annotation (Dialog(group="On/Off Control",
     enable=use_maxCycRat));
-  parameter Real ySetRed
+  parameter Real ySetRed(unit="1")
     "Reduced relative compressor speed to allow longer on-time"
         annotation (
           Dialog(group="On/Off Control",
@@ -37,11 +37,13 @@ record Generic "Generic record definition for safety control blocks"
     annotation (
       Dialog(group="Operational Envelope"),
       choices(checkBox=true));
-  parameter Real tabUppHea[:,2] "Upper envelope boundary for heating"
+  parameter Modelica.Units.SI.Temperature tabUppHea[:,2]
+    "Upper temperature boundary for heating with second column as useful temperature side"
     annotation (
       Dialog(group="Operational Envelope",
       enable=use_opeEnv));
-  parameter Real tabLowCoo[:,2] "Lower envelope boundary for cooling"
+  parameter Modelica.Units.SI.Temperature tabLowCoo[:,2]
+    "Lower temperature boundary for cooling with second column as useful temperature side"
     annotation (
       Dialog(group="Operational Envelope",
       enable=use_opeEnv));
@@ -61,7 +63,7 @@ record Generic "Generic record definition for safety control blocks"
   parameter Modelica.Units.SI.ThermodynamicTemperature TAntFre
     "Limit temperature for antifreeze control"
     annotation (Dialog(group="Anti Freeze Control", enable=use_antFre));
-  parameter Real dTHysAntFre
+  parameter Modelica.Units.SI.TemperatureDifference dTHysAntFre
     "Hysteresis interval width for antifreeze control"
     annotation (Dialog(group="Anti Freeze Control", enable=use_antFre));
   parameter Boolean use_minFlowCtr
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo
index 56255b84b7..05207ed390 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/Generic.mo
@@ -2,7 +2,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D;
 record Generic "Partial two-dimensional data of refrigerant machines"
     extends Modelica.Icons.Record;
   parameter Real tabPEle[:,:]
-    "Electrical power consumption table, T in degC, Q_flow in W";
+    "Electrical power consumption table, T in K, Q_flow in W";
   parameter Modelica.Units.SI.MassFlowRate mCon_flow_nominal
     "Nominal mass flow rate in condenser";
   parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericHeatPump.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericHeatPump.mo
index a5e236885b..f76fda6001 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericHeatPump.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Data/TableData2D/GenericHeatPump.mo
@@ -2,7 +2,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D;
 record GenericHeatPump "Partial heat pump data"
   extends IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.Generic;
   parameter Real tabQCon_flow[:,:]
-    "Heating output table, T in degC, Q_flow in W";
+    "Heating output table, T in K, Q_flow in W";
   parameter Real tabUppBou[:,2]
     "Points to define upper boundary for sink temperature";
   parameter Boolean use_TEvaOutForOpeEnv=false
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo
index f888ff9bcc..5c1b215ac3 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/LargeScaleWaterToWater.mo
@@ -78,16 +78,6 @@ model LargeScaleWaterToWater
   <a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D\">
   IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D</a>.
 </p>
-<p>
-  Currently the only data sheets for heat pumps that large is the record
-  <a href=\"modelica://IBPSA.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.WAMAK_WaterToWater_150kW\">
-  IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2DData.EN14511.WAMAK_WaterToWater_150kW</a>,
-  hence, the default value.
-</p>
-<p>
-  But you are free to insert custom data based on
-  the heat pump you want to analyze in your simulations.
-</p>
 <h4>Assumptions</h4>
 <ul>
 <li>
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/NoHeating.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/NoHeating.mo
index 6a3ca9d40a..6491495e87 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/NoHeating.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/NoHeating.mo
@@ -20,19 +20,19 @@ model NoHeating
     calCOP(PEleMin=1));
   Modelica.Blocks.Sources.Constant constZer(final k=0)
     "No heating, hence, zero"
-    annotation (Placement(transformation(extent={{-88,16},{-68,36}})));
+    annotation (Placement(transformation(extent={{-100,20},{-80,40}})));
 equation
-  connect(constZer.y, feeHeaFloEva.u1) annotation (Line(points={{-67,26},{-62,
-          26},{-62,4},{-94,4},{-94,-10},{-78,-10}}, color={0,0,127}));
-  connect(constZer.y, feeHeaFloEva.u2) annotation (Line(points={{-67,26},{-62,
-          26},{-62,4},{-94,4},{-94,-10},{-84,-10},{-84,-24},{-70,-24},{-70,-18}},
+  connect(constZer.y, feeHeaFloEva.u1) annotation (Line(points={{-79,30},{-62,30},
+          {-62,4},{-94,4},{-94,-10},{-78,-10}},     color={0,0,127}));
+  connect(constZer.y, feeHeaFloEva.u2) annotation (Line(points={{-79,30},{-62,30},
+          {-62,4},{-94,4},{-94,-10},{-84,-10},{-84,-24},{-70,-24},{-70,-18}},
         color={0,0,127}));
-  connect(constZer.y, redQCon.u2) annotation (Line(points={{-67,26},{-62,26},{-62,
-          4},{64,4},{64,-58}}, color={0,0,127}));
+  connect(constZer.y, redQCon.u2) annotation (Line(points={{-79,30},{-62,30},{-62,
+          4},{64,4},{64,-78}}, color={0,0,127}));
   connect(constZer.y, PEle)
-    annotation (Line(points={{-67,26},{0,26},{0,-110}}, color={0,0,127}));
-  connect(calCOP.PEle, constZer.y) annotation (Line(points={{-58,-66},{-50,-66},{
-          -50,26},{-67,26}}, color={0,0,127}));
+    annotation (Line(points={{-79,30},{0,30},{0,-130}}, color={0,0,127}));
+  connect(calCOP.PEle, constZer.y) annotation (Line(points={{-58,-86},{-50,-86},{
+          -50,30},{-79,30}}, color={0,0,127}));
   annotation (Documentation(info="<html>
 <p>
   Using this model, the heat pump will always be off.
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo
index f44b971b82..bfd27c5476 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo
@@ -27,12 +27,12 @@ partial model PartialCarnot
         x1=dTCarMin,
         x2=(TConAct - TEvaAct),
         deltaX=0.25)) "Internal calculation of carnot efficiency"
-    annotation (Placement(transformation(extent={{-90,38},{-70,58}})));
+    annotation (Placement(transformation(extent={{-100,60},{-80,80}})));
   Modelica.Blocks.Math.Product proQUse_flow "Calculate QUse_flow" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-50,40})));
+        origin={-50,50})));
   Modelica.Blocks.Math.Product proPEle "Calculate electrical power consumption" annotation (
      Placement(transformation(
         extent={{-10,-10},{10,10}},
@@ -43,7 +43,7 @@ partial model PartialCarnot
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={80,80})));
+        origin={88,90})));
   Modelica.Blocks.Routing.RealPassThrough pasThrYSet "ySet from signal bus"
     annotation (Placement(transformation(extent={{20,60},{40,80}})));
   Modelica.Units.SI.Temperature TUseSidAct = if useForChi then TEvaAct else TConAct
@@ -80,12 +80,12 @@ partial model PartialCarnot
     "Evaporator outlet pass through" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-70,78})));
+        origin={-70,90})));
   Modelica.Blocks.Routing.RealPassThrough pasThrTCon
     "Condenser outlet pass through" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-30,78})));
+        origin={-30,90})));
 protected
   parameter Modelica.Units.SI.HeatFlowRate QCon_flow_nominal
     "Nominal condenser heat flow rate";
@@ -99,24 +99,24 @@ protected
      "Evaporator heat flow rate";
 
 equation
-  connect(reaEtaCarEff.y, proQUse_flow.u2) annotation (Line(points={{-69,48},{-64,
-          48},{-64,56},{-56,56},{-56,52}},
-                                  color={0,0,127}));
-  connect(proPEle.y, proQUse_flow.u1) annotation (Line(points={{70,39},{70,38},{
-          -34,38},{-34,56},{-44,56},{-44,52}}, color={0,0,127}));
-  connect(proPEle.u1, constPEle.y) annotation (Line(points={{76,62},{76,66},{80,
-          66},{80,69}}, color={0,0,127}));
+  connect(reaEtaCarEff.y, proQUse_flow.u2) annotation (Line(points={{-79,70},{-56,
+          70},{-56,62}},          color={0,0,127}));
+  connect(proPEle.y, proQUse_flow.u1) annotation (Line(points={{70,39},{70,34},{
+          -20,34},{-20,70},{-44,70},{-44,62}}, color={0,0,127}));
+  connect(proPEle.u1, constPEle.y) annotation (Line(points={{76,62},{76,66},{88,
+          66},{88,79}}, color={0,0,127}));
   connect(pasThrYSet.y, proPEle.u2)
     annotation (Line(points={{41,70},{64,70},{64,62}}, color={0,0,127}));
   connect(constZer.y, swiPEle.u3) annotation (Line(points={{8.88178e-16,21},{
           8.88178e-16,28},{42,28},{42,22}}, color={0,0,127}));
   connect(proPEle.y, swiPEle.u1) annotation (Line(points={{70,39},{70,34},{58,
           34},{58,22}}, color={0,0,127}));
-  connect(proQUse_flow.y, swiQUse.u1) annotation (Line(points={{-50,29},{-50,28},
-          {-58,28},{-58,22}}, color={0,0,127}));
+  connect(proQUse_flow.y, swiQUse.u1) annotation (Line(points={{-50,39},{-50,36},
+          {-58,36},{-58,22}}, color={0,0,127}));
   connect(swiQUse.u3, constZer.y) annotation (Line(points={{-42,22},{-42,28},{
           8.88178e-16,28},{8.88178e-16,21}}, color={0,0,127}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false)),
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,
+            -120},{120,120}})),
       Documentation(info="<html>
 <p>
   Partial model for equations and componenents used in both heat pump
@@ -128,5 +128,6 @@ equation
     First implementation (see issue <a href=
     \"https://github.com/ibpsa/modelica-ibpsa/issues/1576\">#1576</a>)
   </li></ul>
-</html>"));
+</html>"),
+    Icon(coordinateSystem(extent={{-120,-120},{120,120}})));
 end PartialCarnot;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
index 5377ecc3ac..b408024c89 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
@@ -10,21 +10,23 @@ partial model PartialHeatPumpCycle
   IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.CalculateCOP calCOP(
     PEleMin=PEle_nominal*0.1)  if calEff
     "Calculate the COP"
-    annotation (Placement(transformation(extent={{-60,-60},{-80,-80}})));
+    annotation (Placement(transformation(extent={{-60,-80},{-80,-100}})));
 equation
-  connect(iceFacCal.iceFac, sigBus.icefacHPMea) annotation (Line(points={{-69,-40},
-          {-56,-40},{-56,-26},{-102,-26},{-102,104},{1,104}}, color={0,0,127}),
+  connect(iceFacCal.iceFac, sigBus.icefacHPMea) annotation (Line(points={{-81.2,
+          -50},{-64,-50},{-64,-28},{-110,-28},{-110,120},{1,120}},
+                                                              color={0,0,127}),
       Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
   connect(feeHeaFloEva.y, proRedQEva.u2)
-    annotation (Line(points={{-61,-10},{-14,-10},{-14,-58}}, color={0,0,127}));
-  connect(calCOP.QUse_flow, redQCon.y) annotation (Line(points={{-58,-74},{-50,
-          -74},{-50,-96},{70,-96},{70,-81}}, color={0,0,127}));
-  connect(calCOP.COP, sigBus.COP) annotation (Line(points={{-81,-70},{-102,-70},{
-          -102,104},{1,104}},  color={0,0,127}), Text(
+    annotation (Line(points={{-61,-10},{-24,-10},{-24,-78}}, color={0,0,127}));
+  connect(calCOP.QUse_flow, redQCon.y) annotation (Line(points={{-58,-94},{-46,
+          -94},{-46,-116},{70,-116},{70,-101}},
+                                             color={0,0,127}));
+  connect(calCOP.COP, sigBus.COP) annotation (Line(points={{-81,-90},{-110,-90},{
+          -110,120},{1,120}},  color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
index dde6b04f3e..fd50bf5999 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
@@ -44,43 +44,43 @@ partial model PartialRefrigerantCycle
     "Replaceable model to calculate the icing factor" annotation (
     choicesAllMatching=true,
     Dialog(group="Frosting supression"),
-    Placement(transformation(extent={{-90,-50},{-70,-30}})));
+    Placement(transformation(extent={{-98,-58},{-82,-42}})));
 
   Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", final displayUnit=
         "kW") "Electrical Power consumed by the device" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={0,-110})));
+        origin={0,-130})));
   Modelica.Blocks.Interfaces.RealOutput QCon_flow(final unit="W", final
       displayUnit="kW") "Heat flow rate through condenser" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-80,-110})));
+        origin={-80,-130})));
   IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantMachineControlBus sigBus
     "Bus-connector" annotation (Placement(transformation(
         extent={{-15,-14},{15,14}},
         rotation=0,
-        origin={1,104})));
+        origin={1,120})));
   Modelica.Blocks.Interfaces.RealOutput QEva_flow(final unit="W", final
       displayUnit="kW") "Heat flow rate through evaporator" annotation (
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={80,-110})));
+        origin={80,-130})));
   Modelica.Blocks.Math.Add redQCon
     "Reduce heat flow to the condenser based on the reduction to the evaporator"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={70,-70})));
+        origin={70,-90})));
   Modelica.Blocks.Math.Product proRedQEva
     "Reduce heat flow to the evaporator based on the icing factor"
     annotation (Placement(transformation(
         extent={{-10,10},{10,-10}},
         rotation=270,
-        origin={-20,-70})));
+        origin={-30,-90})));
 
   IBPSA.Utilities.IO.Strings.StringOutput datSouOut
   "String output of data source";
@@ -89,29 +89,31 @@ protected
     "Constant String with data source as output";
 equation
   connect(conStrSou.y, datSouOut);
-  connect(proRedQEva.y, QEva_flow) annotation (Line(points={{-20,-81},{-20,-88},{
-          0,-88},{0,-52},{88,-52},{88,-96},{80,-96},{80,-110}},
-                               color={0,0,127}));
-  connect(proRedQEva.y, redQCon.u1) annotation (Line(points={{-20,-81},{-20,-88},
-          {0,-88},{0,-52},{76,-52},{76,-58}}, color={0,0,127}));
-  connect(redQCon.y, QCon_flow) annotation (Line(points={{70,-81},{70,-96},{-80,
-          -96},{-80,-110}}, color={0,0,127}));
+  connect(proRedQEva.y, QEva_flow) annotation (Line(points={{-30,-101},{-30,-108},
+          {80,-108},{80,-130}},color={0,0,127}));
+  connect(proRedQEva.y, redQCon.u1) annotation (Line(points={{-30,-101},{-30,-108},
+          {2,-108},{2,-72},{76,-72},{76,-78}},color={0,0,127}));
+  connect(redQCon.y, QCon_flow) annotation (Line(points={{70,-101},{70,-116},{-80,
+          -116},{-80,-130}},color={0,0,127}));
   connect(iceFacCal.iceFac, proRedQEva.u1)
-    annotation (Line(points={{-69,-40},{-26,-40},{-26,-58}}, color={0,0,127}));
+    annotation (Line(points={{-81.2,-50},{-36,-50},{-36,-78}},
+                                                             color={0,0,127}));
   connect(iceFacCal.sigBus, sigBus) annotation (Line(
-      points={{-90.1,-40},{-102,-40},{-102,104},{1,104}},
+      points={{-98.08,-50},{-110,-50},{-110,120},{1,120}},
       color={255,204,51},
       thickness=0.5));
-  annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={
+  annotation (Icon(coordinateSystem(extent={{-120,-120},
+            {120,120}}),                                        graphics={
                                 Rectangle(
-        extent={{-100,-100},{100,100}},
+        extent={{-120,-120},{120,120}},
         lineColor={0,0,255},
         fillColor={255,255,255},
         fillPattern=FillPattern.Solid),   Text(
           extent={{-57.5,-35},{57.5,35}},
           pattern=LinePattern.Dash,
-          textString="%name", origin={-1.5,113},
-          rotation=180)}),Diagram(coordinateSystem(preserveAspectRatio=false)),
+          textString="%name", origin={2.5,153},
+          rotation=180)}),Diagram(coordinateSystem(extent={
+            {-120,-120},{120,120}})),
     Documentation(revisions="<html><ul>
   <li>
     <i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo
index 142f9cd2d5..e869ff5b2e 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialTableData2D.mo
@@ -24,7 +24,7 @@ partial model PartialTableData2D
       Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=-90,
-        origin={80,30})));
+        origin={90,50})));
   Modelica.Blocks.Tables.CombiTable2Ds tabQUse_flow(
     final tableOnFile=false,
     final tableName="NoName",
@@ -37,13 +37,13 @@ partial model PartialTableData2D
     final extrapolation=extrapolation) "Table for useful heat flow rate"
                                        annotation (Placement(transformation(
           extent={{-10,-10},{10,10}}, rotation=-90,
-        origin={40,30})));
+        origin={50,50})));
   Modelica.Blocks.Math.Product ySetTimScaFac
     "Create the product of the scaling factor and relative compressor speed"
     annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=-90,
-        origin={-70,36})));
+        origin={-60,50})));
 
 
   Modelica.Blocks.Math.Product scaFacTimPel "Scale electrical power consumption"
@@ -59,8 +59,8 @@ partial model PartialTableData2D
   Modelica.Blocks.Sources.Constant constScaFac
     "Calculates correction of table output based on scaling factor"
     annotation (Placement(
-        transformation(extent={{-10,-10},{10,10}}, rotation=270,
-        origin={-80,70})));
+        transformation(extent={{-10,-10},{10,10}}, rotation=0,
+        origin={-90,70})));
 
 
   Modelica.Blocks.Routing.RealPassThrough reaPasThrTEvaIn if not use_TEvaOutForTab
@@ -68,25 +68,25 @@ partial model PartialTableData2D
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-50,80})));
+        origin={-50,90})));
   Modelica.Blocks.Routing.RealPassThrough reaPasThrTConIn if not use_TConOutForTab
     "Used to enable conditional bus connection" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={40,80})));
+        origin={50,90})));
   Modelica.Blocks.Routing.RealPassThrough reaPasThrTEvaOut if use_TEvaOutForTab
     "Used to enable conditional bus connection" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={-20,80})));
+        origin={-10,90})));
   Modelica.Blocks.Routing.RealPassThrough reaPasThrTConOut if use_TConOutForTab
     "Used to enable conditional bus connection" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
-        origin={70,80})));
+        origin={90,90})));
 protected
   parameter Real perDevMasFloCon
     "Percent of deviation of nominal mass flow rate at condenser in percent";
@@ -123,17 +123,18 @@ initial algorithm
 
 equation
   connect(constScaFac.y, ySetTimScaFac.u2)
-    annotation (Line(points={{-80,59},{-80,48},{-76,48}}, color={0,0,127}));
+    annotation (Line(points={{-79,70},{-66,70},{-66,62}}, color={0,0,127}));
   connect(scaFacTimPel.u2, ySetTimScaFac.y) annotation (Line(points={{-46,14},{
-          -46,18},{-70,18},{-70,25}},
+          -46,20},{-60,20},{-60,39}},
                                   color={0,0,127}));
-  connect(tabQUse_flow.y, scaFacTimQUse_flow.u1) annotation (Line(points={{40,19},
-          {42,19},{42,14},{46,14}}, color={0,0,127}));
+  connect(tabQUse_flow.y, scaFacTimQUse_flow.u1) annotation (Line(points={{50,39},
+          {50,32},{46,32},{46,14}}, color={0,0,127}));
   connect(scaFacTimQUse_flow.u2, ySetTimScaFac.y) annotation (Line(points={{34,14},
-          {34,18},{-70,18},{-70,25}}, color={0,0,127}));
-  connect(tabPEle.y, scaFacTimPel.u1) annotation (Line(points={{80,19},{80,18},{
-          -34,18},{-34,14}}, color={0,0,127}));
-  annotation (Diagram(coordinateSystem(preserveAspectRatio=false)),
+          {34,20},{-60,20},{-60,39}}, color={0,0,127}));
+  connect(tabPEle.y, scaFacTimPel.u1) annotation (Line(points={{90,39},{90,26},{
+          -34,26},{-34,14}}, color={0,0,127}));
+  annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-120,
+            -120},{120,120}})),
     Documentation(info="<html>
 <p>
   Partial model for equations and componenents used in both heat pump
@@ -145,5 +146,6 @@ equation
     First implementation (see issue <a href=
     \"https://github.com/ibpsa/modelica-ibpsa/issues/1576\">#1576</a>)
   </li></ul>
-</html>"));
+</html>"),
+    Icon(coordinateSystem(extent={{-120,-120},{120,120}})));
 end PartialTableData2D;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
index eef33df018..7f599d642f 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -18,61 +18,68 @@ model ConstantQualityGrade "Carnot COP with a constant qualtiy grade"
     "Nominal EER";
 equation
 
-  connect(pasThrYSet.u, sigBus.ySet) annotation (Line(points={{18,70},{1,70},{1,
-          104}}, color={0,0,127}), Text(
+  connect(pasThrYSet.u, sigBus.ySet) annotation (Line(points={{18,70},{0,70},{0,
+          118},{2,118},{2,120},{1,120}},
+                 color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
   if useInHeaPum then
-    connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,90},{-30,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTCon.u, sigBus.TConOutMea) annotation (Line(points={{-30,102},{
+            -30,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-6,3},{-6,3}},
         horizontalAlignment=TextAlignment.Right));
-    connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,90},{-70,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTEva.u, sigBus.TEvaOutMea) annotation (Line(points={{-70,102},{
+            -70,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{6,3},{6,3}},
         horizontalAlignment=TextAlignment.Left));
   else
-    connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,90},{-30,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTCon.u, sigBus.TEvaOutMea) annotation (Line(points={{-30,102},{
+            -30,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{-6,3},{-6,3}},
         horizontalAlignment=TextAlignment.Right));
-    connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,90},{-70,
-            104},{1,104}}, color={0,0,127}), Text(
+    connect(pasThrTEva.u, sigBus.TConOutMea) annotation (Line(points={{-70,102},{
+            -70,120},{1,120}},
+                           color={0,0,127}), Text(
         string="%second",
         index=1,
         extent={{6,3},{6,3}},
         horizontalAlignment=TextAlignment.Left));
   end if;
   connect(swiPEle.y, redQCon.u2) annotation (Line(points={{50,-1},{50,-26},{62,
-          -26},{62,-58},{64,-58}}, color={0,0,127}));
+          -26},{62,-78},{64,-78}}, color={0,0,127}));
   connect(swiPEle.y, PEle) annotation (Line(points={{50,-1},{50,-92},{0,-92},{0,
-          -110}}, color={0,0,127}));
+          -130}}, color={0,0,127}));
   connect(swiPEle.y, feeHeaFloEva.u2) annotation (Line(points={{50,-1},{50,-24},{
           -70,-24},{-70,-18}},  color={0,0,127}));
   connect(swiQUse.y, feeHeaFloEva.u1) annotation (Line(points={{-50,-1},{-88,-1},
           {-88,-10},{-78,-10}}, color={0,0,127}));
-  connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-50,
-          32},{1,32},{1,104}}, color={255,0,255}), Text(
+  connect(swiQUse.u2, sigBus.onOffMea) annotation (Line(points={{-50,22},{-50,30},
+          {0,30},{0,122},{1,122},{1,120}},
+                               color={255,0,255}), Text(
       string="%second",
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
-  connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,56},
-          {1,56},{1,104}}, color={255,0,255}), Text(
+  connect(swiPEle.u2, sigBus.onOffMea) annotation (Line(points={{50,22},{50,46},{
+          0,46},{0,118},{2,118},{2,120},{1,120}},
+                           color={255,0,255}), Text(
       string="%second",
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
   connect(swiPEle.y, calCOP.PEle) annotation (Line(points={{50,-1},{50,-24},{-44,
-          -24},{-44,-66},{-58,-66}}, color={0,0,127}));
+          -24},{-44,-86},{-58,-86}}, color={0,0,127}));
   annotation (Documentation(revisions="<html><ul>
   <li>
     <i>October 2, 2022</i> by Fabian Wuellhorst:<br/>
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
index 39f0d34041..7d090e984e 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -31,86 +31,84 @@ model TableData2D "Performance data based on condenser outlet and evaporator inl
 
 equation
 
-  connect(scaFacTimPel.y, feeHeaFloEva.u2) annotation (Line(points={{-40,-11},{-40,
+  connect(scaFacTimPel.y, feeHeaFloEva.u2) annotation (Line(points={{-40,-9},{-40,
           -24},{-70,-24},{-70,-18}}, color={0,0,127}));
-  connect(scaFacTimPel.y, PEle) annotation (Line(points={{-40,-11},{-40,-24},{0,
-          -24},{0,-110}}, color={0,0,127}));
-  connect(scaFacTimPel.y, redQCon.u2) annotation (Line(points={{-40,-11},{-40,-24},
-          {64,-24},{64,-58}}, color={0,0,127}));
-  connect(scaFacTimQUse_flow.y, feeHeaFloEva.u1) annotation (Line(points={{40,-11},
+  connect(scaFacTimPel.y, PEle) annotation (Line(points={{-40,-9},{-40,-24},{0,
+          -24},{0,-130}}, color={0,0,127}));
+  connect(scaFacTimPel.y, redQCon.u2) annotation (Line(points={{-40,-9},{-40,-24},
+          {64,-24},{64,-78}}, color={0,0,127}));
+  connect(scaFacTimQUse_flow.y, feeHeaFloEva.u1) annotation (Line(points={{40,-9},
           {40,-18},{-86,-18},{-86,-10},{-78,-10}}, color={0,0,127}));
-  connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-64,48},{-64,56},
-          {1,56},{1,104}},     color={0,0,127}), Text(
+  connect(ySetTimScaFac.u1, sigBus.ySet) annotation (Line(points={{-54,62},{-54,
+          74},{-70,74},{-70,120},{1,120}},
+                               color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-3,6},{-3,6}},
       horizontalAlignment=TextAlignment.Right));
-  connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-20,92},
-          {-20,104},{1,104}},      color={0,0,127}), Text(
+  connect(reaPasThrTEvaOut.u, sigBus.TEvaOutMea) annotation (Line(points={{-10,102},
+          {-10,120},{1,120}},      color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,92},
-          {-50,106},{0,106},{0,104},{1,104}},      color={0,0,127}), Text(
+  connect(reaPasThrTEvaIn.u, sigBus.TEvaInMea) annotation (Line(points={{-50,102},
+          {-50,120},{1,120}},                      color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{40,92},{
-          40,104},{1,104}},  color={0,0,127}), Text(
+  connect(reaPasThrTConIn.u, sigBus.TConInMea) annotation (Line(points={{50,102},
+          {50,120},{1,120}}, color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{70,92},
-          {70,104},{1,104}},      color={0,0,127}), Text(
+  connect(reaPasThrTConOut.u, sigBus.TConOutMea) annotation (Line(points={{90,102},
+          {90,120},{1,120}},      color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(scaFacTimPel.y, calCOP.PEle) annotation (Line(points={{-40,-11},{-40,
-          -66},{-58,-66}},                                     color={0,0,127}));
+  connect(scaFacTimPel.y, calCOP.PEle) annotation (Line(points={{-40,-9},{-40,-24},
+          {-50,-24},{-50,-86},{-58,-86}},                      color={0,0,127}));
   if useInHeaPum then
     connect(reaPasThrTConOut.y, tabPEle.u1)
-      annotation (Line(points={{70,69},{70,48},{86,48},{86,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{96,70},{96,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabPEle.u1)
-      annotation (Line(points={{40,69},{40,48},{86,48},{86,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{96,70},{96,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabQUse_flow.u1)
-      annotation (Line(points={{40,69},{40,48},{46,48},{46,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{56,70},{56,62}}, color={0,0,127}));
     connect(reaPasThrTConOut.y, tabQUse_flow.u1)
-      annotation (Line(points={{70,69},{70,48},{46,48},{46,42}}, color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-20,69},{
-            -20,66},{74,66},{74,42}},
+      annotation (Line(points={{90,79},{90,70},{56,70},{56,62}}, color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabPEle.u2) annotation (Line(points={{-10,79},{
+            -10,70},{84,70},{84,62}},
                               color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-20,69},
-            {-20,66},{34,66},{34,42}},color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,69},{-50,
-            62},{74,62},{74,42}},
+    connect(reaPasThrTEvaOut.y, tabQUse_flow.u2) annotation (Line(points={{-10,79},
+            {-10,70},{44,70},{44,62}},color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabPEle.u2) annotation (Line(points={{-50,79},{-50,
+            70},{84,70},{84,62}},
                               color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,69},
-            {-50,62},{34,62},{34,42}},
+    connect(reaPasThrTEvaIn.y, tabQUse_flow.u2) annotation (Line(points={{-50,79},
+            {-50,70},{44,70},{44,62}},
                                   color={0,0,127}));
   else
-    connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-20,69},{
-            -20,66},{34,66},{34,48},{86,48},{86,42}},
-                                              color={0,0,127}));
-    connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-20,69},
-            {-20,66},{34,66},{34,48},{46,48},{46,42}},color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,69},{-50,
-            62},{34,62},{34,48},{86,48},{86,42}},
-                                              color={0,0,127}));
-    connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,69},
-            {-50,62},{34,62},{34,48},{46,48},{46,42}},
-                                                  color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabPEle.u1) annotation (Line(points={{-10,79},{
+            -10,70},{96,70},{96,62}},         color={0,0,127}));
+    connect(reaPasThrTEvaOut.y, tabQUse_flow.u1) annotation (Line(points={{-10,79},
+            {-10,70},{56,70},{56,62}},                color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabPEle.u1) annotation (Line(points={{-50,79},{-50,
+            70},{96,70},{96,62}},             color={0,0,127}));
+    connect(reaPasThrTEvaIn.y, tabQUse_flow.u1) annotation (Line(points={{-50,79},
+            {-50,70},{56,70},{56,62}},            color={0,0,127}));
     connect(reaPasThrTConOut.y, tabPEle.u2)
-      annotation (Line(points={{70,69},{70,48},{74,48},{74,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{84,70},{84,62}}, color={0,0,127}));
     connect(reaPasThrTConOut.y, tabQUse_flow.u2)
-      annotation (Line(points={{70,69},{70,48},{34,48},{34,42}}, color={0,0,127}));
+      annotation (Line(points={{90,79},{90,70},{44,70},{44,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabPEle.u2)
-      annotation (Line(points={{40,69},{40,48},{74,48},{74,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{84,70},{84,62}}, color={0,0,127}));
     connect(reaPasThrTConIn.y, tabQUse_flow.u2)
-      annotation (Line(points={{40,69},{40,48},{34,48},{34,42}}, color={0,0,127}));
+      annotation (Line(points={{50,79},{50,70},{44,70},{44,62}}, color={0,0,127}));
   end if;
   annotation (Icon(graphics={
     Line(points={