Really, it should be as simple as changing the wording to clearly distinguish between the extremists and mainstream muslims. That's really about all that should be done. If someone gets upset about tying the words muslim or islam to an extremist group, then they should take a look at their own life and see if there's a reason why they are so offended that an extremist group is getting bad light. 

Moral of the story:

Extremists != Mainstream practitioners.

People shouldn't get so butt-hurt over people calling out extremists in their own religion. Instead they should look to clean house and save face.