Improve Makefile
Changed names
Changed names