NPD: disorder, disease, medical condition, syndrome?

You may have trouble parsing it, but my point is that they were two separate things. The first (per my three criteria stated in this comment, which you might have missed) as specific (is in making ontological distinctions), can be backed up by evidence, and doesn’t attempt a diagnosis; the second is none of those things.