Issue #2274815 by craig.norris, eshta: Consistent naming for variation set names.