Refactor Tps->OldTps and Tps2->Tps