rename And Or and Xor to list tokens
also rename the code parts