D7 Upgrade: Change database queries to use new tables.

http://drupal.org/node/224333#taxonomy_tables

"The names of the taxonomy database tables have changed to be consistent with our naming conventions. Each table has been prefixed with 'taxonomy_'. Table vocabulary_node_types has also changed to the singular form: taxonomy_vocabulary_node_type."