Modifying variable names in the Makefile to avoid confusion.