TSAGE: Fixes and renaming for R2R forest