Fix makefile target filenames more