(20979) normalize how snapshots are determined, remove hardcoded snapshot name assumptions