Some major updates and renaming for app wrapping