Fix makefile target filenames more
Removed terminal requirement