Revising songs that use the "name" Yahweh?

There have been some who have asked whether it would be possible to give a list of songs that use the pseudo-name Yahweh for God, and to suggest possible alternatives.

For instance, the popular (with a certain set) Frank Anderson song "Strong and Constant" has the line "I will be Yahweh who walks with you". You could sing this as "I the Lord will always walk with you" (which also actually makes better sense).

But my question is: Name one song that uses "Yahweh" which might actually be worth singing or might be worth perpetuating with alterations?

I think this is a good opportunity just to completely scrap the whole sorry lot. There is a saying that "if it ain't broke, don't fix it", but if it is completely stuffed, one could say, don't bother stuffing around with it.

[Actually, I can name ONE song that uses "Jehovah" and is worth singing, but most hymnals have already altered it: "Guide me, O thou Great Jehovah" is now universally sung as "Guide me O thou Great Redeemer". It is worth singing, but then it comes from a different time and a different school of hymnody than the modern "Yahweh is my buddy" stuff.]