TSAGE: R2R - Some refactoring and renaming in scene 3500