Changed MAkefile for new filenames