Refactored terminology inconsistencies for applicationtokenid