Correct macro names per naming standard in Makefile.rules