Revert "Change package name to distinguish from original."

This reverts commit cbd8de7c2dfcfed5b97e4a276e26f10217f1edfc.