diff --git a/modules/aggregator/views_handler_filter_aggregator_category_cid.inc b/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
index f9931c8..f3ef56e 100644
--- a/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
+++ b/modules/aggregator/views_handler_filter_aggregator_category_cid.inc
@@ -20,7 +20,7 @@ class views_handler_filter_aggregator_category_cid extends views_handler_filter_
 
     $result = db_query('SELECT * FROM {aggregator_category} ORDER BY title');
     foreach ($result as $category) {
-      $this->value_options[$category->cid] = $category->title;
+      $this->value_options[$category->id()] = $category->title;
     }
   }
 }
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index 65ef18c..c66edc8 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -647,7 +647,7 @@ function template_preprocess_views_view_row_comment(&$vars) {
   // Put the view on the node so we can retrieve it in the preprocess.
   $node->view = &$view;
 
-  $build = comment_view_multiple(array($comment->cid => $comment), $node, $plugin->options['view_mode']);
+  $build = comment_view_multiple(array($comment->id() => $comment), $node, $plugin->options['view_mode']);
   // If we're displaying the comments without links, remove them from the
   // renderable array. There is no way to avoid building them in the first
   // place (see comment_build_content()).
diff --git a/modules/comment/views_handler_field_comment_link.inc b/modules/comment/views_handler_field_comment_link.inc
index 162924e..a2a50f0 100644
--- a/modules/comment/views_handler_field_comment_link.inc
+++ b/modules/comment/views_handler_field_comment_link.inc
@@ -50,7 +50,7 @@ class views_handler_field_comment_link extends views_handler_field_entity {
     $text = !empty($this->options['text']) ? $this->options['text'] : t('view');
     $comment = $this->get_value($values);
     $nid = $comment->nid;
-    $cid = $comment->cid;
+    $cid = $comment->id();
 
     $this->options['alter']['make_link'] = TRUE;
     $this->options['alter']['html'] = TRUE;
diff --git a/modules/comment/views_handler_field_comment_link_edit.inc b/modules/comment/views_handler_field_comment_link_edit.inc
index 0b06c0e..bb24aa5 100644
--- a/modules/comment/views_handler_field_comment_link_edit.inc
+++ b/modules/comment/views_handler_field_comment_link_edit.inc
@@ -45,7 +45,7 @@ class views_handler_field_comment_link_edit extends views_handler_field_comment_
       $this->options['alter']['query'] = drupal_get_destination();
     }
 
-    $this->options['alter']['path'] = "comment/" . $comment->cid . "/edit";
+    $this->options['alter']['path'] = "comment/" . $comment->id() . "/edit";
 
     return $text;
   }
diff --git a/modules/comment/views_plugin_row_comment_rss.inc b/modules/comment/views_plugin_row_comment_rss.inc
index d287b8e..a0a1cce 100644
--- a/modules/comment/views_plugin_row_comment_rss.inc
+++ b/modules/comment/views_plugin_row_comment_rss.inc
@@ -43,7 +43,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
     $nids = array();
 
     foreach ($result as $row) {
-      $cids[] = $row->cid;
+      $cids[] = $row->id();
     }
 
     $this->comments = comment_load_multiple($cids);
@@ -111,7 +111,7 @@ class views_plugin_row_comment_rss extends views_plugin_row {
       ),
       array(
         'key' => 'guid',
-        'value' => 'comment ' . $comment->cid . ' at ' . $base_url,
+        'value' => 'comment ' . $comment->id() . ' at ' . $base_url,
         'attributes' => array('isPermaLink' => 'false'),
       ),
     );
@@ -138,10 +138,10 @@ class views_plugin_row_comment_rss extends views_plugin_row {
 
     $item = new stdClass();
     $item->description = $item_text;
-    $item->title = $comment->subject;
+    $item->title = $comment->label();
     $item->link = $comment->link;
     $item->elements = $comment->rss_elements;
-    $item->cid = $comment->cid;
+    $item->cid = $comment->id();
 
     return theme($this->theme_functions(), array(
       'view' => $this->view,
diff --git a/modules/comment/views_plugin_row_comment_view.inc b/modules/comment/views_plugin_row_comment_view.inc
index f78fa36..6005ef4 100644
--- a/modules/comment/views_plugin_row_comment_view.inc
+++ b/modules/comment/views_plugin_row_comment_view.inc
@@ -76,7 +76,7 @@ class views_plugin_row_comment_view extends views_plugin_row {
     $cids = array();
 
     foreach ($result as $row) {
-      $cids[] = $row->cid;
+      $cids[] = $row->id();
     }
 
     // Load all comments.
@@ -84,7 +84,7 @@ class views_plugin_row_comment_view extends views_plugin_row {
     $nids = array();
     foreach ($cresult as $comment) {
       $comment->depth = count(explode('.', $comment->thread)) - 1;
-      $this->comments[$comment->cid] = $comment;
+      $this->comments[$comment->id()] = $comment;
       $nids[] = $comment->nid;
     }