TokenUtils renaming bug fix