changed file names and fixed mixed-process in makefile