filename changes and change to makefile