Refactor. Change app name