I'd prefer things like Siren, Diabolos, King Moggle Mog, etc become thematic spells. Like Siren Song, Nightmare, and whatever the hell the Mog does :P