renamed some tokens