Change filenames
Update Makefile