Index: modules/field/field.info.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.info.inc,v
retrieving revision 1.15
diff -u -p -r1.15 field.info.inc
--- modules/field/field.info.inc	25 Aug 2009 21:53:47 -0000	1.15
+++ modules/field/field.info.inc	31 Aug 2009 00:22:41 -0000
@@ -150,7 +150,7 @@ function _field_info_collate_types($rese
           }
         }
       }
-      drupal_alter('fieldable_info', $info['fieldable types']);
+      drupal_alter('entity_info', $info['fieldable types']);
 
       cache_set('field_info_types', $info, 'cache_field');
     }
Index: modules/field/field.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.test,v
retrieving revision 1.46
diff -u -p -r1.46 field.test
--- modules/field/field.test	27 Aug 2009 04:40:12 -0000	1.46
+++ modules/field/field.test	31 Aug 2009 00:39:51 -0000
@@ -1941,7 +1941,7 @@ class FieldTranslationsTestCase extends 
     $this->assertTrue(count($available_languages) == 1 && $available_languages[0] === FIELD_LANGUAGE_NONE, t('Untranslatable entity: suggested language ignored.'));
 
     // Enable field translations for the entity.
-    field_test_fieldable_info_translatable('test_entity', TRUE);
+    field_test_entity_info_translatable('test_entity', TRUE);
 
     // Test hook_field_languages() invocation on a translatable field.
     $this->field['settings']['test_hook_in'] = TRUE;
@@ -2070,7 +2070,7 @@ class FieldTranslationsTestCase extends 
    */
   function testTranslatableFieldSaveLoad() {
     // Enable field translations for nodes.
-    field_test_fieldable_info_translatable('node', TRUE);
+    field_test_entity_info_translatable('node', TRUE);
     $obj_info = field_info_fieldable_types('node');
     $this->assertTrue(count($obj_info['translation_handlers']), t('Nodes are translatable.'));
 
Index: modules/simpletest/tests/field_test.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/field_test.module,v
retrieving revision 1.20
diff -u -p -r1.20 field_test.module
--- modules/simpletest/tests/field_test.module	28 Aug 2009 06:51:07 -0000	1.20
+++ modules/simpletest/tests/field_test.module	31 Aug 2009 00:40:12 -0000
@@ -90,11 +90,11 @@ function field_test_entity_info() {
 }
 
 /**
- * Implement hook_fieldable_info_alter().
+ * Implement hook_entity_info_alter().
  */
-function field_test_fieldable_info_alter(&$info) {
-  foreach (field_test_fieldable_info_translatable() as $obj_type => $translatable) {
-    $info[$obj_type]['translation_handlers']['field_test'] = TRUE;
+function field_test_entity_info_alter(&$entity_info) {
+  foreach (field_test_entity_info_translatable() as $obj_type => $translatable) {
+    $entity_info[$obj_type]['translation_handlers']['field_test'] = TRUE;
   }
 }
 
@@ -622,7 +622,7 @@ function field_test_field_languages($obj
 /**
  * Helper function to enable entity translations.
  */
-function field_test_fieldable_info_translatable($obj_type = NULL, $translatable = NULL) {
+function field_test_entity_info_translatable($obj_type = NULL, $translatable = NULL) {
   $stored_value = &drupal_static(__FUNCTION__, array());
   if (isset($obj_type) && isset($translatable)) {
     $stored_value[$obj_type] = $translatable;