Actually, no. Let's try 'addon' for top level scope; 'scope' for everything else.

Not sure how I feel about it yet; but lezsee.