[tokenizer] name states consistently