Makefile changes due to Repo name changes