I think we should stop using the "war on terror" phrase also. It's far too abstract and obtuse, like the "war on drugs". We are at war with terrorists and the nation states who support them- or, at least, we should be. Of course, we don't wantot be too harsh or hurt sensibilities, so we market it as a "war on terror".
wantot = want to. Typing too fast. Not enough coffee.