Why do you think the N word existed in English as anything but a slur? Narcissism and narcissistic personality disorder are not equal. I'm open to changing terminology if it's doing harm, but I think this one needs to be that the term for NPD should likely change. From what I know (and correct me if I'm wrong please), the common usage of "narcissism" has very little to do with NPD, which was coined later and seems almost derogatory in itself (in effect, grouping those with NPD along with the type of asshole commonly called narcissists)
Edit: I have been convinced that this story I was told was wrong about NPD. There doesn't seem to be a usage of narcissism outside of attempted psychological prescription before 1900 in english, and only first in 1899 in German which caused its use in English.