[enh] Use APP_ID everywhere