App names refactor