Revert "Improved package names"

This reverts commit 91df6146a581d3ffcd4fe40719001f0d0c34bc47.