Sure, I can see them being different things. But that doesn't meant that they both can't be involved at the same time.
Maybe what Eich is facing is seen as "punishment" by some, but it is indisputably discrimination, too. Losing one's job solely because of one's beliefs is a form of discrimination, regardless of what those beliefs may be.
I don't see how you can seriously say that you're against discrimination and those who discriminate, yet you'll resort to that exact same discriminatory behavior while supposedly trying to stop discrimination!