renamed APP, updated package name and refs