diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
index a60ddd5dd0..7ee93245fd 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/AirToWater2D_OneRoomRadiator.mo
@@ -8,12 +8,11 @@ model AirToWater2D_OneRoomRadiator
     sin(nPorts=1, redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
     pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      dp_nominal=heaPum.dpEva_nominal,
       redeclare package Medium = MediumAir),
     sou(use_T_in=true,
       redeclare package Medium = MediumAir),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.AirToWaterTableData2D
     heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
index 1f90e489d2..0453fbe4bc 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/BaseClasses/PartialOneRoomRadiator.mo
@@ -71,18 +71,18 @@ partial model PartialOneRoomRadiator
 
 //----------------------------------------------------------------------------//
 
-  IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
-    redeclare package Medium = MediumWat,
-    nominalValuesDefineDefaultPressureCurve=true,
-    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
+    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)
     "Pump for radiator side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-70,-110})));
+        origin={-70,-110})), choicesAllMatching=true);
 //----------------------------------------------------------------------------//
 
   IBPSA.Fluid.Sensors.TemperatureTwoPort temRet(
@@ -109,16 +109,17 @@ partial model PartialOneRoomRadiator
 
 //--------------------------------------------------------------------------------------//
 
-  IBPSA.Fluid.Movers.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)
+  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)
     "Pump for heat pump source side" annotation (Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=90,
-        origin={-30,-180})));
+        origin={-30,-180})), choicesAllMatching=true);
   Modelica.Blocks.Math.BooleanToReal booToReaPumCon(
     realTrue=mCon_flow_nominal,
     y(start=0)) "Pump signal" annotation (Placement(transformation(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
index 0dbf085a45..21ad2f4051 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/CarnotWithLosses_OneRoomRadiator.mo
@@ -6,10 +6,8 @@ model CarnotWithLosses_OneRoomRadiator
     mCon_flow_nominal=heaPum.mCon_flow_nominal,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per),
-    pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPumSou(dp_nominal=heaPum.dpEva_nominal),
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
   extends Modelica.Icons.Example;
 
   parameter Real perHeaLos=0.01
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
index acb5244586..ef7172d75f 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mo
@@ -11,9 +11,9 @@ model LargeScaleWaterToWater_OneRoomRadiator
     Q_flow_nominal=200000,
     sin(nPorts=1),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
+    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPumSou(
       redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per),
-    pumHeaPumSou(
+    redeclare IBPSA.Fluid.Movers.FlowControlled_m_flow pumHeaPum(
       redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.VeroLine80slash115dash2comma2slash2 per));
 
   IBPSA.Fluid.HeatPumps.ModularReversible.LargeScaleWaterToWater heaPum(
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
index fd7453a9a0..008edc1107 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/Examples/Modular_OneRoomRadiator.mo
@@ -6,12 +6,11 @@ model Modular_OneRoomRadiator
     mEva_flow_nominal=heaPum.mEva_flow_nominal,
     sin(nPorts=1, redeclare package Medium = MediumAir),
     pumHeaPumSou(
-      redeclare IBPSA.Fluid.Movers.Data.Fans.Greenheck.BIDW12 per,
+      dp_nominal=heaPum.dpEva_nominal,
       redeclare package Medium = MediumAir),
     sou(redeclare package Medium = MediumAir),
     booToReaPumEva(realTrue=heaPum.mEva_flow_nominal),
-    pumHeaPum(
-      redeclare IBPSA.Fluid.Movers.Data.Pumps.Wilo.Stratos25slash1to6 per));
+    pumHeaPum(dp_nominal=heaPum.dpCon_nominal));
   extends Modelica.Icons.Example;
 
   IBPSA.Fluid.HeatPumps.ModularReversible.Modular heaPum(