Makefile Improved
Standard Names for Variables and Functions