Fixed problems introduced by renaming the package.