Revert "more package name change"

This reverts commit 9b360d011c09d0c45432ce4c1ea0135e099c06c6.
Revert "-changed package names"

This reverts commit 7e32bae0bd0efdc726b127cd967ffea0aac27e83.