diff --git a/Makefile b/Makefile
index 34ce18c52..60cf3b8e0 100644
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,16 @@ all: grid mesh processing
 .PHONY: grid
 grid: build/grid
 	@(cd build/grid;make -j${DAMASK_NUM_THREADS} all install;)
+	@rm -f ${DAMASK_ROOT}/bin/DAMASK_spectral > /dev/null || true
+	@ln -s ${DAMASK_ROOT}/bin/DAMASK_grid ${DAMASK_ROOT}/bin/DAMASK_spectral
 .PHONY: spectral
 spectral: grid
 
 .PHONY: mesh
 mesh: build/mesh
 	@(cd build/mesh; make -j${DAMASK_NUM_THREADS} all install;)
+	@rm -f ${DAMASK_ROOT}/bin/DAMASK_FEM > /dev/null || true
+	@ln -s ${DAMASK_ROOT}/bin/DAMASK_mesh ${DAMASK_ROOT}/bin/DAMASK_FEM
 .PHONY: FEM
 FEM: mesh
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 53c7ffc70..0cb697013 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,10 +17,10 @@ if (PROJECT_NAME STREQUAL "damask-grid")
       file(GLOB grid-sources grid/*.f90)
 
       if(NOT CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
-        add_executable(DAMASK_spectral ${damask-sources} ${grid-sources})
-        install (TARGETS DAMASK_spectral RUNTIME DESTINATION bin)
+        add_executable(DAMASK_grid ${damask-sources} ${grid-sources})
+        install (TARGETS DAMASK_grid RUNTIME DESTINATION bin)
       else()
-        add_library(DAMASK_spectral OBJECT ${damask-sources} ${grid-sources})
+        add_library(DAMASK_grid OBJECT ${damask-sources} ${grid-sources})
         exec_program (mktemp OUTPUT_VARIABLE nothing)
         exec_program (mktemp ARGS -d OUTPUT_VARIABLE black_hole)
         install (PROGRAMS ${nothing} DESTINATION ${black_hole})
@@ -30,7 +30,7 @@ elseif (PROJECT_NAME STREQUAL "damask-mesh")
       
       file(GLOB mesh-sources mesh/*.f90)
 
-      add_executable(DAMASK_FEM ${damask-sources} ${mesh-sources})
-      install (TARGETS DAMASK_FEM RUNTIME DESTINATION bin)
+      add_executable(DAMASK_mesh ${damask-sources} ${mesh-sources})
+      install (TARGETS DAMASK_mesh RUNTIME DESTINATION bin)
       
 endif()
diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90
index 84dc7cd51..7b3265740 100644
--- a/src/grid/DAMASK_grid.f90
+++ b/src/grid/DAMASK_grid.f90
@@ -6,7 +6,7 @@
 !> @details doing cutbacking, forwarding in case of restart, reporting statistics, writing
 !> results
 !--------------------------------------------------------------------------------------------------
-program DAMASK_spectral
+program DAMASK_grid
 #include <petsc/finclude/petscsys.h>
  use PETScsys
  use prec
@@ -495,4 +495,4 @@ program DAMASK_spectral
 
  call quit(0)                                                                                       ! no complains ;)
 
-end program DAMASK_spectral
+end program DAMASK_grid
diff --git a/src/mesh/DAMASK_mesh.f90 b/src/mesh/DAMASK_mesh.f90
index 3c9613d73..d36b27c17 100644
--- a/src/mesh/DAMASK_mesh.f90
+++ b/src/mesh/DAMASK_mesh.f90
@@ -6,7 +6,7 @@
 !> @details doing cutbacking, reporting statistics, writing
 !> results
 !--------------------------------------------------------------------------------------------------
-program DAMASK_FEM 
+program DAMASK_mesh
 #include <petsc/finclude/petscsys.h>
   use PetscDM
   use prec
@@ -367,4 +367,4 @@ program DAMASK_FEM
 
   call quit(0)                                                                                      ! no complains ;)
 
-end program DAMASK_FEM
+end program DAMASK_mesh