You're accurate and so are the definitions.

Warfare is not only overlap, it is confusion writ large. That is not really a problem except for those who don't cope well or who wish to make it one...