Improve naming and order in Makefile.