Fine by me, nitpicking over definitions is not that interesting anyway.
For instance the word terrorism you bring up is just used where convenient.
The israelian army using cluster bombs on civilian urban area´s, warfare or terrorism?
The resistance movement in WO 2 blowing up railroad tracks, warfare or terrorism?
The Taliban shooting down a russian helicopter?
The same Taliban blowing up a US tank with a roadside bomb?
Usually defined not by the nature of the action, or even wheter performed by "official"soldiers or civilians, just by "on which side do I stand in the conflict".
We also moved away to far from "poisened arrows"....