updated generators
renamed "class" to fit the "model" description