Changing max ind/dep generator names per new scaling method.
Added additional generators.