True. Yet in the those two examples clear definitions exist for what people mean by those terms, even if those definitions have changed. In the case of 'discrimination' even if the meaning changes to become wholly negative it's still not very useful because someone using the term 'discrimination' would still have to justify that term by highlighting the choices made, and it may or may not turn out to be correct.
It's also sad and frustrating - but admittedly a dynamic of language - that a useful word gets eliminated from the language by failure to maintain its true definition.
My point though, isn't so much about the language in use but rather the concept - that choosing between things related to human beings is being seen as negative.