diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Data/Rock.mo b/IBPSA/Fluid/Geothermal/Aquifer/Data/Rock.mo
index 1f83096fbe..16d631bb5c 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Data/Rock.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Data/Rock.mo
@@ -5,7 +5,7 @@ record Rock "Soil data record of rock heat transfer properties"
     dSoi=2680,
     cSoi=833,
     phi=0.2,
-    pm=10E-15);
+    K=1E-5);
   annotation (
   defaultComponentPrefixes="parameter",
   defaultComponentName="aquDat",
diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Data/Template.mo b/IBPSA/Fluid/Geothermal/Aquifer/Data/Template.mo
index 2852c5e408..0a97a79656 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Data/Template.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Data/Template.mo
@@ -10,8 +10,8 @@ record Template
     "Density of the soil material";
   parameter Real phi(final unit="1")
     "Reservoir porosity";
-  parameter Real pm(final unit="m2")
-    "Aquifer permeability";
+  parameter Modelica.Units.SI.Velocity K
+    "Hydraulic conductivity";
   annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
         coordinateSystem(preserveAspectRatio=false)),
   defaultComponentPrefixes="parameter",
diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo b/IBPSA/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo
index e396e9e1e0..0d6af0b1a7 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo
@@ -28,8 +28,8 @@ model CoolingOffice
     THot_start=285.15,
     aquDat=IBPSA.Fluid.Geothermal.Aquifer.Data.Rock(),
     m_flow_nominal=mWat_flow_nominal,
-    dpAquifer_nominal=10,
-    dpExt_nominal=100) "Acquifer well"
+    dpExt_nominal=5000)
+                       "Acquifer well"
     annotation (Placement(transformation(extent={{-10,-20},{10,0}})));
   Sources.Boundary_pT bou(
     redeclare package Medium = IBPSA.Media.Water,
diff --git a/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo b/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo
index 460df49de4..36611e198c 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/MultiWell.mo
@@ -5,7 +5,7 @@ model MultiWell "Model of a single well for aquifer thermal energy storage"
   parameter Integer nVol(min=1)=10 "Number of control volumes used in discretization" annotation (
       Dialog(group="Subsurface"));
   parameter Modelica.Units.SI.Height h=200 "Aquifer thickness";
-  parameter Modelica.Units.SI.Height length=100+h/2
+  parameter Modelica.Units.SI.Height length=40
     "Length of one well, used to compute pressure drop";
   parameter Real nCoo=1 "Number of cold wells";
   parameter Real nHot=1 "Number of warm wells";
@@ -31,7 +31,7 @@ model MultiWell "Model of a single well for aquifer thermal energy storage"
      "Aquifer thermal properties" annotation (choicesAllMatching=true);
   parameter Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate" annotation (
       Dialog(group="Hydraulic circuit"));
-  parameter Modelica.Units.SI.PressureDifference dpAquifer_nominal(displayUnit= "Pa")
+  parameter Modelica.Units.SI.PressureDifference dpAquifer_nominal(displayUnit= "Pa")=m_flow_nominal*Modelica.Constants.g_n/2/Modelica.Constants.pi/h/aquDat.K*log(rMax/rWB)
      "Pressure drop at nominal mass flow rate in the aquifer"  annotation (
       Dialog(group="Hydraulic circuit"));
   final parameter Modelica.Units.SI.PressureDifference dpWell_nominal(displayUnit="Pa")=resHot.dp_nominal+resCoo.dp_nominal
diff --git a/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo b/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
index 204483acd5..c6875f8889 100644
--- a/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
+++ b/IBPSA/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
@@ -13,7 +13,6 @@ model SimulationTest
     TGroHot=393.15,
     aquDat=IBPSA.Fluid.Geothermal.Aquifer.Data.Rock(),
     m_flow_nominal=1,
-    dpAquifer_nominal=10,
     dpExt_nominal=0) "Aquifer wells"
     annotation (Placement(transformation(extent={{-20,20},{0,40}})));
   Sources.Boundary_pT bou(