Fix consistent naming of event stream.