If you're not sure what's the difference between a controlled vocabulary, a taxonomy and a thesaurus, this blog article is quite good at clarifying the above concepts and more.

What's not covered are tags and folksonomy.