#707724 follow-up by yched: More Field API/Entity API terminology clean-up.

3 files changed, 6 insertions, 6 deletions

diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 9d4cb4647..e50d8d4c6 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -790,7 +790,7 @@ function field_ui_existing_field_options($entity_type, $bundle) {
           // Don't show
           // - locked fields,
           // - fields already in the current bundle,
-          // - field that cannot be added to the object type.
+          // - field that cannot be added to the entity type.
           if (empty($field['locked'])
             && !field_info_instance($entity_type, $field['field_name'], $bundle)
             && (empty($field['object_types']) || in_array($entity_type, $field['object_types']))) {
diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module
index d9ee659a4..2f97a2512 100644
--- a/modules/field_ui/field_ui.module
+++ b/modules/field_ui/field_ui.module
@@ -35,7 +35,7 @@ function field_ui_help($path, $arg) {
 function field_ui_menu() {
   $items['admin/reports/fields'] = array(
     'title' => 'Field list',
-    'description' => 'Overview of fields on all object types.',
+    'description' => 'Overview of fields on all entity types.',
     'page callback' => 'field_ui_fields_list',
     'access arguments' => array('administer content types'),
     'type' => MENU_NORMAL_ITEM,
diff --git a/modules/field_ui/field_ui.test b/modules/field_ui/field_ui.test
index 624ddd3e5..01064652f 100644
--- a/modules/field_ui/field_ui.test
+++ b/modules/field_ui/field_ui.test
@@ -146,10 +146,10 @@ class FieldUITestCase extends DrupalWebTestCase {
     $this->drupalGet(('admin/structure/types/manage/page/fields'));
     $this->assertRaw(t('Add existing field'), t('"Add existing field" was found.'));
 
-    // Check that the list of options respects object type restrictions on
-    // fields. The 'comment' field is restricted to the 'comment' object type
+    // Check that the list of options respects entity type restrictions on
+    // fields. The 'comment' field is restricted to the 'comment' entity type
     // and should not appear in the list.
-    $this->assertFalse($this->xpath('//select[@id="edit--add-existing-field-field-name"]//option[@value="comment"]'), t('The list of options respects object type restrictions.'));
+    $this->assertFalse($this->xpath('//select[@id="edit--add-existing-field-field-name"]//option[@value="comment"]'), t('The list of options respects entity type restrictions.'));
 
     // Add a new field based on an existing field.
     $edit = array(
@@ -206,7 +206,7 @@ class FieldUITestCase extends DrupalWebTestCase {
    * @param $string
    *   The settings text.
    * @param $entity_type
-   *   The object type for the instance.
+   *   The entity type for the instance.
    */
   function assertFieldSettings($bundle, $field_name, $string = 'dummy test string', $entity_type = 'node') {
     // Reset the fields info.