renames public methods to make more sense in Tokeniser
corrects reference to _matches in Tokeniser