Generator classes renamed