Revert "renamed the packages to a more appropriate name."

This reverts commit 965a692c4d298e461911036915eba1f1ca35bba5.
renamed the packages to a more appropriate name.