diff --git a/FeedsCommentProcessor.inc b/FeedsCommentProcessor.inc
index 68b222a..3daf1ae 100644
--- a/FeedsCommentProcessor.inc
+++ b/FeedsCommentProcessor.inc
@@ -43,7 +43,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
     $comment->name = '';
     $comment->mail = '';
     $comment->subject = '';
-    $comment->comment_body[$comment->language][0]['format'] = $this->config['input_format'];
 
     return $comment;
   }
@@ -192,7 +191,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
    */
   public function configDefaults() {
     $defaults = parent::configDefaults();
-    $defaults['input_format'] = filter_default_format();
     $defaults['expire'] = FEEDS_EXPIRE_NEVER;
     $defaults['author'] = 0;
     $defaults['authorize'] = TRUE;
@@ -206,6 +204,8 @@ class FeedsCommentProcessor extends FeedsProcessor {
   public function configForm(&$form_state) {
     $form = parent::configForm($form_state);
 
+    $form['input_format']['#access'] = FALSE;
+
     $form['bundle']['#title'] = t('Comment type');
 
     $author = user_load($this->config['author']);
@@ -264,10 +264,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
           ->fetchField();
         break;
 
-      case 'comment':
-        $target_comment->comment_body[$target_comment->language][0]['value'] = $value;
-        break;
-
       case 'created':
       case 'changed':
         $target_comment->$target_element = feeds_to_unixtime($value, REQUEST_TIME);
@@ -324,10 +320,6 @@ class FeedsCommentProcessor extends FeedsProcessor {
         'name' => t('Title'),
         'description' => t('The title of the comment.'),
       ),
-      'comment' => array(
-        'name' => t('Comment'),
-        'description' => t('The comment body.'),
-      ),
       'hostname' => array(
         'name' => t('Hostname'),
         'description' => t("The author's host name."),
diff --git a/feeds_comment_processor.install b/feeds_comment_processor.install
index 4b32aa7..5e1fafb 100644
--- a/feeds_comment_processor.install
+++ b/feeds_comment_processor.install
@@ -82,3 +82,54 @@ function feeds_comment_processor_update_7102() {
 function feeds_comment_processor_update_7103() {
   variable_del('feeds_comment_batch_size');
 }
+
+/**
+ * Rename 'comment' to 'comment_body' in mappings.
+ */
+function feeds_comment_processor_update_7104(array &$sandbox) {
+  // First pass.
+  if (!isset($sandbox['progress'])) {
+    $sandbox['importers'] = array_keys(feeds_importer_load_all(TRUE));
+    $sandbox['progress'] = 0;
+    $sandbox['updated_count'] = 0;
+    $sandbox['total'] = count($sandbox['importers']);
+  }
+
+  if (empty($sandbox['importers'])) {
+    return t('No importers to process.');
+  }
+
+  // Load a single importer.
+  $importer = array_pop($sandbox['importers']);
+  $importer = feeds_importer($importer);
+
+  if (get_class($importer->processor) === 'FeedsCommentProcessor') {
+    $mappings = $importer->processor->getMappings();
+
+    $config = $importer->processor->getConfig();
+    $format = !empty($config['input_format']) ? $config['input_format'] : filter_default_format();
+
+    foreach ($mappings as $key => $mapping) {
+      if ($mapping['target'] === 'comment') {
+        $mappings[$key]['target'] = 'comment_body';
+        $mappings[$key]['format'] = $format;
+      }
+    }
+
+    // If importer has changed, add the updated config and save it.
+    if ($importer->processor->getMappings() !== $mappings) {
+      $importer->processor->addConfig(array('mappings' => $mappings));
+      $importer->save();
+      $sandbox['updated_count']++;
+    }
+  }
+
+  $sandbox['progress']++;
+
+  if (empty($sandbox['importers'])) {
+    $sandbox['#finished'] = 1;
+    return t('@importers total importers processed, @updated_count with fields that were updated.', array('@importers' => $sandbox['total'], '@updated_count' => $sandbox['updated_count']));
+  }
+
+  $sandbox['#finished'] = $sandbox['progress'] / $sandbox['total'];
+}