Yesish. "Officially" everything is Anti-social Personality Disorder. Within those diagnosed with the disorder, some lean towards the antiquated psychopath diagnosis while some of us lean more towards sociopath.

For instance while enjoyment in causing harm/pain/control over small animals is technically ASPD, it's still found primarily in those who historically been called psychopaths and not sociopaths.

There's enough overlap, and the treatments are pretty much the same, that a one size fits sorta all. But just like not everyone shows the same symptoms when they have the flu, not everyone shows the same symptoms when they have ASPD. For instance the various head docs I've seen over the years haven't even bothered asking me about violent tendencies because my own lovely trip with ASPD is far removed from what you'd think of when you talk about a psychopath.

Like pretty much everything else in our heads, no one knows exactly what's going on with ASPD. As you said, there's not much consensus.