Makefile renames/fixes