diff --git a/Tests/Data/LIE/HydroMechanics/TaskB.gml b/Tests/Data/LIE/HydroMechanics/TaskB.gml
index 7aaccd45a9d266209ef78f1305feabefeb88c517..5837853da3c9f073257335127485907a9201cc64 100644
--- a/Tests/Data/LIE/HydroMechanics/TaskB.gml
+++ b/Tests/Data/LIE/HydroMechanics/TaskB.gml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e88d2f7900b57dbd72b6a4c25f5132a50019f9221b0ac9c8be08ad4bc9f321c
-size 789
+oid sha256:239165698d26084a7ecd7a7c96b2326d15025a0c99fdbbc81e5d278bd9cfc463
+size 1009
diff --git a/Tests/Data/LIE/HydroMechanics/TaskB.prj b/Tests/Data/LIE/HydroMechanics/TaskB.prj
index 87c52920e5477a34f60765308421268aa6be9660..484902b6c3ca2730a0ca5c347dff5369a8b5b745 100644
--- a/Tests/Data/LIE/HydroMechanics/TaskB.prj
+++ b/Tests/Data/LIE/HydroMechanics/TaskB.prj
@@ -238,14 +238,14 @@
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>TaskB</geometrical_set>
-                    <geometry>PLY_TOP</geometry>
+                    <geometry>FRACTURE_TOP</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p0</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>TaskB</geometrical_set>
-                    <geometry>PLY_BOTTOM</geometry>
+                    <geometry>FRACTURE_BOTTOM</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p0</parameter>
@@ -296,14 +296,14 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>TaskB</geometrical_set>
-                    <geometry>PLY_TOP</geometry>
+                    <geometry>FRACTURE_TOP</geometry>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>zero_u</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>TaskB</geometrical_set>
-                    <geometry>PLY_BOTTOM</geometry>
+                    <geometry>FRACTURE_BOTTOM</geometry>
                     <type>Dirichlet</type>
                     <component>1</component>
                     <parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture.prj b/Tests/Data/LIE/HydroMechanics/single_fracture.prj
index 8ed7e8954c01bf252ef6bb3479c8f95908a57e97..0835d191ccc8181b765d30bfac9a05dc0f409b4f 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture.prj
@@ -273,14 +273,14 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_EAST</geometry>
+                    <geometry>POINT5</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>zero_u</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_WEST</geometry>
+                    <geometry>POINT4</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
index 64fd8ae52ff4b724e9f6ec948511656a90f00718..ac4b5afc313c4eb5ed872c4a4525f1b0a606af55 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.gml
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:71f608917a6cb2be7a4ec9ebdb59d12ee31f5fbb0457a1d1f230a47f441e3b4c
-size 1808
+oid sha256:b6977227ed10a23e8c3e5a1e3c551a41a6f6ed022f433c1fb95ded45256d0e0b
+size 2045
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
index 9c2c60e719e44520a50ce04df716f939082468d2..7ccab7ce328d3084c581c5c8f10caf7b499d3f37 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3D.prj
@@ -287,28 +287,28 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>single_fracture_3D</geometrical_set>
-                    <geometry>left</geometry>
+                    <geometry>inlet</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>zero_u</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture_3D</geometrical_set>
-                    <geometry>right</geometry>
+                    <geometry>outlet</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>zero_u</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture_3D</geometrical_set>
-                    <geometry>front</geometry>
+                    <geometry>fracture_front</geometry>
                     <type>Dirichlet</type>
                     <component>2</component>
                     <parameter>zero_u</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture_3D</geometrical_set>
-                    <geometry>back</geometry>
+                    <geometry>fracture_back</geometry>
                     <type>Dirichlet</type>
                     <component>2</component>
                     <parameter>zero_u</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
index 0d2a3aeb7f872f7f0f28c0fd24a5d127298dcdb1..cc795746308d0cb4ce65d9a2bcd2853f684f2848 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow.prj
@@ -229,14 +229,14 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_EAST</geometry>
+                    <geometry>InjectionPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_in</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_WEST</geometry>
+                    <geometry>OutletPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_out</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
index bc16e137228a401e138fa66fdc450efa01484238..72a0f022bd086679ccd0aa1ed0a436b276c5b0f2 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0.prj
@@ -229,14 +229,14 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_EAST</geometry>
+                    <geometry>InjectionPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_in</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_WEST</geometry>
+                    <geometry>OutletPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_out</parameter>
diff --git a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
index 4bfb8a209596052f0cd9dbfaab9fd005e4b56c04..4a56fa6ef3ffd12ac6b97813c2c41aa0eb879891 100644
--- a/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
+++ b/Tests/Data/LIE/HydroMechanics/single_fracture_3compartments_flow_linear_aperture0_e.prj
@@ -229,14 +229,14 @@
             <boundary_conditions>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_EAST</geometry>
+                    <geometry>InjectionPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_in</parameter>
                 </boundary_condition>
                 <boundary_condition>
                     <geometrical_set>single_fracture</geometrical_set>
-                    <geometry>PLY_WEST</geometry>
+                    <geometry>OutletPoint</geometry>
                     <type>Dirichlet</type>
                     <component>0</component>
                     <parameter>p_out</parameter>