By using the term "Bin Ladenism" instead of "Isalmic terrorism" and its variants, perhaps it will be easier to distiguish between those we are fighting and those we are not.
It is a problem defining exactly who the enemy is.
Bin Ladenism=Isalmic terrorism=Islamic funamentalism=salafiism=Wahhabism=...
When we come down to it what we have is a group of people who don't like the way the world is going(globalism) and believe god has told them to kill and destroy civilation to stop it. Unfortunatly (for Muslims) they are basing their fight on Islam and to be honest they have a lot of ammo in the Koran. In the end it is up to them to refute this and up an end to it.