diff --git a/Makefile b/Makefile
index 2e9c184d2a81c519f9c02ceb877ab662700f3e35..8ef11ad6808c12febcf2ba69fc833dc4d94f0296 100644
--- a/Makefile
+++ b/Makefile
@@ -4,35 +4,35 @@ include local/make.inc
 # Standard version with optimized compilation (ifort compiler)
 all: F90 = mpif90
 all: F90FLAGS = -O3 -xHOST
-all: EXEC = $(BINDIR)/gyacomo
+all: EXEC = $(BINDIR)/gyacomo22
 all: dirs src/srcinfo.h
 all: compile
 
 # Fast compilation
 fast: F90 = mpif90
 fast: F90FLAGS = -fast
-fast: EXEC = $(BINDIR)/gyacomo_fast
+fast: EXEC = $(BINDIR)/gyacomo22_fast
 fast: dirs src/srcinfo.h
 fast: compile
 
 # Debug version with all flags
 debug: F90 = mpif90
 debug: F90FLAGS = -g -traceback -ftrapuv -warn all -debug all
-debug: EXEC = $(BINDIR)/gyacomo_debug
+debug: EXEC = $(BINDIR)/gyacomo22_debug
 debug: dirs src/srcinfo.h
 debug: compile
 
 # For compiling on marconi
 marconi: F90 = mpiifort
 marconi: F90FLAGS = -O3 -xHOST
-marconi: EXEC = $(BINDIR)/gyacomo
+marconi: EXEC = $(BINDIR)/gyacomo22
 marconi: dirs src/srcinfo.h
 marconi: compile
 
 # For compiling on daint
 daint: F90 = ftn
 daint: F90FLAGS = -O3
-daint: EXEC = $(BINDIR)/gyacomo
+daint: EXEC = $(BINDIR)/gyacomo22
 daint: dirs src/srcinfo.h
 daint: compile
 
@@ -40,7 +40,7 @@ daint: compile
 gopt: F90 = mpif90
 gopt: F90FLAGS = -O3 -std=legacy -ffree-line-length-0
 gopt: EXTMOD   = -J $(MODDIR)
-gopt: EXEC = $(BINDIR)/gyacomo
+gopt: EXEC = $(BINDIR)/gyacomo22
 gopt: dirs src/srcinfo.h
 gopt: compile
 
@@ -48,7 +48,7 @@ gopt: compile
 gdebug: F90 = mpif90
 gdebug: F90FLAGS = -C -g -std=legacy -ffree-line-length-0
 gdebug: EXTMOD   = -J $(MODDIR)
-gdebug: EXEC = $(BINDIR)/gyacomo_debug
+gdebug: EXEC = $(BINDIR)/gyacomo22_debug
 gdebug: dirs src/srcinfo.h
 gdebug: compile