Jihadism is a militant version of Islamism that takes the literal (lesser) meaning of Jihad-- As a physical struggle.
Islamic Modernism is the non-militant version of trying to change the status quo of the State. These, by the way, are much more numerous than Jihadism.
Islamic Modernists are those in support of the current state, which are quite unusual characters.
and so on.