Rename the package names to match the crate names, for convenience