YES! Good for you Philip, I totally agree.
People can't just make up new definitions for words, to make them mean what they want them to mean. And even if you COULD argue that "self-defense" might include things like verbal de-escalation, it is clearly not what was originally intended to be discussed in those, ehm, discussions.
And congratulations on a splendid surname.