updated make files with name changes