Rename =token_type= to =_type=
Merge branch 'adjust-types'