I disagree completely. Psychopaths are as psychopaths do. If anything I expect we'll get better at diagnosing/detecting them and perhaps discovering sub-classes

I disagree completely. Psychopaths are as psychopaths do. If anything I expect we'll get better at diagnosing/detecting them and perhaps discovering sub-classes of them, of which perhaps some are problematic and some are not. We'll most likely continue to call the problematic ones psychopaths since we'll need a label to discuss people lacking in empathy who commit terrible crimes or make people's lives hell for fun and profit. Maybe some of the people we now call psychopaths will be called something else and redeemed in the popular imagination. But as long as the worst people we now call psychopaths continue to exist I think there will be no strong drive to retire or sanitize the word.