The World Health Organization's 2022 system, which dropped the named types (narcissistic, borderline, etc.) in favor of rating overall severity plus trait domains — keeping only an optional "borderline pattern" qualifier.
Globally, diagnosis is shifting from labels toward severity-plus-traits. "Narcissistic" and "borderline" stay useful shorthand, but the formal systems increasingly describe a spectrum.