Work with new executable names