Clean up makefile.
Simplify some terminology.