Revert "Fixed package names"

This reverts commit 3eb867fd7f0805599a6b124d7a84ab0fc302d60f.