Changed naming strategy for spell classes