Updates to makefiles after rename.