Renamed a few things.
Fixed makefile.