Revert "package name & app name changed"

This reverts commit 693145322272edb373e1c0687c4cb131b20d2ae7.