renamed generator to collector