Renamed generator related stuff