makefile changes
renaming of some vars