Refactor app name and flow