correct subpkg names
1.6.1