Fixing makefile to reflect filename changes