Better naming.
Makefile fixes.