More renaming, sanitize makefile