=== modified file 'modules/taxonomy/taxonomy.module'
--- modules/taxonomy/taxonomy.module	2009-12-16 19:57:45 +0000
+++ modules/taxonomy/taxonomy.module	2009-12-21 12:17:27 +0000
@@ -344,7 +344,7 @@ function taxonomy_vocabulary_save($vocab
   }
   elseif (empty($vocabulary->vid)) {
     $status = drupal_write_record('taxonomy_vocabulary', $vocabulary);
-    field_attach_create_bundle('taxonomy_term', $vocabulary->machine_name);
+    field_attach_create_bundle('taxonomy_term_reference', $vocabulary->machine_name);
     taxonomy_vocabulary_create_field($vocabulary);
     module_invoke_all('taxonomy_vocabulary_insert', $vocabulary);
   }
@@ -374,7 +374,7 @@ function taxonomy_vocabulary_delete($vid
     taxonomy_term_delete($tid);
   }
 
-  field_attach_delete_bundle('taxonomy_term', $vocabulary['machine_name']);
+  field_attach_delete_bundle('taxonomy_term_reference', $vocabulary['machine_name']);
   module_invoke_all('taxonomy', 'delete', 'vocabulary', $vocabulary);
 
   cache_clear_all();
@@ -467,17 +467,17 @@ function taxonomy_term_save($term) {
     $term->vocabulary_machine_name = $vocabulary->machine_name;
   }
 
-  field_attach_presave('taxonomy_term', $term);
+  field_attach_presave('taxonomy_term_reference', $term);
 
   if (!empty($term->tid) && $term->name) {
     $status = drupal_write_record('taxonomy_term_data', $term, 'tid');
-    field_attach_update('taxonomy_term', $term);
+    field_attach_update('taxonomy_term_reference', $term);
     module_invoke_all('taxonomy_term_update', $term);
   }
   else {
     $status = drupal_write_record('taxonomy_term_data', $term);
     _taxonomy_clean_field_cache($term);
-    field_attach_insert('taxonomy_term', $term);
+    field_attach_insert('taxonomy_term_reference', $term);
     module_invoke_all('taxonomy_term_insert', $term);
   }
 
@@ -552,7 +552,7 @@ function taxonomy_term_delete($tid) {
         ->condition('tid', $tid)
         ->execute();
 
-      field_attach_delete('taxonomy_term', $term);
+      field_attach_delete('taxonomy_term_reference', $term);
       _taxonomy_clean_field_cache($term);
       module_invoke_all('taxonomy_term_delete', $term);
     }
@@ -962,7 +962,7 @@ function taxonomy_implode_tags($tags, $v
  */
 function taxonomy_field_info() {
   return array(
-    'taxonomy_term' => array(
+    'taxonomy_term_reference' => array(
       'label' => t('Taxonomy term'),
       'description' => t('This field stores a reference to a taxonomy term.'),
       'default_widget' => 'options_select',

=== modified file 'modules/taxonomy/taxonomy.pages.inc'
--- modules/taxonomy/taxonomy.pages.inc	2009-11-13 09:24:06 +0000
+++ modules/taxonomy/taxonomy.pages.inc	2009-12-21 12:16:31 +0000
@@ -30,9 +30,9 @@ function taxonomy_term_page($term) {
   drupal_add_feed(url('taxonomy/term/' . $term->tid . '/feed'), 'RSS - ' . $term->name);
   drupal_add_css(drupal_get_path('module', 'taxonomy') . '/taxonomy.css');
 
-  field_attach_prepare_view('taxonomy_term', array($term->tid => $term), 'full');
+  field_attach_prepare_view('taxonomy_term_reference', array($term->tid => $term), 'full');
   $build = array();
-  $build += field_attach_view('taxonomy_term', $term);
+  $build += field_attach_view('taxonomy_term_reference', $term);
   $build['term_description'] = array(
     '#markup' => check_markup($term->description, $term->format, '', TRUE),
     '#weight' => -1,