clean up package name derivation