Refactored app names and packages