TSAGE: R2R - Some more renaming and refactoring in scene 1337