Renaming and tokenizer work.
Tidied up a bit.