Make naming of executables consistent