[base] TokenShaper: some naming changes
adapted to changes in TokenShaper API
test file update
Merge branch 'master' of github.com:xzero/x0