diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index 0453fbe4bc..a46d8f1b12 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -71,18 +71,17 @@ partial model PartialOneRoomRadiator
 
 //----------------------------------------------------------------------------//
 
-  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPum
-    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
-      redeclare package Medium = MediumWat,
-      m_flow_nominal=mCon_flow_nominal,
-      m_flow_start=mCon_flow_nominal,
-      T_start=TRadSup_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPum(
+    redeclare package Medium = MediumWat,
+    m_flow_nominal=mCon_flow_nominal,
+    m_flow_start=mCon_flow_nominal,
+    T_start=TRadSup_nominal,
+    use_inputFilter=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-70,-110})), choicesAllMatching=true);
+        origin={-70,-110})));
 //----------------------------------------------------------------------------//
 
   IBPSA.Fluid.Sensors.TemperatureTwoPort temRet(
@@ -109,17 +108,16 @@ partial model PartialOneRoomRadiator
 
 //--------------------------------------------------------------------------------------//
 
-  replaceable IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPumSou
-    constrainedby IBPSA.Fluid.Movers.BaseClasses.PartialFlowMachine(
-      redeclare package Medium = MediumWat,
-      m_flow_start=mEva_flow_nominal,
-      m_flow_nominal=mEva_flow_nominal,
-      use_inputFilter=false,
-      energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
+  IBPSA.Fluid.Movers.Preconfigured.FlowControlled_m_flow pumHeaPumSou(
+    redeclare package Medium = MediumWat,
+    m_flow_start=mEva_flow_nominal,
+    m_flow_nominal=mEva_flow_nominal,
+    use_inputFilter=false,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-30,-180})), choicesAllMatching=true);
+        origin={-30,-180})));
   Modelica.Blocks.Math.BooleanToReal booToReaPumCon(
     realTrue=mCon_flow_nominal,
     y(start=0)) "Pump signal" annotation (Placement(transformation(