fix incorrect name and Makefile change from Andrew