Definitions ain't my cup of tea, but I might suggest to regard any terrorist who identifies himself as a muslim in his actions, as a fundamentalist. On the other hand, if he belongs to a secular organization (like the 'popular front') and just happens to be a muslim, then he's a terrorist period.

Good enough?