changed token names of keywords