The guidelines currently say to use Yahweh for the name of God in all the articles. The problem with the Hebrew name of God, YHWH, is some people translate this to be Yahweh, while others translate it to Jehovah. Since Yahweh is never used in either the NIV or KJV, how about not using either? This will spare the controversy between the two names. We could use something that is used in both translations like Most High, or even just God. I don't think using God will be controversial as it is used all throughout the scriptures. However, if you're trying to avoid all controversy, then something like Most High would be suitable.