android: packages renamed
desktop: renamed packages