Depending on the country some have already reached that definition. Terrorism is a nebulous enough term that it can be made to fit a large variety of entities. That's exactly why it was chosen.

Never. The word "terrorism" is a word used by the incumbent power to describe that which is "other." They get to decide who the word applies to and who it doesn't.