Modified package names to reflect app name.