TSAGE: Fixes and renaming for the R2R inventory list