Update variable naming in  makefile