diff --git a/Makefile b/Makefile
index 161d4c3ce..1e2f9db9f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,29 +4,29 @@ SHELL = /bin/sh
 ########################################################################################
 DAMASK_ROOT = $(shell python -c "import os,sys; print(os.path.normpath(os.path.realpath(os.path.expanduser('$(pwd)'))))")
 .PHONY: all
-all: grid FEM processing
+all: grid mesh processing
 
 .PHONY: grid
 grid: build/grid
 	@(cd build/grid;make -j4 --no-print-directory -ws all install;)
-
 .PHONY: spectral
-spectral: build/grid
-	@(cd build/grid;make -j4 --no-print-directory -ws all install;)
+spectral: grid
 
+.PHONY: mesh
+mesh: build/mesh
+	@(cd build/mesh; make -j4 --no-print-directory -ws all install;)
 .PHONY: FEM
-FEM: build/FEM
-	@(cd build/FEM; make -j4 --no-print-directory -ws all install;)
+FEM: mesh
 
 .PHONY: build/grid
 build/grid:
 	@mkdir -p build/grid
 	@(cd build/grid; cmake -Wno-dev -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;)
 
-.PHONY: build/FEM
-build/FEM:
-	@mkdir -p build/FEM
-	@(cd build/FEM; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;)
+.PHONY: build/mesh
+build/mesh:
+	@mkdir -p build/mesh
+	@(cd build/mesh; cmake -Wno-dev -DDAMASK_SOLVER=FEM -DCMAKE_INSTALL_PREFIX=${DAMASK_ROOT}  -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} ../../;)
 
 .PHONY: clean
 clean: