refactor makefile variable names