applicationtoken -> applicationtokenid refactoring