Rename some tokens