Makefile fixed for the new names