AndoidManifest and classes names changes