--- nodecomment.module.orig	2009-06-23 15:52:19.000000000 -0700
+++ nodecomment.module	2009-07-06 21:14:36.000000000 -0700
@@ -235,9 +235,9 @@ function nodecomment_form_node_type_form
  */
 function nodecomment_comment_type_validate($form, &$form_state) {
   // If comments are enabled.
-  if ($form_state['values']['comment_type']) {
-    if (!$form_state['values']['comment_view']) {
-      form_set_error('comment_view', 'You must choose a comment view.');
+  if ($form_state['values']['node_comment_type']) {
+    if (!$form_state['values']['node_comment_view']) {
+      form_set_error('node_comment_view', 'You must choose a comment view.');
       return;
     }
     form_set_value($form['comment']['node_comment'], $form_state['values']['comment'], $form_state);
@@ -255,7 +255,7 @@ function nodecomment_comment_type_submit
 
   // Redirect to the conversion form if the comment type has been changed and
   // there are comments or nodes that need to be converted.
-  if ($form_state['values']['comment_type'] != $form_state['comment_type_orig']) {
+  if ($form_state['values']['node_comment_type'] != $form_state['comment_type_orig']) {
     if (nodecomment_convert_count($form_state['values']['type'], $form_state['comment_type_orig'])) {
       drupal_set_message(t('The changes made to the comment settings require updating existing comments. Use the comment conversion form to review these changes.'), 'warning');
       $form_state['redirect'] = 'admin/content/nodecomment-convert';