modified Makefile to match new repos
Changed names
Merge pull request #1 from pkoro/master

modified Makefile to match new repos