Refactor app2app identification.