I do see something that is a bit probamatic.
Mainly Islamic nations being called Caliphates.
By default, this implies they have claimed the title of Caliph.
Shia, Ibadi, Sunni, any denomination of Islam, one thing is pretty much clear: The Caliph is the leader of all of Islam.
This means that if there is another state that has claimed to be the Caliph, it is inherently a pretender from the viewpoint of the first state to claim it. And vis versa.
These two states really shouldnt get along. A Shia nation would be on even worse terms, for they believe it must be an imam who is a descendant of Muhammad himself . Since Shia isnt represented, that isnt a issue.
But My point is that if two Islamic states have a Dynamic name which declares them Shia, they should have a negative modifier to opinion to represent the fact that one of them is a false claimant.