Update variables names in Makefile