I think the phrase "compensatory discrimination" is better than affirmative action or diversity. The foundation for the diversity/affirmative action laws are to make up for past discrimination, hence the name containing compensatory.
Discrimination is a good part of the phrase because it in fact does discriminate against groups based upon gender or race, albeit by the government.