Revert "package rename"

This reverts commit 418b6e571ee11aca4531126c9b6696516d0134ae.