diff --git a/NonLinearSolver/CMakeLists.txt b/NonLinearSolver/CMakeLists.txt
index db97f69c63c3b11b26b9d6e2f21810519d24e382..1b6b991a30c72c72bbb8ab8403337aa8fde54248 100644
--- a/NonLinearSolver/CMakeLists.txt
+++ b/NonLinearSolver/CMakeLists.txt
@@ -91,10 +91,10 @@ materialLaw Domain BoundaryConditions nlTerms field space periodicBC restart nlm
 ${CMAKE_CURRENT_BINARY_DIR} $ENV{NLSMPIINC})
 
 # To have the possibility to use python function in the code
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   include_directories(${PYTHON_INCLUDE_DIR})
   add_definitions(-DNLS_WITH_PYTHON)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
 file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
 
diff --git a/cm3apps/install.txt b/cm3apps/install.txt
index d758caa99525b0c020bad2076797336c9ac51825..4f616fd4c3d868ba2dbeec2477ffd7dade1dec9f 100644
--- a/cm3apps/install.txt
+++ b/cm3apps/install.txt
@@ -280,7 +280,7 @@ alredy in your .bashrc
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
-	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh/wrappers
+	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
      
           !!!! USE ENABLE_CXX11=OFF; for old version :in CMakeList of dG3D and NonLinearSolver, replate std=c++11 by std=c++0x to get set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH -std=c++0x")	
 	  !!!! if gmsh run error related to metis, compile gmsh without METIS
@@ -312,7 +312,7 @@ alredy in your .bashrc
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release
 	  export PATH=$PATH:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
-	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh/wrappers
+	  export PYTHONPATH=$PYTHONPATH:$HOME/gmsh/projects/dG3D/release:$HOME/gmsh/projects/dG3D/release/NonLinearSolver/gmsh
 
           !!!! USE ENABLE_CXX11=OFF; for old version : in CMakeList of dG3D and NonLinearSolver, replate std=c++11 by std=c++0x to get set(CMAKE_CXX_FLAGS " ${CMAKE_CXX_FLAGS} -DNONLOCALGMSH -std=c++0x")
 
@@ -455,8 +455,8 @@ C) Now you can install your project(s) (dgshell and/or dG3D and/or msch), NonLin
               export PATH=$PATH:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh
               export PATH=$PATH:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh
               export PATH=$PATH:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh
-              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dgshell/release:$HOME/cm3Libraries/dgshell/release/dG3D:$HOME/cm3Libraries/dgshell/debug/NonLinearSolver/gmsh/wrappers:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh/wrappers
-              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dG3D/release:$HOME/cm3Libraries/dG3D/debug:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh/wrappers:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh/wrappers
+              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dgshell/release:$HOME/cm3Libraries/dgshell/release/dG3D:$HOME/cm3Libraries/dgshell/debug/NonLinearSolver/gmsh:$HOME/cm3Libraries/dgshell/release/NonLinearSolver/gmsh
+              export PYTHONPATH=$PYTHONPATH:$HOME/cm3Libraries/dG3D/release:$HOME/cm3Libraries/dG3D/debug:$HOME/cm3Libraries/dG3D/debug/NonLinearSolver/gmsh:$HOME/cm3Libraries/dG3D/release/NonLinearSolver/gmsh
 
           (reload bashrc)
             exit the terminal and loggin again (to reload your .bashrc file)
@@ -490,7 +490,7 @@ C) Now you can install your project(s) (dgshell and/or dG3D and/or msch), NonLin
              ENABLE_MUMPS=ON 
              ENABLE_NUMPY=ON 
              ENABLE_GMM=OFF 
-             ENABLE_WRAP_PYTHON_DEPRECATED=ON
+             ENABLE_WRAP_PYTHON=ON
 
              if you use cm3apps you have to put ON the projects you want to install (no projects install by default except the solver)
              ENABLE_DGSHELL = OFF/OFF
diff --git a/cm3apps/nightly/cm3_nightly.ctest b/cm3apps/nightly/cm3_nightly.ctest
index 9bef787e1b764971d8be7ab58b3a3992c632af91..c61003f5da3b6fedad53021ebe906195ffbad6ba 100644
--- a/cm3apps/nightly/cm3_nightly.ctest
+++ b/cm3apps/nightly/cm3_nightly.ctest
@@ -40,7 +40,7 @@ set(CTEST_MFH_NAME "cm3MFH")
 set(CTEST_MFH_SOURCE_DIRECTORY "$ENV{HOME}/nightly_gmsh/${CTEST_MFH_NAME}")
 
 # options
-# cmake -DCMAKE_BUILD_TYPE:STRING=release -DENABLE_DGSHELL=ON -DENABLE_DG3D=ON  -DENABLE_MPI=ON -DENABLE_WRAP_PYTHON_DEPRECATED=ON -DDISABLE_WARNINGS=ON -DENABLE_NETGEN=OFF <compilation_dir>
+# cmake -DCMAKE_BUILD_TYPE:STRING=release -DENABLE_DGSHELL=ON -DENABLE_DG3D=ON  -DENABLE_MPI=ON -DENABLE_WRAP_PYTHON=ON -DDISABLE_WARNINGS=ON -DENABLE_NETGEN=OFF <compilation_dir>
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_BUILD_DYNAMIC=ON")
 #set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DMPIEXEC=/usr/lib64/mpi/gcc/openmpi/bin/mpiexec")
@@ -48,7 +48,7 @@ set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DMPIEXEC=/usr/bin/mpiex
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_DGSHELL=ON")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_DG3D=ON")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_MPI=ON")
-set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_WRAP_PYTHON_DEPRECATED=ON")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_WRAP_PYTHON=ON")
 # segfault when cleaning if compile with netgen
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DENABLE_NETGEN=OFF")
 set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} \"${CTEST_CM3_SOURCE}\"")
diff --git a/dG3D/CMakeLists.txt b/dG3D/CMakeLists.txt
index 703d7bcbf7578e9a3995e8c93a2ab4060b33355d..466046d8d9460f7ff26ec7b4d71151d6a10a2c6e 100644
--- a/dG3D/CMakeLists.txt
+++ b/dG3D/CMakeLists.txt
@@ -72,7 +72,7 @@ else()
   target_link_libraries(dG3D ${EXTERNAL_LIBRARIES} shared nlsolver)
 endif(INDEBUG AND NOT CM3APPS)
 
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
   find_package(PythonLibs)
@@ -88,5 +88,5 @@ if(ENABLE_WRAP_PYTHON_DEPRECATED)
     swig_link_libraries(${LIBDG3DNAME} ${PYTHON_LIBRARIES} dG3D)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDG3DNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dG3DpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
diff --git a/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py b/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
index 071f99409ce8c47cf57c5b2dbe15e1a3b52ca44c..3c2db25d6806a023b03860348a3de39163cd8217 100644
--- a/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
+++ b/dG3D/benchmarks/AnisotropicRandomField/Stoch_Sample.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 import scipy as spy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import sys
 import pickle
diff --git a/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py b/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
index e8bf1e707aee9aa965959c110d4bf130f78cedb6..78dd78bc82f42923ec952f0093cb6b7e48365771 100644
--- a/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
+++ b/dG3D/benchmarks/CG_Parallel_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py b/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
index 2e17eb5a851041421e12be3bd67407419a04e919..83b98b76c26985a6231af51961535467e16e9153 100755
--- a/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
+++ b/dG3D/benchmarks/CohesiveBand_Plate/notchedPlate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/CohesiveBand_cube/cube.py b/dG3D/benchmarks/CohesiveBand_cube/cube.py
index bc723108299223e29c13ef910dc32f902def15ea..2d962bed837f1c23afd0739ea79e311dab2f72a2 100755
--- a/dG3D/benchmarks/CohesiveBand_cube/cube.py
+++ b/dG3D/benchmarks/CohesiveBand_cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/CrackCompositeFailure/composite.py b/dG3D/benchmarks/CrackCompositeFailure/composite.py
index 68ee27b745713f2b66391253cc9589614bde4578..17b03eae4e8922e51fd8deab5b1c6ce0128ee374 100644
--- a/dG3D/benchmarks/CrackCompositeFailure/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailure/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py b/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
index dbb0a3e937679f9d55d56fa96a31f5ee3cd39cab..e7f9de774ae8b05a674f3cf0f362b874db3e92d4 100644
--- a/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailureHEX8MPI_forceIEBreakFirstIP/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
index 6c53ffa64afb9fa8a97b46e44683ce8e6260e0b3..3196aa552b52ed6532037fbb23ff46645edc12aa 100644
--- a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
index 37918ecfad1534b511c7f11bc0e08aed0e6b37c4..0d39bc69008f9d499c475832bdc71d62adf4c2bd 100644
--- a/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
+++ b/dG3D/benchmarks/CrackCompositeFailurePRI6MPI_forceIEBreakFirstIP/composite.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py b/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
index f03d5b5aef7bea18cacb1d639b51422cf96860da..814cb7f743173fd7a6f658138f55fb9c232497a1 100644
--- a/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
+++ b/dG3D/benchmarks/DG_HEX8_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI18/twoHole.py b/dG3D/benchmarks/DG_PRI18/twoHole.py
index d231823c13b64048b08f06e84f257e7135f493ff..a64ab996a4767710407cceee25d2cac5e4f82764 100644
--- a/dG3D/benchmarks/DG_PRI18/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI18/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6/twoHole.py b/dG3D/benchmarks/DG_PRI6/twoHole.py
index 1138e961d548de65309b25be86d144b46f70ac59..967f1d813ccc7c0cbb84c5b70e9046a36b54bd63 100644
--- a/dG3D/benchmarks/DG_PRI6/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py b/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
index e3c452706e54663f93ccd5bf49cc7a40c01a4fd2..1f3faeec8ed875d935bd90e158eb2a3637b0877a 100644
--- a/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_DiriToNeum/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py b/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
index bef45c3ef1a62a46b809704c5fd1db4ab39840ce..e02e39fdabe34707750c099ac9bc1e55fa3f5163 100644
--- a/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_resetBC/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py b/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
index b9454f503d48d750a505e304160d788a529436e2..e6bf91fec8d913313474c7fdce0ad4976ae22ee6 100644
--- a/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
+++ b/dG3D/benchmarks/DG_PRI6_smallStrain/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/DG_TET4/twoHole.py b/dG3D/benchmarks/DG_TET4/twoHole.py
index b69ed1efc36a03bd6be9d82bf1a0e2de510b67fc..adfec96042628aa5682271be10accd5fe2fb3886 100644
--- a/dG3D/benchmarks/DG_TET4/twoHole.py
+++ b/dG3D/benchmarks/DG_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/Gurson_Cube/cube.py b/dG3D/benchmarks/Gurson_Cube/cube.py
index ad528e935074ab01e031d7f82f27e1aaf5bf6196..9eef51f7c9fe0f5e93f0f7d223c4ff7ef7eca0fb 100755
--- a/dG3D/benchmarks/Gurson_Cube/cube.py
+++ b/dG3D/benchmarks/Gurson_Cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/Gurson_TwoHole/twoHole.py b/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
index f0f27614a66f4ac0724897c94c3fdff8dd98f80d..ef32971bae18c1318b3a7e47454434e712fa20c3 100644
--- a/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
+++ b/dG3D/benchmarks/Gurson_TwoHole/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import*
+from gmsh.py import*
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py b/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
index 6e3e6f76372e13acbed06c3ac6a1332269f4dce1..cbbdac93976043a7c53d41328671977522f3c5b3 100644
--- a/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
+++ b/dG3D/benchmarks/HighOrderElementCG/cubeTetCGStat.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py b/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
index a0ddbcb46c73c7dc66842fb226c761d0c02a847b..3c91db659c8ecfbd1a5e016a6d48de888452bc0b 100644
--- a/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
+++ b/dG3D/benchmarks/HighOrderElementDG/cubeTetDGStat.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py b/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
index cbc76f31e3514672fc0b1eb1e8ed6a7b86ef001f..73264e0a4acffd0adf7c07843dcaa2548f5645e9 100644
--- a/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
+++ b/dG3D/benchmarks/HighOrderElementDGExpMPI/cubeTetDGExp.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py b/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
index 6117ff499cc238b45ce8ab9fcc306fc93ef32d88..41d152701bf6c71a20c37a1f1975640fc1e51a80 100644
--- a/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
+++ b/dG3D/benchmarks/J2plasticExtractCohesiveLaw/RVE1.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py b/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
index 8247cd9196f1e204028d5552f051a5c1a70b6052..6edda898c7b692f8154c7f54074d263299007ff4 100644
--- a/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
+++ b/dG3D/benchmarks/MFH_2EVP_Czarnota/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EP_SEC/cube.py b/dG3D/benchmarks/MFH_EP_SEC/cube.py
index d59f6d46e96a746ef44c057d7747eb151d914585..fef5ff9a491e321ee8e14a874c7b08dfb1a8756a 100644
--- a/dG3D/benchmarks/MFH_EP_SEC/cube.py
+++ b/dG3D/benchmarks/MFH_EP_SEC/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Creep/cube.py b/dG3D/benchmarks/MFH_EVP_Creep/cube.py
index 43280104ddb3f9a9e7801e74f62962549c41a49f..eef6f9402b0f1b4c52f1ceeb78da793527287474 100644
--- a/dG3D/benchmarks/MFH_EVP_Creep/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Creep/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import shutil
 import os
diff --git a/dG3D/benchmarks/MFH_EVP_Cube/cube.py b/dG3D/benchmarks/MFH_EVP_Cube/cube.py
index 2075bcaca904efb40541a23681754cbc034c801b..5918f48225c360eacbc57c9718e96f0d36e9ca19 100644
--- a/dG3D/benchmarks/MFH_EVP_Cube/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Cube/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py b/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
index 5b6111d769817b38197760aa5d9660fbfbbd7be2..d8ef5a7e379497010aed2ee4bf1d53a4ed02ac09 100644
--- a/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Czarnota/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py b/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
index d8edc15a1a05c51aa24a6d32ed30886ede424b8b..204f57cc2a87e0edb077510221119de42e4a9205 100644
--- a/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Lahellec/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Mercier/cube.py b/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
index 23f7192eb18f9d71874b0ab0d6ed07970ae78128..0f9404c6e563af99ca7a1c9fee69e0ebd08ba50f 100644
--- a/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Mercier/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_EVP_Pierard/cube.py b/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
index f1222211f9483d27c135fbf64c16bbbbaf8b0113..54533beb1b29453b3987dfa39498353e0581b269 100644
--- a/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
+++ b/dG3D/benchmarks/MFH_EVP_Pierard/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_FiniteStrain/cube.py b/dG3D/benchmarks/MFH_FiniteStrain/cube.py
index 821e3e44e9519c2a016dfe19878f60dff23522c7..bc4dc07c1286083e5c77b4d9cfb5fb8f5c284b16 100644
--- a/dG3D/benchmarks/MFH_FiniteStrain/cube.py
+++ b/dG3D/benchmarks/MFH_FiniteStrain/cube.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py b/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
index e26f33bc2aa5d661fdfe98bd364dfa7dc5534957..2c55e65991b44fda2d32934ef98efecc50eceac8 100644
--- a/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
+++ b/dG3D/benchmarks/MFH_Stoch_Ply/Stoch_Sample.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 import scipy as spy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 import sys
 import pickle
diff --git a/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
index 0e51f692e37e4cf4d6d9eff32d2f8bebfff6e3bf..77e64e32480d2583ed89046f4d30eb2c14eef3ea 100644
--- a/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/PureThermoPBC/thermoMecPolycrystalCondensation.py
@@ -2,7 +2,7 @@
 import numpy as npy
 import scipy as spy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
index 161c0f58a6202a7e67bec58f7b7a483b5f1a2128..624ca734ce31790ec4ef412304d079b0a6eefe6e 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCZM/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py b/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
index 3604e1d4cef257d875a40cfc58f1359450eeb0c1..73815815ffcf21e3fd610ce6ce782c0af74a959c 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCurvature/cubeAni.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
index fce990842591fbf6100854b034b03ef913c5f35b..bb947bba978290cc2f828002b0fcef55d9dccbd2 100644
--- a/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicCurvatureCZM/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py b/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
index b4f02b7ecea6e8a4673d3ca915d8447f7eec931b..556dd562b740cc22d1d21cd855a7aaaccec2825e 100644
--- a/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/TransverseAnisotropicThermoMec/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with Debuga python script
diff --git a/dG3D/benchmarks/axisymmetricNonLocalTest/model.py b/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
index 18771855122356833aa243f602a3f1c05b9bccfc..f14bb1d02261cddcaa2f355b338c96ecd1d54944 100644
--- a/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
+++ b/dG3D/benchmarks/axisymmetricNonLocalTest/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/axisymmetricTest/model.py b/dG3D/benchmarks/axisymmetricTest/model.py
index 06d5dd90c5286f940b43d89cf89e7cf1e0363dd1..74786f426b7476187cee36f7a61336a01c3dfd7a 100644
--- a/dG3D/benchmarks/axisymmetricTest/model.py
+++ b/dG3D/benchmarks/axisymmetricTest/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/compRVE/RVE.py b/dG3D/benchmarks/compRVE/RVE.py
index 65c132d23b457902dcbb6afae67a611dabab8341..2668d82cd25ade963e014c777def6728714b32eb 100644
--- a/dG3D/benchmarks/compRVE/RVE.py
+++ b/dG3D/benchmarks/compRVE/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/compositeHyperDamage/Window.py b/dG3D/benchmarks/compositeHyperDamage/Window.py
index c7494cd4afb60341c7166b149a0d21887428da3b..7f044b19e05c5d357645a00c52ccc8809e25ced4 100644
--- a/dG3D/benchmarks/compositeHyperDamage/Window.py
+++ b/dG3D/benchmarks/compositeHyperDamage/Window.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py b/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
index baf166a6d2a2ec2edc6d041039072e117963f687..e658bfea29f407e9f29feac9d5303590aabb2647 100644
--- a/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
+++ b/dG3D/benchmarks/compositeNonLocalRVECG/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py b/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
index 3f12563c025f42adf5e8588992579b859c6cf8bc..c167438c10c0bed6bfa0199c6467e6c5a18edbb7 100644
--- a/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
+++ b/dG3D/benchmarks/compositeNonLocalRVEDG/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/conden_ldbc/run.py b/dG3D/benchmarks/conden_ldbc/run.py
index 34a4e0ef92ffe98ac1acc0e8e246e9e1d84b1507..b7efc28a37325d8471c6c517e9e379a003421dd1 100644
--- a/dG3D/benchmarks/conden_ldbc/run.py
+++ b/dG3D/benchmarks/conden_ldbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_ldbc_DG/run.py b/dG3D/benchmarks/conden_ldbc_DG/run.py
index 33f4fba696641b60c64b52e2f8a73ce5ebeeee58..ed6806938a032b08590eb0fb6fde32d9cb909b63 100644
--- a/dG3D/benchmarks/conden_ldbc_DG/run.py
+++ b/dG3D/benchmarks/conden_ldbc_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py b/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
index 89aad771050eb4b97d3764f74c252ee08ae586b8..971c12f85698777e876520e861fbac5183f2c8e1 100644
--- a/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_ldbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mixedBC_DG/run.py b/dG3D/benchmarks/conden_mixedBC_DG/run.py
index beb27d66fc25fc95685d4f1bd4adf86c3065f593..f33b4511d5ab48eb4cb3119d146ccb96f787178f 100644
--- a/dG3D/benchmarks/conden_mixedBC_DG/run.py
+++ b/dG3D/benchmarks/conden_mixedBC_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc/run.py b/dG3D/benchmarks/conden_mkbc/run.py
index 582011e1f3bd04a338bb7251b84be5c2a334df54..84739f196dd331aab440d092ab37d854c0c24c99 100644
--- a/dG3D/benchmarks/conden_mkbc/run.py
+++ b/dG3D/benchmarks/conden_mkbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc_DG/run.py b/dG3D/benchmarks/conden_mkbc_DG/run.py
index 729626c8b517398c4bd1a6948b934c5e316db1a3..121a60d141ab72ecd26f6f96322c7de485dac25e 100644
--- a/dG3D/benchmarks/conden_mkbc_DG/run.py
+++ b/dG3D/benchmarks/conden_mkbc_DG/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py b/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
index 3079029c22f9473a186fb569c756eb6deae8f5d4..e7487c6a8926109b450d6cdced169a2b29857dcf 100644
--- a/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_mkbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_pbc/run.py b/dG3D/benchmarks/conden_pbc/run.py
index 8a72e1aeac3917c7009b77b7b1322069a4917c80..807f665ecc6e70b3b39678c9d357988f15d7c171 100644
--- a/dG3D/benchmarks/conden_pbc/run.py
+++ b/dG3D/benchmarks/conden_pbc/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/conden_pbc_SecondOrder/run.py b/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
index 116bcaa3c1e5e632fd6a46ddd75027685e6db594..401343175251cfbf318762a91fffb48ff83462b1 100644
--- a/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
+++ b/dG3D/benchmarks/conden_pbc_SecondOrder/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 
diff --git a/dG3D/benchmarks/conden_pbc_project/run.py b/dG3D/benchmarks/conden_pbc_project/run.py
index c8b9f12cd2e51756f42fcd3d60f761432372a8f3..557e46bb57403cc99c2a62c141161804fce47a65 100644
--- a/dG3D/benchmarks/conden_pbc_project/run.py
+++ b/dG3D/benchmarks/conden_pbc_project/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py b/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
index f261602f1a7ade48828d6476ba53efb04c515dda..906b02fb59453c03f70acef4c6c8e18f96eca615 100644
--- a/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
+++ b/dG3D/benchmarks/cylinderPlaneFrictionContact/cylinder.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/elasticFE2/macro.py b/dG3D/benchmarks/elasticFE2/macro.py
index cbb45e859661143fc23377cba41b79f57bb09143..06734521cd2ecc1cbeea481ffda10c9f70510733 100644
--- a/dG3D/benchmarks/elasticFE2/macro.py
+++ b/dG3D/benchmarks/elasticFE2/macro.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py b/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
index 2a964abbf58ad85ce4ef3c13890b927e444f01ff..6831186d0c4a67af03917dd314d9e81f8190744c 100644
--- a/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
+++ b/dG3D/benchmarks/electroThermoLaminate/electroThermoLaminate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py b/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
index 4c86285031d1bd2e37d70a9914f5e0bdf484d80e..f474d8a112c85204cda2ea1d401df13142de7244 100644
--- a/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
+++ b/dG3D/benchmarks/electroThermoLaminateFtFv/electroThermoLaminate.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py b/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
index 622be8b52d899dae3ff30c44eb52f21136fc2317..1253b4c26dae5912f4354fc103dba639e4177ae8 100644
--- a/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
+++ b/dG3D/benchmarks/electroThermoSMP/electroThermoSMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/fullThermoMecaMicro/run.py b/dG3D/benchmarks/fullThermoMecaMicro/run.py
index 708824c6bde9be98731fcdfccee87a64aafdb113..f70f43e61a16b15d88e964723309c43aa59fcbfd 100644
--- a/dG3D/benchmarks/fullThermoMecaMicro/run.py
+++ b/dG3D/benchmarks/fullThermoMecaMicro/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py b/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
index b69736b993d837814e063dcda7d285c0e16ac60b..88123ad09d55e457cf5a87acee834c792b04c548 100644
--- a/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
+++ b/dG3D/benchmarks/fullTwoField_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/hyperViscoElastic/cylinder.py b/dG3D/benchmarks/hyperViscoElastic/cylinder.py
index d0093db7d1ef98dd2da585ec36e7135f9a726a33..17a87e3012a0d971e08eb2f9b33cd6895a0e4d6d 100644
--- a/dG3D/benchmarks/hyperViscoElastic/cylinder.py
+++ b/dG3D/benchmarks/hyperViscoElastic/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/incrementalSecantTest/RVE1.py b/dG3D/benchmarks/incrementalSecantTest/RVE1.py
index 385fcb497c7dffcbf457a224910135d139cdf2e5..a4402cb97c7dd8d226b62b063c33171dbd38c8c4 100644
--- a/dG3D/benchmarks/incrementalSecantTest/RVE1.py
+++ b/dG3D/benchmarks/incrementalSecantTest/RVE1.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/incrementalSecantTest2/RVE2.py b/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
index 0964e80dc699fbd369eb300460fd63a0c9a10c07..589d9af3f119845027168524fe1d4275c47945e3 100644
--- a/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
+++ b/dG3D/benchmarks/incrementalSecantTest2/RVE2.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/interpolationPBC/idealHole.py b/dG3D/benchmarks/interpolationPBC/idealHole.py
index c1b30d474e223bb1976750535d20ffd022276bcb..efb586718c75c42488c88f2773b3b2676b2fe732 100644
--- a/dG3D/benchmarks/interpolationPBC/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py b/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
index 59db9c999360c952876e075198a5d2deb46a62f2..ad26eacf0f8e879f0ae067346a0a3bdb26d323db 100644
--- a/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_2DShifted/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py b/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
index d0ea28e7e2d399840b9bbe915b3cf6e7491c2771..6af0df6134c6e4791fed826566781cd7e89dbfd3 100644
--- a/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_FE1/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py b/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
index 96c95e8c872ae864f173999e25b6eb8b1e163acd..5675695989d847d7fc85b560dc51be52aa508b61 100644
--- a/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_FE2/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py b/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
index 3082f227c676adf3bc2840944d74d3c21819e7ca..85202c56dcd2d56014bb018049b743aaf1e82a3a 100644
--- a/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_Lagrange/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py b/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
index cf26e3e97c3ff4420a83bd8fb773a4f6936b4995..f305bd969de094faabde4c740e4fcd902044df5e 100644
--- a/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_SecondOrder/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py b/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
index 76525178e0bd4a2236aff9e0ffbed257be4094f4..8174c4369170adcda5e2c7a1e3b778bcb8b322f2 100644
--- a/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
+++ b/dG3D/benchmarks/interpolationPBC_SecondOrder_insysElim/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/microBC_reset/run.py b/dG3D/benchmarks/microBC_reset/run.py
index bf4ed24ac465fa33bddec25b2c2272c6bdaeaa81..a4328a0da6ee788674fa7e1f793883aec0bd4cf1 100644
--- a/dG3D/benchmarks/microBC_reset/run.py
+++ b/dG3D/benchmarks/microBC_reset/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/microNonLocalDamage/idealHole.py b/dG3D/benchmarks/microNonLocalDamage/idealHole.py
index 2a76271842abf390dae8e22cd6dc6cfc25f7751c..b31d9a878c9fb53fbded702070409f852e044b8c 100644
--- a/dG3D/benchmarks/microNonLocalDamage/idealHole.py
+++ b/dG3D/benchmarks/microNonLocalDamage/idealHole.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelamination/delam.py b/dG3D/benchmarks/mixedmodeDelamination/delam.py
index ace750b1a8af0ab433f9edd748cd1ffb2c760ed3..5a193412231664a74e6e7577d151e5d1d5986e70 100644
--- a/dG3D/benchmarks/mixedmodeDelamination/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelamination/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py b/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
index 7dd189094529c3e8e47644b6d99474847c69d6ca..5dd08ee27d4ef07190c57f95a8dd571d74eab85f 100644
--- a/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelaminationExpoLaw/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py b/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
index f0724963fd0eaae0b4d2643f67832f18cc796370..69c6136dcbd20617f64f346b36c3671b1732b0af 100644
--- a/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
+++ b/dG3D/benchmarks/mixedmodeDelaminationPathFollowing/delam.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py b/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
index 6530aaaa67169967c8d00ed2ec9824fb2e1882ed..32dfeecac9e46ec51c0266ba5dd63f7c82e850e4 100644
--- a/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
+++ b/dG3D/benchmarks/multiscale2DThermoMechanics/macro.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py b/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
index cb39d09756d6c8d6aa00ffba525c99a474f1da7c..bb9015ff3ed378587588f817844c1292d146d679 100644
--- a/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
+++ b/dG3D/benchmarks/multiscaleAdhesiveTest2D/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
index 1a8975abebd9796aa4b26f478c28822cec52ea64..98e721f595cb57289e2e021baa6585bc5ddb688e 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
index 9a9fdb676b93e1b8fb40f2b3a35651c8045d296e..8d287e94ff6d9fcb1b3aac69589161beea719403 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
index 792eef93a2ce1b2ecb2131fed6a0d98a8408d3ab..64f0c1e51162f2f5ac7026cde45567a4abed9e02 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_changeBCAfterFailure/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
index 965bfa6f63f71e139ba2854a093efe704289f988..91e08d0e9208de9ed4d3af04b41d64342757a937 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_microPathFollowing/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
index 1d4f0a51cedecbf442c827b78a62d62a720cc458..cd6f525b604c01b3a1609b07ac63402ce17c80e2 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_rotateRVE/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
index 09358fd257cc6da2ee487694ee2a1be895814a86..8e1c50f6a2c51f14ccc6cd27f81f8e29d729e441 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_fullDG_shiftedBC/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
index 71d4cbd51c05eb0ded377f82e4486cbff601a45d..f56ed4abdae06d3d73004eca6b67ad56876bb0f6 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
index ae147bc79adf061a5b4789e707793e1bdac1bcab..e45c8b075473c3aaed10108ef51a279e47d9b160 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_mixedMode_compression/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
index 6d022582c49e0282bf67cf94eea541c458a89bc8..a85a4a0cecee1159d177f399988780df11673d2f 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_tangentByPert/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
index 6faf6de9c781d56c4076d612fb9ef9247d1a4f22..257ec2238cd47f0f16baf219ab0dec8a262eb296 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloading/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
index 596affe9203e154d2c3c8ec1bc03bf7edfa033de..3f4a53ba385024d28144bdd81a4c5f3a014f75b5 100644
--- a/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
+++ b/dG3D/benchmarks/multiscaleCohesiveTest2D_unloadingElastic/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py b/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
index 59b64004fa691151a496975d385803e967db1671..d240416a0730145b49fb64547de63aa2b185eacd 100644
--- a/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
+++ b/dG3D/benchmarks/multiscaleDomNonMultiscaleDomInterface/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py b/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
index 43ab8b5d9da48531e00029765783f720ef25b028..f01a0ede2a30deb18f7b77f3356b3955bccdc7f4 100644
--- a/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
+++ b/dG3D/benchmarks/multiscaleEnforceCrackPath/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscaleEnhanceStrain/model.py b/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
index bdb2b95d3a3601fce1f6c6e0ca9b35887a2fe817..3fd46441ce19a9c98aa77c33d608f5068bd948c2 100644
--- a/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
+++ b/dG3D/benchmarks/multiscaleEnhanceStrain/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py b/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
index 63a3e383421077e35f0b09f7331e246a8e7aae65..942399976ee5c4a80adb7f6dd2035afa670b033b 100644
--- a/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
+++ b/dG3D/benchmarks/multiscale_1order_shearlayer/shearlayer.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py b/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
index ea0e2c74bc982e6dd3cdee3b4301a403c31589fd..a08a32564efdf71235d6466e88fb6a2af7d44873 100644
--- a/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
+++ b/dG3D/benchmarks/multiscale_2order_3Dsimple/multiscale.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py b/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
index f9fedfea1774806ab90a6ffcc5cf03c6b78a315b..953e3c00347aca121070da0698919bbf1a12c23d 100644
--- a/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
+++ b/dG3D/benchmarks/multiscale_2order_shearlayer/shearlayer.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/multiscale_interface/model.py b/dG3D/benchmarks/multiscale_interface/model.py
index b4dfbeb25011651910b453f9b82c2e31c61f2a08..d9edb4ecffff1c017f2e74817be2c8fc2a4e85b0 100644
--- a/dG3D/benchmarks/multiscale_interface/model.py
+++ b/dG3D/benchmarks/multiscale_interface/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
index 3a83ec32bb1c5f19870ac938404b90b59563091f..8ce6581a91aa7ee18076c4af06caae7149b594a7 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
index 55f919f2b8be825993dc3e2d9aaed9b7ba26f4b7..e4ad91c447e3233de53e227ce7b41bcf9884d250 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D_DirectionFollowing/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
index ab21149c2c5ab259225effb43353d08e778294fc..6fec1f2ca73427640943cc2b3712ea5a97fcd2d9 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_2D_withPBC/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py b/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
index 05d5f2664b52c08e248ad44cf29dd2999bb09f08..d745b55111eb887965dc0c3e167b6dac7303e5b8 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_3D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py b/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
index adf2d2bf964226c2916d2b8d5dcca340cda73fb5..1ec631cee4093dd57916df1e6355750640dee931 100644
--- a/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
+++ b/dG3D/benchmarks/nonLinearMixedBC_3D_SecondOrder/rve.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py b/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
index 94fe7dce06ff17cd883de58caa8c13db484670a0..3f254d3ccc93f2d50bef88f95ed3a6015666efe8 100644
--- a/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
+++ b/dG3D/benchmarks/nonLocalDamageMFH/RVESec.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py b/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
index c02e7ae3d58c035aaeaf3c7aa9dea3a2715e8dae..cae4257b8e3e08ea16ad415d097398a739505346 100644
--- a/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
+++ b/dG3D/benchmarks/nonLocalDamageMFHInc/RVEInc.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageParallel/RVE.py b/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
index a1e3c7024e820430c82526246724eb2bb952cbe5..2cbb377187d59acfac43ac51b741af417f9137ca 100644
--- a/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
+++ b/dG3D/benchmarks/nonLocalDamageParallel/RVE.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 
diff --git a/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py b/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
index 27e3d055df5fae64d4d51b168651b2c2d2a558a4..373ed0210ba6bf2acec81f72e3b1a38d4b5ff587 100644
--- a/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
+++ b/dG3D/benchmarks/nonLocalDamageToCrack/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py b/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
index e1a0ec4cf057cb015cdd9ee7114ed9f57d7d298f..a62f18aa978a65fd512803aee9eb9c8ed2a3104b 100644
--- a/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
+++ b/dG3D/benchmarks/nonLocalElasticDamage/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalJ2/twoHole.py b/dG3D/benchmarks/nonLocalJ2/twoHole.py
index 7a23c6a804cd02ca1cdf764c27d2c03d72971faf..bb826febb457fdcb921224e1948222035f9aba1f 100644
--- a/dG3D/benchmarks/nonLocalJ2/twoHole.py
+++ b/dG3D/benchmarks/nonLocalJ2/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py b/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
index ee04734fc6f37ef70aace8c8cd4f1563feff0677..6a8c5070dd265c69782e870987f613296b7af6f4 100644
--- a/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
+++ b/dG3D/benchmarks/nonLocalJ2_Erosion/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py b/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
index ca60daf010a22abbbfabcb2eec553f35bca7ade3..e0bd187149ba6623e35c7a3c335a019d5f4f40a9 100644
--- a/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
+++ b/dG3D/benchmarks/nonLocalLemaitreChabocheCube/cubeNonLocalJ2Hyper.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/nonLocalMFH/RVESuquet.py b/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
index be056c10f729bdb960e492e42232b60d6d59f865..38a6512c0eb7495f4389e4435816449ff49ab312 100644
--- a/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
+++ b/dG3D/benchmarks/nonLocalMFH/RVESuquet.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 #from dG3DpyDebug import*
 
diff --git a/dG3D/benchmarks/pathFollowing/arch3D.py b/dG3D/benchmarks/pathFollowing/arch3D.py
index 5c022b57f7fe3412bf8b65ddaafcd58b8f94097f..f408ff5716db7c3afc0c4d8abbca933912f7efe0 100644
--- a/dG3D/benchmarks/pathFollowing/arch3D.py
+++ b/dG3D/benchmarks/pathFollowing/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py b/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
index 112e33d8225e9f7725c45694d0cac20ba799978a..a9f2071e76f16fc36be7879407392aea6e41c60f 100644
--- a/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingAutomaticIncrement/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py b/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
index 8a527a4b1f222f4420b0f33d974ed67b31efbaa9..de83753bef02da67950e645f3af87867c98027cb 100644
--- a/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingEnergyBased/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py b/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
index 712da7ec15dccab04db023d2f594c66bbc6b88e0..70dd63a01b980cb282303878eb0d789a55550a4d 100644
--- a/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
+++ b/dG3D/benchmarks/pathFollowingEnergyBased_plastic/arch3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowingMultiscale/model.py b/dG3D/benchmarks/pathFollowingMultiscale/model.py
index 76eeeb0a372587b9b6324cd37c0edbba0774861a..84216daa357f440b23f3b251e85ecbafd3d87130 100644
--- a/dG3D/benchmarks/pathFollowingMultiscale/model.py
+++ b/dG3D/benchmarks/pathFollowingMultiscale/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py b/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
index 655b6439c001ed89384ef0bada88cd1a4aff6646..c3bdad47d7298993d68a2e60982b1c1456a6f965 100644
--- a/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
+++ b/dG3D/benchmarks/pathFollowing_TrueSnapback/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_cohesive/model.py b/dG3D/benchmarks/pathFollowing_cohesive/model.py
index 83b77c1897e4b5a12b2c32d4cd7796505ab645e5..fe79325dcd294c5b191c6731854c3cbed3a5fbb2 100644
--- a/dG3D/benchmarks/pathFollowing_cohesive/model.py
+++ b/dG3D/benchmarks/pathFollowing_cohesive/model.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/pathFollowing_snapback/twoHole.py b/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
index 9b4dfe0f4c912fe6446fe18ec3d39ba773e12f81..3464a8218dd1f06720f344c83e24f901490b041e 100644
--- a/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
+++ b/dG3D/benchmarks/pathFollowing_snapback/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py b/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
index 2e237130ebf15ef23202e7ada635686870ae4303..bb5291af7beb5b39f832b32e800477f46cf8ab5c 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlastic/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py b/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
index 56555e49eb94e181907f97f2809d73c66ff8b2d2..a187f03020c419b8cbf8a6c7cfba0864a29c9df2 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlasticFullFailure/model.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py b/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
index 315ba33fc133d0365abe601e92b5f6b835ae116c..d1bb5a83fba25f2f20a0738e796bfd811bb61c3b 100644
--- a/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
+++ b/dG3D/benchmarks/powerYieldViscoElastoPlasticSaturationDamage/cylinder.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 from math import*
diff --git a/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py b/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
index a496025992129d6547b4d7728e8ac60be9a25609..410e69025daf9af494522b698b84c918748b62c2 100644
--- a/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
+++ b/dG3D/benchmarks/secondOrderElasticShearlayer3D/shearlayer3D.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/seebeck/seebeck.py b/dG3D/benchmarks/seebeck/seebeck.py
index 076af48837c1baa8c2891beb03d849a012e87dfb..59e36edb41d8af2e6efcd97a3c42aa6f1696091f 100644
--- a/dG3D/benchmarks/seebeck/seebeck.py
+++ b/dG3D/benchmarks/seebeck/seebeck.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/seebeckMPI/seebeck.py b/dG3D/benchmarks/seebeckMPI/seebeck.py
index 33018070120b1f67732f70717284975629790c44..3df34fd6dfbe56a6da4a4b036121e78b6c9f70ff 100644
--- a/dG3D/benchmarks/seebeckMPI/seebeck.py
+++ b/dG3D/benchmarks/seebeckMPI/seebeck.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import*
diff --git a/dG3D/benchmarks/shearTest_PBC/run.py b/dG3D/benchmarks/shearTest_PBC/run.py
index a5e78147a2dff75f2d2fedb7acea278c0414f365..cbb56286ace9f563f0b5d7a6da656d527ec85a59 100644
--- a/dG3D/benchmarks/shearTest_PBC/run.py
+++ b/dG3D/benchmarks/shearTest_PBC/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py b/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
index 5db7d2b299044ae34cf401bf7009601c767fd155..833233e223d6e60b6334ae71ee393175cfa73af3 100644
--- a/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
+++ b/dG3D/benchmarks/shiftedPBC_2D/idealHole_mixBC.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 from math import*
 
diff --git a/dG3D/benchmarks/smpT22/SMP.py b/dG3D/benchmarks/smpT22/SMP.py
index 36c13608b57a807546204d884af4e607027854c5..ae75a43d313bc34f0edc91c9672a4fc6c52033a6 100644
--- a/dG3D/benchmarks/smpT22/SMP.py
+++ b/dG3D/benchmarks/smpT22/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/smpT22Mechanism2/SMP.py b/dG3D/benchmarks/smpT22Mechanism2/SMP.py
index f6e74ae3db43c7d8a6d2d2dac1fb2a1c772386ec..e5576bde4f88c590bfea0a3be9a04593f5718f83 100644
--- a/dG3D/benchmarks/smpT22Mechanism2/SMP.py
+++ b/dG3D/benchmarks/smpT22Mechanism2/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/smpT58/SMP.py b/dG3D/benchmarks/smpT58/SMP.py
index 68be133815378d8846e13511a9cae7df9362499d..f215cbc7a5780d06244bac593e3acb7f762da4d2 100644
--- a/dG3D/benchmarks/smpT58/SMP.py
+++ b/dG3D/benchmarks/smpT58/SMP.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 
 #from dG3DpyDebug import*
 from dG3Dpy import *
diff --git a/dG3D/benchmarks/taylor/taylorTetDGDyn.py b/dG3D/benchmarks/taylor/taylorTetDGDyn.py
index 9873e44ede212d2d6d97e6d8156d7377b58e6794..9029da6ff8cb6a1861b535b4decf7ad6a7e12d8a 100644
--- a/dG3D/benchmarks/taylor/taylorTetDGDyn.py
+++ b/dG3D/benchmarks/taylor/taylorTetDGDyn.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/taylorMPI/taylorCG.py b/dG3D/benchmarks/taylorMPI/taylorCG.py
index 8e1da6558f5a2318b52e0f05ac769188d4f18e28..b881e3d3d13fc5261319216bf83d3f794ab4d0a2 100644
--- a/dG3D/benchmarks/taylorMPI/taylorCG.py
+++ b/dG3D/benchmarks/taylorMPI/taylorCG.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py b/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
index c2383198f5b7e195d79cf89c1751e31563a715d3..5521c36432e26957bb748c7cd2d5d2c1331a8045 100755
--- a/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
+++ b/dG3D/benchmarks/thermoCylinder/cylindreLinearTM.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dG3DpyDebug import*
 from dG3Dpy import*
 import math
diff --git a/dG3D/benchmarks/thermoFlux/cube_flux.py b/dG3D/benchmarks/thermoFlux/cube_flux.py
index 19b80f3d4cf39a9c994a8c93a2163fcfd9aa9824..1f1a04b0403aa8118c719244fb44b43a7e01e869 100644
--- a/dG3D/benchmarks/thermoFlux/cube_flux.py
+++ b/dG3D/benchmarks/thermoFlux/cube_flux.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py b/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
index 74c069bcffb4efc43f5d1e19b287c340af4a8b54..7e0643ea145b1b841a1fbb2332f9946c9fbbe586 100644
--- a/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
+++ b/dG3D/benchmarks/thermoMecPBC/thermoMecPolycrystal.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
index 8dd04e62bd44b51d17eaec7e8e0ca1e81a1b5585..5d779b5082f18e287eb6cc71b335d7aa75810ecb 100644
--- a/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCCondensation/thermoMecPolycrystalCondensation.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 import numpy as npy
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
index 4e85300281be62eca963a21552ca9181b8c2b4a4..29671e085fd4122dc61420ef8e0ca6786fa77043 100644
--- a/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCInSystemCondensation/thermoMecPolycrystalCondensation.py
@@ -1,7 +1,7 @@
 #coding-Utf-8-*-
 import numpy as npy
 #import matplotlib
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py b/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
index 106218afec266b71dab3b70fd490799e6981a3ff..fd557ffab3e52341bc47b62fe556d3979912f721 100644
--- a/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
+++ b/dG3D/benchmarks/thermoMecPBCInSystemCondensationElim/thermoMecPolycrystalCondensation.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py b/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
index e3dccd0f360e773b432dcddb512e9c7b4184f840..a4e8a4ca898a909af45c5efb5ff4f1ff4d9b3239 100644
--- a/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
+++ b/dG3D/benchmarks/thermoMecPBCPertElim/thermoMecPolycrystal.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import *
 import os
 import sys
diff --git a/dG3D/benchmarks/thermomecSupport/supportFull.py b/dG3D/benchmarks/thermomecSupport/supportFull.py
index 13e3091503cfcdb39a0b5fc2db8b098ca192653f..b68141b92a2a2cbe97fb154503f264f8cb4ee87f 100644
--- a/dG3D/benchmarks/thermomecSupport/supportFull.py
+++ b/dG3D/benchmarks/thermomecSupport/supportFull.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 import math
diff --git a/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py b/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
index 6edcb88680322d7c1635a99b986c3757d1fb8421..1ad20f9ab107d406b10680b33e9851c619c99226 100644
--- a/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
+++ b/dG3D/benchmarks/transverseAnisotropy/cubeTransverseAnisotropy.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py b/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
index 6c18a2c0b0288468eb7e8b2605554d56b5e51ccb..8494ac4b42f8a54a6dddbda5bcf2e9de9969c516 100644
--- a/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
+++ b/dG3D/benchmarks/twoField_HEX8_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_PRI6/twoHole.py b/dG3D/benchmarks/twoField_PRI6/twoHole.py
index 325d05b1d0ca98b28cba5b272920fc8f86764997..bfef2b78126e519a2f61287fe7758af83533c9ba 100644
--- a/dG3D/benchmarks/twoField_PRI6/twoHole.py
+++ b/dG3D/benchmarks/twoField_PRI6/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoField_TET4/twoHole.py b/dG3D/benchmarks/twoField_TET4/twoHole.py
index 43bfaf78d2099a7d34658050fcb5790b221d902a..5cfa81210d3ffc0571e9da45c58db1a331b58a51 100644
--- a/dG3D/benchmarks/twoField_TET4/twoHole.py
+++ b/dG3D/benchmarks/twoField_TET4/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/twoHole/twoHole.py b/dG3D/benchmarks/twoHole/twoHole.py
index 437745151003606e99713161514db9ccba71fcc4..a0c3d1ce80472686e42b057af6c73894981a9c85 100644
--- a/dG3D/benchmarks/twoHole/twoHole.py
+++ b/dG3D/benchmarks/twoHole/twoHole.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch beam problem with a python script
diff --git a/dG3D/benchmarks/uniaxialTest_PBC/run.py b/dG3D/benchmarks/uniaxialTest_PBC/run.py
index 29f739608352dd5548adfffaf8d6bc894fa5ae4c..1f4f92a0a11dcf844dbf32ea9cc7a1a2a97dd24d 100644
--- a/dG3D/benchmarks/uniaxialTest_PBC/run.py
+++ b/dG3D/benchmarks/uniaxialTest_PBC/run.py
@@ -1,6 +1,6 @@
 #coding-Utf-8-*-
 
-from gmshpy import *
+from gmsh.py import *
 from dG3Dpy import*
 
 #script to launch PBC problem with a python script
diff --git a/dgshell/CMakeLists.txt b/dgshell/CMakeLists.txt
index cdb01727d87b797fe58aca22f11e6cd3606dd782..ca1db56af4e4fe1e70fd5f44da15ad98b3e88700 100644
--- a/dgshell/CMakeLists.txt
+++ b/dgshell/CMakeLists.txt
@@ -75,7 +75,7 @@ endif(INDEBUG AND NOT CM3APPS)
 #  set_target_properties(dgshared PROPERTIES LINK_FLAGS ${LAPACK_FLAGS})
 #endif(HAVE_LAPACK AND LAPACK_FLAGS)
 
-if(ENABLE_WRAP_PYTHON_DEPRECATED)
+if(ENABLE_WRAP_PYTHON)
   find_package(SWIG REQUIRED)
   include(${SWIG_USE_FILE})
  
@@ -91,5 +91,5 @@ if(ENABLE_WRAP_PYTHON_DEPRECATED)
     swig_link_libraries(${LIBDGSHELLNAME} ${PYTHON_LIBRARIES} dgshell)
   endif(INDEBUG AND NOT CM3APPS)
   add_custom_command(TARGET _${LIBDGSHELLNAME} PRE_BUILD COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/dgshellpyPYTHON_wrap.cxx)
-endif(ENABLE_WRAP_PYTHON_DEPRECATED)
+endif(ENABLE_WRAP_PYTHON)
 
diff --git a/dgshell/benchmarks/MEMS/beam-9dom.py b/dgshell/benchmarks/MEMS/beam-9dom.py
index e63a3fdf2d8c9a5e74bce18dd02fc8a841dc7448..5d20a4130ed55d285999bcfa9984dece5999231a 100644
--- a/dgshell/benchmarks/MEMS/beam-9dom.py
+++ b/dgshell/benchmarks/MEMS/beam-9dom.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 #from dgshellpyDebug import *
 from dgshellpy import *
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/MEMS/test.py b/dgshell/benchmarks/MEMS/test.py
index d7be8ddaad663ff5ed776a44ec729e24eec1b3f3..70235bc8ebcf6a6ac494ac8700edcd12fd0f61fe 100644
--- a/dgshell/benchmarks/MEMS/test.py
+++ b/dgshell/benchmarks/MEMS/test.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpyDebug import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/archshell/arch.py b/dgshell/benchmarks/archshell/arch.py
index 683262ff8126007e377a7cd9610713c94405f3ca..998d2ec63d439d797c13481746961be9cca56a34 100644
--- a/dgshell/benchmarks/archshell/arch.py
+++ b/dgshell/benchmarks/archshell/arch.py
@@ -1,6 +1,6 @@
 #-*-coding:Utf-8-*-
 from dgshellpy import *
-from gmshpy import*
+from gmsh.py import*
 import sys
 # arch in bending
 #material law
diff --git a/dgshell/benchmarks/beam/beam.py b/dgshell/benchmarks/beam/beam.py
index fa32848d6dcc34e4aed6d2da6db9027b5f28225c..feadd5bdfbd4e5b73f6810cb4c408450c89e92eb 100644
--- a/dgshell/benchmarks/beam/beam.py
+++ b/dgshell/benchmarks/beam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/beamfractureOrder3/beam.py b/dgshell/benchmarks/beamfractureOrder3/beam.py
index 1ec6be377f83fc43611824691771b1c6eb3c5556..a02043e8ce8dde0ac0271f0ad9bce8d1a6a9e823 100644
--- a/dgshell/benchmarks/beamfractureOrder3/beam.py
+++ b/dgshell/benchmarks/beamfractureOrder3/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/cylinder/cylinder.py b/dgshell/benchmarks/cylinder/cylinder.py
index 2c8ad7ee6266539d1b11eb2ba0863c7d274a7e3e..b0604677b0769560c75c9bc8090c2c1301e545d2 100644
--- a/dgshell/benchmarks/cylinder/cylinder.py
+++ b/dgshell/benchmarks/cylinder/cylinder.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script for pinched cylinder benchmark
diff --git a/dgshell/benchmarks/explicitBeam/beam.py b/dgshell/benchmarks/explicitBeam/beam.py
index 3f0bb1156fa036923707e62fc7d9135d9bac4d30..d091d8e444a42adf347168191ac1c2e73e2672d9 100644
--- a/dgshell/benchmarks/explicitBeam/beam.py
+++ b/dgshell/benchmarks/explicitBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a python script
diff --git a/dgshell/benchmarks/explicitContactBeam/beam.py b/dgshell/benchmarks/explicitContactBeam/beam.py
index 44925d057f9157014fffe379285417a92438c379..e7f75cc445e77d5fcc71f0ee47c4fcf0b042a971 100644
--- a/dgshell/benchmarks/explicitContactBeam/beam.py
+++ b/dgshell/benchmarks/explicitContactBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam contact problem with a python script
diff --git a/dgshell/benchmarks/hemisphere/sphere.py b/dgshell/benchmarks/hemisphere/sphere.py
index 2f38a669698582dbd0b9e6915813cb67af56dccf..fc9e1bce717b9b5b47d0fac4966e4e11f1f04c3e 100644
--- a/dgshell/benchmarks/hemisphere/sphere.py
+++ b/dgshell/benchmarks/hemisphere/sphere.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #  Script for open hemisphere benchmark
 
diff --git a/dgshell/benchmarks/implicitContactBeam/beam.py b/dgshell/benchmarks/implicitContactBeam/beam.py
index a2bfab84b0c70374e0d9e40cc3716d68138d5ba2..54fd0bff8142dd5161733473d1814268b54483ee 100644
--- a/dgshell/benchmarks/implicitContactBeam/beam.py
+++ b/dgshell/benchmarks/implicitContactBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/inter/beam.py b/dgshell/benchmarks/inter/beam.py
index 18520ab1efe558b4ff45a4d8504f710720a5b74c..88f6512c9d60ce9439d9d53067d95a2cd74631c9 100644
--- a/dgshell/benchmarks/inter/beam.py
+++ b/dgshell/benchmarks/inter/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 #script to launch beam problem with a lua script
diff --git a/dgshell/benchmarks/multiBeam/beam.py b/dgshell/benchmarks/multiBeam/beam.py
index 25fcc9928fad0be464fe8932e81d87ba30500d2f..c1159767437ef2243f426116c86bcaaa8cf43cc8 100644
--- a/dgshell/benchmarks/multiBeam/beam.py
+++ b/dgshell/benchmarks/multiBeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/multiBeamMPI/beam.py b/dgshell/benchmarks/multiBeamMPI/beam.py
index 6f03902c7808a1d034e5208eb17a7acaa5f4015d..5530a76ffb1e056265e4fd332a3eac433f6af3fc 100644
--- a/dgshell/benchmarks/multiBeamMPI/beam.py
+++ b/dgshell/benchmarks/multiBeamMPI/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 #script to launch beam problem with a python script
 
diff --git a/dgshell/benchmarks/nlbeam/beam.py b/dgshell/benchmarks/nlbeam/beam.py
index fc2876b847b3608f75d3e8c5874de0898ba8dccc..a1ab999a57d57562725109a7aeb08c76e8d6ab29 100644
--- a/dgshell/benchmarks/nlbeam/beam.py
+++ b/dgshell/benchmarks/nlbeam/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py b/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
index 1249bed8a3bbe0600ee71da40022e0182aff7ead..9290c52751bc7134c271258ee3a6b60c5ebda45b 100644
--- a/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
+++ b/dgshell/benchmarks/plate/TwoOpposingEdgesClamped.py
@@ -1,5 +1,5 @@
 #coding-Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import*
 
 #script to launch beam problem with a python script
diff --git a/dgshell/benchmarks/pressurizedCylinder/cylinder.py b/dgshell/benchmarks/pressurizedCylinder/cylinder.py
index 61867efe5f59a3873b8a86752c4c4500c04387ea..2cb611d447f05e7099d2077347965c2f320f4131 100644
--- a/dgshell/benchmarks/pressurizedCylinder/cylinder.py
+++ b/dgshell/benchmarks/pressurizedCylinder/cylinder.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 
 # script for pressurized cylinder 
diff --git a/dgshell/benchmarks/switch/beam.py b/dgshell/benchmarks/switch/beam.py
index c6f0fe5b8c845853facb74bd1286056404dc3e16..6d36dc5d1f79f33bd823e54fda893eadf093cd27 100644
--- a/dgshell/benchmarks/switch/beam.py
+++ b/dgshell/benchmarks/switch/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam
 
diff --git a/dgshell/benchmarks/switchImplExpl/beam.py b/dgshell/benchmarks/switchImplExpl/beam.py
index 3a3f9c9b7b7e43f581b4bb76d65f8e7ba9e98f15..a41f49f7753c5f492909465e85f6c4b7cbdb093e 100644
--- a/dgshell/benchmarks/switchImplExpl/beam.py
+++ b/dgshell/benchmarks/switchImplExpl/beam.py
@@ -1,5 +1,5 @@
 #-*-coding:Utf-8-*-
-from gmshpy import *
+from gmsh.py import *
 from dgshellpy import *
 # bending beam