Today I finally got off

Today I finally got off my arse and wrote to some grammar experts for advice on the correctness of the ‘war on terror’. I can’t wait to hear back from them!
I wrote:
“War on terror” or “War on terrorism”?
Since September 11, 2001, “terror” seems to have replaced “terrorism” in common usage in the media and by politicians, especially in phrases such as “the war on terror”.
Is the use of ‘terror’ in this context grammatically correct or does it more correctly imply a war on an emotion or an abstract concept? If not, how does an incorrect usage become so widely accepted? I can understand politicians misusing it, but would have expected that journalists and sub-editors wouldn’t allow it.
Any clarification on the use of ‘terror’ for ‘terrorism’ would be much appreciated.
Yours sincerely,