Changed 'tokens' to 'items' for all typed collections.

This closes GitHub #355.