The phrase always bugged me anyway. Terror is a tactic our enemies use, not an enemy itself. Someone once said that declaring war on terror was akin to FDR, on the day after Pearl Harbor, declaring war on aviation.
Me too. The phrase is not only irritating, but I'm afraid it obscures the nature of the foe and the best way to prevail.