Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.551
diff -u -p -r1.551 taxonomy.module
--- modules/taxonomy/taxonomy.module	16 Dec 2009 19:57:45 -0000	1.551
+++ modules/taxonomy/taxonomy.module	21 Dec 2009 12:27:40 -0000
@@ -962,11 +962,11 @@ function taxonomy_implode_tags($tags, $v
  */
 function taxonomy_field_info() {
   return array(
-    'taxonomy_term' => array(
+    'term_reference' => array(
       'label' => t('Taxonomy term'),
       'description' => t('This field stores a reference to a taxonomy term.'),
       'default_widget' => 'options_select',
-      'default_formatter' => 'taxonomy_term_link',
+      'default_formatter' => 'term_reference_link',
       'settings' => array(
         'allowed_values' => array(
           array(
@@ -986,7 +986,7 @@ function taxonomy_field_widget_info() {
   return array(
     'taxonomy_autocomplete' => array(
       'label' => t('Autocomplete term widget (tagging)'),
-      'field types' => array('taxonomy_term'),
+      'field types' => array('term_reference'),
       'settings' => array(
         'size' => 60,
         'autocomplete_path' => 'taxonomy/autocomplete',
@@ -1002,8 +1002,8 @@ function taxonomy_field_widget_info() {
  * Implements hook_field_widget_info_alter().
  */
 function taxonomy_field_widget_info_alter(&$info) {
-  $info['options_select']['field types'][] = 'taxonomy_term';
-  $info['options_buttons']['field types'][] = 'taxonomy_term';
+  $info['options_select']['field types'][] = 'term_reference';
+  $info['options_buttons']['field types'][] = 'term_reference';
 }
 
 /**
@@ -1045,7 +1045,7 @@ function taxonomy_field_validate($obj_ty
     if (!empty($item['tid'])) {
       if (!isset($allowed_values[$item['tid']])) {
         $errors[$field['field_name']][$langcode][$delta][] = array(
-          'error' => 'taxonomy_term_illegal_value',
+          'error' => 'term_reference_illegal_value',
           'message' => t('%name: illegal value.', array('%name' => t($instance['label']))),
         );
       }
@@ -1068,13 +1068,13 @@ function taxonomy_field_is_empty($item, 
  */
 function taxonomy_field_formatter_info() {
   return array(
-    'taxonomy_term_link' => array(
+    'term_reference_link' => array(
       'label' => t('Link'),
-      'field types' => array('taxonomy_term'),
+      'field types' => array('term_reference'),
     ),
-    'taxonomy_term_plain' => array(
+    'term_reference_plain' => array(
       'label' => t('Plain text'),
-      'field types' => array('taxonomy_term'),
+      'field types' => array('term_reference'),
     ),
   );
 }
@@ -1086,7 +1086,7 @@ function taxonomy_field_formatter($objec
   $element = array();
 
   switch ($display['type']) {
-    case 'taxonomy_term_link':
+    case 'term_reference_link':
       foreach ($items as $delta => $item) {
         // @todo Remove this when "node_build() does not call
         // field_attach_prepare_view()" bug is fixed.
@@ -1094,7 +1094,7 @@ function taxonomy_field_formatter($objec
         if (!isset($item['taxonomy_term'])) {
           $item['taxonomy_term'] = taxonomy_term_load($item['tid']);
         }
-        $term = $item['taxonomy_term'];
+        $term = $item['taxonomy_term_'];
         $element[$delta] = array(
           '#type' => 'link',
           '#title' => $term->name,
@@ -1103,7 +1103,7 @@ function taxonomy_field_formatter($objec
       }
       break;
 
-    case 'taxonomy_term_plain':
+    case 'term_reference_plain':
       foreach ($items as $delta => $item) {
         $term = $item['taxonomy_term'];
         $element[$delta] = array(
@@ -1188,7 +1188,7 @@ function _taxonomy_clean_field_cache($te
   }
 
   // Load info for all taxonomy term fields.
-  $fields = field_read_fields(array('type' => 'taxonomy_term'));
+  $fields = field_read_fields(array('type' => 'term_reference'));
   foreach ($fields as $field_name => $field) {
 
     // Assemble an array of vocabulary IDs that are used in this field.