Fixed some issues with package names