Consistent Makefile var names