Renamed SFEventGenerator to EventGenerator