Refactor dead_stream_resurrector
Update naming