Fixed a few package-name bugs.