fire worship vs Zoroastrianism

Term Zoroastrianism is derived from prophet's name, pronounced incorrectly to sound like the-roast-rianism which is, IMHO, a bad joke. Also nobody calls Judaism and Islam Elijahism or Muhammadism. I understand that fire is just a symbol of God, not a God himself. The actual Persian pre-Islamic top God is called Mazda (Wisdom). I'd use Mazdaism, but I don't write about religion in this blog. I use fire worship when referring to rituals and symbols (which are not copyrighted by any particular religion) and Persian when I talk about politics, economy, ethnicity, language, nationality or general culture of Persian Empire.