TSAGE: R2R - Some renaming and refactoring in scene 1337