Minor Refine of TSI

Rename vars