TSAGE: Renaming and bugfixes for R2R confrontation