The problem of non-Muslims using the word to refer to God had previously sparked tension and violence.