apps names refactoring