clear token name refactor

@cvasilak mind to review?
this is just a name refactor, maybe it's worth having it in 2.1