Changing the name everywhere and a handful of Makefile updates