It doesn't bother me either way. It's just semantics. Do whatever you feel comfortable with.

For me it's a mix of things. I can say I'm bipolar yet say I have BPD, GAD, PTSD, etc. It just doesn't matter to me.