rename some of the tokens in accordance with the haskell impl