better naming of tokens, so thatn syntax highlighting works