- fix subpackage name
- really fix that package name