Revert "Revert "Package name fix""

This reverts commit d229d53d07d0a67ddc23eeecfbe96b64f2639a6d.