Fix makefile and rename