added tokens NAME and OPERATOR, (unfinished spec)