TSAGE: R2R - Fix a couple of issues in scene 1850, some renaming