Rename parser and tokenizer