makefile: tidy up names