Ultra-Orthodox Question

I was reading something the other day that seemed to make a difference between haredi and hasidic. I thought they were interchangeable terms for Ultra-Orthodox Jews. Am I wrong?

They are both considered "Ultra-Orthodox" but differ in many ways.

Here is a good comparison:

http://en.wikipedia.org/wiki/Hasidic_Judaism

http://en.wikipedia.org/wiki/Haredi_Judaism

Where I come from, Chareidi is considered to contain both Chassidic and Yeshivish groups and usually the more right-wing of both. Some people would consider us Chareidi, although we don't. Few would consider us Yeshivish. I wouldn't consider all Chassidic or Yeshivish people to be Chareidi and likely most people who openly identify as Chareidi would not consider my family to be Chareidi.

I don't know if that helps much. ;)