Some more changes to reflect the name change of the package.