Upgrade all streams to use the new base class events