Remove the __ prefix from some of the lexer tokens

fixes #7883