2 files changed, 5 insertions, 5 deletions
diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index 7b486b493..ad3ede220 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -55,7 +55,7 @@ function comment_enable() {
     $field = array(
       'field_name' => 'comment_body',
       'type' => 'text_long',
-      'object_types' => array('comment'),
+      'entity_types' => array('comment'),
     );
     field_create_field($field);
   }
@@ -269,7 +269,7 @@ function comment_update_7012() {
   $field = array(
     'field_name' => 'comment_body',
     'type' => 'text_long',
-    'object_types' => array('comment'),
+    'entity_types' => array('comment'),
   );
   field_create_field($field);
 
@@ -277,7 +277,7 @@ function comment_update_7012() {
   $body_instance = array(
     'field_name' => 'comment_body',
     'label' => 'Comment',
-    'object_type' => 'comment',
+    'entity_type' => 'comment',
     'settings' => array('text_processing' => 1),
     // Hide field label by default.
     'display' => array(
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index c88ac3562..ab71b724b 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -100,7 +100,7 @@ function comment_entity_info() {
       'uri callback' => 'comment_uri',
       'fieldable' => TRUE,
       'controller class' => 'CommentController',
-      'object keys' => array(
+      'entity keys' => array(
         'id' => 'cid',
         'bundle' => 'node_type',
       ),
@@ -343,7 +343,7 @@ function _comment_body_field_instance_create($info) {
   $instance = array(
     'field_name' => 'comment_body',
     'label' => 'Comment',
-    'object_type' => 'comment',
+    'entity_type' => 'comment',
     'bundle' => 'comment_node_' . $info->type,
     'settings' => array('text_processing' => 1),
     'required' => TRUE,