SUP-512 - fixing bugs with tokenization of name.