diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90
index 7e7949ec8..04a829163 100644
--- a/src/CPFEM2.f90
+++ b/src/CPFEM2.f90
@@ -11,7 +11,6 @@ module CPFEM2
   use FEsolving
   use math
   use rotations
-  use mesh
   use material
   use lattice
   use IO
@@ -25,6 +24,9 @@ module CPFEM2
   use crystallite
 #ifdef FEM
   use FEM_Zoo
+  use mesh
+#else
+  use mesh_grid
 #endif
 
   implicit none
diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90
index 71d95187b..f875d5941 100644
--- a/src/grid/DAMASK_grid.f90
+++ b/src/grid/DAMASK_grid.f90
@@ -15,7 +15,7 @@ program DAMASK_spectral
  use config
  use debug
  use math
- use mesh
+ use mesh_grid
  use CPFEM2
  use FEsolving
  use numerics
diff --git a/src/grid/grid_damage_spectral.f90 b/src/grid/grid_damage_spectral.f90
index bdd9a6b89..3a6fe2181 100644
--- a/src/grid/grid_damage_spectral.f90
+++ b/src/grid/grid_damage_spectral.f90
@@ -12,7 +12,7 @@ module grid_damage_spectral
 
   use prec
   use spectral_utilities
-  use mesh
+  use mesh_grid
   use damage_nonlocal
   use numerics
   use damage_nonlocal
diff --git a/src/grid/grid_mech_FEM.f90 b/src/grid/grid_mech_FEM.f90
index 59252a674..baf3e59e1 100644
--- a/src/grid/grid_mech_FEM.f90
+++ b/src/grid/grid_mech_FEM.f90
@@ -21,7 +21,7 @@ module grid_mech_FEM
   use DAMASK_interface
   use spectral_utilities
   use discretization
-  use mesh
+  use mesh_grid
   use math
  
   implicit none
diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90
index b7b43eeef..f0c564035 100644
--- a/src/grid/grid_mech_spectral_basic.f90
+++ b/src/grid/grid_mech_spectral_basic.f90
@@ -20,7 +20,7 @@ module grid_mech_spectral_basic
   use config
   use numerics
   use homogenization
-  use mesh
+  use mesh_grid
   use CPFEM2
   use debug
 
diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90
index 3f730cc3b..0ceaac572 100644
--- a/src/grid/grid_mech_spectral_polarisation.f90
+++ b/src/grid/grid_mech_spectral_polarisation.f90
@@ -20,7 +20,7 @@ module grid_mech_spectral_polarisation
   use config
   use numerics
   use homogenization
-  use mesh
+  use mesh_grid
   use CPFEM2
   use debug
  
diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90
index 2977faf2b..04b3ace66 100644
--- a/src/grid/grid_thermal_spectral.f90
+++ b/src/grid/grid_thermal_spectral.f90
@@ -12,7 +12,7 @@ module grid_thermal_spectral
 
   use prec
   use spectral_utilities
-  use mesh
+  use mesh_grid
   use thermal_conduction
   use material
   use numerics
diff --git a/src/grid/spectral_utilities.f90 b/src/grid/spectral_utilities.f90
index aeaf748c3..d7c738205 100644
--- a/src/grid/spectral_utilities.f90
+++ b/src/grid/spectral_utilities.f90
@@ -11,7 +11,7 @@ module spectral_utilities
   use prec
   use math
   use IO
-  use mesh
+  use mesh_grid
   use numerics
   use debug
   use config
diff --git a/src/mesh_grid.f90 b/src/mesh_grid.f90
index bfeb7ce86..9a1e0e457 100644
--- a/src/mesh_grid.f90
+++ b/src/mesh_grid.f90
@@ -4,7 +4,7 @@
 !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
 !> @brief Parse geometry file to set up discretization and geometry for nonlocal model
 !--------------------------------------------------------------------------------------------------
-module mesh
+module mesh_grid
 #include <petsc/finclude/petscsys.h>
   use PETScsys
 
@@ -477,4 +477,4 @@ end function IPneighborhood
 !
 !end function mesh_nodesAroundCentres
 
-end module mesh
+end module mesh_grid