Rename Tokens, Macros