Index: token_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/token_node.inc,v
retrieving revision 1.3.2.12
diff -u -b -B -u -F^f -r1.3.2.12 token_node.inc
--- token_node.inc	14 Apr 2007 12:39:59 -0000	1.3.2.12
+++ token_node.inc	14 Jun 2007 16:26:28 -0000
@@ -85,7 +85,7 @@ function node_token_values($type, $objec
             if(!empty($vid)) {
               $vocabulary = taxonomy_get_vocabulary($vid);
               $values['vocab'] = $vocabulary->name;
-              $values['vocab-id'] = $vocabulary->name;
+              $values['vocab-id'] = $vocabulary->vid;
             }
             
   // The 'catpath' (and 'cat') tokens have been removed, as they caused quite a bit of confusion,
Index: token_taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/token/Attic/token_taxonomy.inc,v
retrieving revision 1.1.2.1
diff -u -b -B -u -F^f -r1.1.2.1 token_taxonomy.inc
--- token_taxonomy.inc	14 Apr 2007 12:39:59 -0000	1.1.2.1
+++ token_taxonomy.inc	14 Jun 2007 16:26:28 -0000
@@ -26,7 +26,7 @@ function taxonomy_token_values($type, $o
  */
 function taxonomy_token_list($type = 'all') {
   if ($type == 'taxonomy' || $type == 'all') {
-    $tokens['taxonomy']['tid'] = t("The id number of the category's parent vocabulary.");
+    $tokens['taxonomy']['vid'] = t("The id number of the category's parent vocabulary.");
     $tokens['taxonomy']['vocab'] = t("The vocabulary that the page's first category belongs to.");
     $tokens['taxonomy']['cat'] = t('The name of the category.');
     $tokens['taxonomy']['tid'] = t('The id number of the category.');