TSAGE: R2R - Some more renaming, fix card shuffling animations sync