Redesigned variable names and usage in makefiles