Updated Makefile for new names