diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo
index a72a9f7eb5..4c367ff3cf 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/EvaporatorCondenserWithCapacity.mo
@@ -86,7 +86,7 @@ model EvaporatorCondenserWithCapacity
         origin={50,-50})));
   Modelica.Blocks.Interfaces.RealOutput T(
     final unit="K",
-    final displayUnit="degC")
+    displayUnit="degC")
     "Temperature of the condenser volume" annotation (Placement(
         transformation(extent={{100,-62},{124,-38}}), iconTransformation(extent=
            {{100,-62},{124,-38}})));
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/InflowTemperatureSensor.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/InflowTemperatureSensor.mo
index 60d4c5d3fa..7b22b96329 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/InflowTemperatureSensor.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/InflowTemperatureSensor.mo
@@ -3,7 +3,7 @@ block InflowTemperatureSensor "Custom block to measure instream fluid temperatur
 
   Modelica.Blocks.Interfaces.RealOutput y(
     final unit="K",
-    final displayUnit="degC")=0.0
+    displayUnit="degC")=0.0
     "Inflow temperature"
     annotation (Dialog(group="Time varying output signal"), Placement(
         transformation(extent={{100,-10},{120,10}})));
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialModularRefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialModularRefrigerantCycle.mo
index 56b71ecad1..8d5599bff9 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialModularRefrigerantCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialModularRefrigerantCycle.mo
@@ -10,26 +10,26 @@ partial model PartialModularRefrigerantCycle
         transformation(extent={{-18,84},{18,116}}), iconTransformation(extent={{-16,84},
             {18,114}})));
   Modelica.Blocks.Interfaces.RealOutput QCon_flow(
-    final unit="W", final displayUnit="kW")
+    final unit="W", displayUnit="kW")
     "Heat flow rate from the refrigerant to the condenser medium"
     annotation (Placement(transformation(extent={{100,-10},{120,10}})));
   Modelica.Blocks.Interfaces.RealOutput QEva_flow(
-    final unit="W", final displayUnit="kW")
+    final unit="W", displayUnit="kW")
     "Heat flow rate from the evaporator medium to the refrigerant"
     annotation (Placement(transformation(extent={{-100,-10},{-120,10}})));
   Modelica.Blocks.Logical.Switch swiQEva(
-    u1(final unit="W", final displayUnit="kW"),
-    u3(final unit="W", final displayUnit="kW"),
-    y(final unit="W", final displayUnit="kW")) if use_rev
+    u1(final unit="W", displayUnit="kW"),
+    u3(final unit="W", displayUnit="kW"),
+    y(final unit="W", displayUnit="kW")) if use_rev
     "Routing block that picks the component acting as evaporator"
     annotation (Placement(transformation(extent={{-60,-10},{-80,10}})));
   Modelica.Blocks.Logical.Switch swiQCon(
-    y(final unit="W", final displayUnit="kW"),
-    u1(final unit="W", final displayUnit="kW"),
-    u3(final unit="W", final displayUnit="kW")) if use_rev
+    y(final unit="W", displayUnit="kW"),
+    u1(final unit="W", displayUnit="kW"),
+    u3(final unit="W", displayUnit="kW")) if use_rev
     "Routing block that picks the component acting as condenser"
     annotation (Placement(transformation(extent={{60,-10},{80,10}})));
-  Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", final displayUnit="kW")
+  Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", displayUnit="kW")
     "Routing block that picks the component for electric power consumption"
     annotation (Placement(
         transformation(
@@ -38,9 +38,9 @@ partial model PartialModularRefrigerantCycle
         origin={0.5,-110.5})));
 
   Modelica.Blocks.Logical.Switch swiPEle(
-    u1(final unit="W", final displayUnit="kW"),
-    u3(final unit="W", final displayUnit="kW"),
-    y(final unit="W", final displayUnit="kW")) if use_rev
+    u1(final unit="W", displayUnit="kW"),
+    u3(final unit="W", displayUnit="kW"),
+    y(final unit="W", displayUnit="kW")) if use_rev
     "Whether to use cooling or heating power output" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/CalculateCOP.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/CalculateCOP.mo
index e7eac52181..ec390c2917 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/CalculateCOP.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/CalculateCOP.mo
@@ -6,11 +6,11 @@ model CalculateCOP
   parameter Modelica.Units.SI.Power PEleMin(min=Modelica.Constants.eps)
     "If eletrical power consumption falls below this value, COP will be set to zero";
 
-  Modelica.Blocks.Interfaces.RealInput PEle(final unit="W", final displayUnit="W")
+  Modelica.Blocks.Interfaces.RealInput PEle(final unit="W", displayUnit="W")
     "Electrical power consumed by the system" annotation (Placement(
         transformation(extent={{-140,-60},{-100,-20}}), iconTransformation(extent=
            {{-140,-60},{-100,-20}})));
-  Modelica.Blocks.Interfaces.RealInput QUse_flow(final unit="W", final displayUnit="W")
+  Modelica.Blocks.Interfaces.RealInput QUse_flow(final unit="W", displayUnit="W")
     "Useful heat flow" annotation (Placement(transformation(
           extent={{-140,20},{-100,60}}), iconTransformation(extent={{-140,20},{-100,
             60}})));
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
index e903de7055..748a565328 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
@@ -47,7 +47,7 @@ partial model PartialRefrigerantCycle
   parameter Modelica.Units.SI.SpecificHeatCapacity cpEva
     "Evaporator medium specific heat capacity"
     annotation (Dialog(tab="Advanced", group="Medium properties"));
-  Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", final displayUnit=
+  Modelica.Blocks.Interfaces.RealOutput PEle(final unit="W", displayUnit=
         "kW") "Electrical Power consumed by the device" annotation (Placement(
         transformation(
         extent={{-10,-10},{10,10}},