Token types renamed + tokenizer simplified