Better goal names in the makefile.