Package renames
Revert "Package renames"

This reverts commit 47d8048ff33ced9e8a1031f28cd2b014a8260c77.
Rename packages