All correct but in the interest of labeling I would recommend irhabists (versus salafis and/or wahabis for the reasons Steve gives or as jihadists because that puts a single meaning on jihad, which is inaccurate and misleading) and continued use of extremists as an effective descriptor of them (versus terrorists as a trite label for their intent).
Tom
Bookmarks