Assorted fixes following the package and system renames.