More changes and renames to have "make install" work.