Name change & Makefile