Containers, Spell Types, and Circles

I suggested an improvement of terminology already here: