fixed the naming of tokens bug