clean up filenames and Makefile cruft