Thiru & Kiran  | #743 | Modified token generation to not use hyphen.