More renaming, packaging updates and cruft deletion.