Renamed GeneratorEngine to just Generator