diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6870137f..99807ed72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ if (DAMASK_SOLVER STREQUAL "grid")
     message ("Building Grid Solver\n")
 elseif (DAMASK_SOLVER STREQUAL "fem" OR DAMASK_SOLVER STREQUAL "mesh")
     project (damask-mesh Fortran C)
-    add_definitions (-DFEM)
+    add_definitions (-DMesh)
     message ("Building Mesh Solver\n")
 else ()
     message (FATAL_ERROR "Build target (DAMASK_SOLVER) is not defined")
diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90
index 357bcce9f..dea500900 100644
--- a/src/CPFEM2.f90
+++ b/src/CPFEM2.f90
@@ -21,7 +21,7 @@ module CPFEM2
   use homogenization
   use constitutive
   use crystallite
-#if    defined(FEM)
+#if    defined(Mesh)
   use FEM_quadrature
   use discretization_mesh
 #elif defined(Grid)
@@ -42,7 +42,7 @@ subroutine CPFEM_initAll
   call DAMASK_interface_init                                                                        ! Spectral and FEM interface to commandline
   call prec_init
   call IO_init
-#ifdef FEM
+#ifdef Mesh
   call FEM_quadrature_init
 #endif
   call numerics_init
@@ -53,7 +53,7 @@ subroutine CPFEM_initAll
   call lattice_init
   call HDF5_utilities_init
   call results_init
-#if    defined(FEM)
+#if    defined(Mesh)
   call discretization_mesh_init
 #elif defined(Grid)
   call discretization_grid_init
diff --git a/src/numerics.f90 b/src/numerics.f90
index 8d242c71d..b0163aee3 100644
--- a/src/numerics.f90
+++ b/src/numerics.f90
@@ -63,8 +63,8 @@ module numerics
 #endif
 
 !--------------------------------------------------------------------------------------------------
-! FEM parameters:
-#ifdef FEM
+! Mesh parameters:
+#ifdef Mesh
  integer, protected, public :: &
    integrationOrder           =  2, &                                                              !< order of quadrature rule required
    structOrder                =  2                                                                 !< order of displacement shape functions
@@ -200,8 +200,8 @@ subroutine numerics_init
 #endif
 
 !--------------------------------------------------------------------------------------------------
-! FEM parameters
-#ifdef FEM
+! Mesh parameters
+#ifdef Mesh
        case ('integrationorder')
          integrationorder = IO_intValue(line,chunkPos,2)
        case ('structorder')
@@ -267,7 +267,7 @@ subroutine numerics_init
 
 !--------------------------------------------------------------------------------------------------
 ! spectral parameters
-#ifdef FEM
+#ifdef Mesh
  write(6,'(a24,1x,i8)')      ' integrationOrder:       ',integrationOrder
  write(6,'(a24,1x,i8)')      ' structOrder:            ',structOrder
  write(6,'(a24,1x,L8)')      ' B-Bar stabilisation:    ',BBarStabilisation