simple_scope --> class_scope
re-generated generator from model, correcting scope classes