Methinks that the "War on Terrorism" (in particular) was expanded into the "War on Terror" (in general) to allow targets like Saddam Hussein, who wouldn't fit very well into the "War on Terrorism" alone.
Saddam can't really be called a terrorist by the common definition of the term, but he sure as hell terrorized his countrymen. Ergo, the shift in terms.