Is "Global War on Terror" an obsolete term in 2011?

Here's what one editor thinks this morning:

When U.S. and allied forces invaded Afghanistan nine years ago to hunt down Osama bin Laden and the other members of the Islamic extremist group al-Qaida, the military operations were labeled a War on Terror.
When U.S. and allied forces invaded Iraq, military operations in that country also fell under the War on Terror label.
But the label didn't fit when terrorists struck in Europe and other parts of the world, nor did it fit when someone in the U.S. was arrested on charges of terrorist acts.
And with U.S. involvement in combat operations in Iraq winding down and military operations in Afghanistan focused more in combating the Taliban forces over control of that country, the War on Terror label seems inappropriate there, as well.
So we are going to drop the War on Terror page label, instead focusing on more specific labels, such as War in Afghanistan, Global Terrorism and Rebuilding Iraq.