Include original var name in tokenization