Changed the makefile variables from *.c and *.h to their actual names