TSAGE: R2R - More renaming and refactoring in scene 3500. Still WIP.