Modified Makefile to follow naming conventions.