I view the terms as interchangeable.

I believe a psychopath has a personality disorder, and I would put the personality disorder on a spectrum.

Specifically, I would say the personality disorder is narcissism