fix naming problems for snapshotting & replays