changed token names of keywords
Merge pull request #1 from tekina/master

changed token names of keywords