file name modifications, and makefile update