Spell names fixes