Change generator class names