--- node_convert/node_convert.module.orig	2009-05-22 15:33:53.000000000 -0700
+++ node_convert/node_convert.module	2009-05-22 15:18:55.000000000 -0700
@@ -114,14 +114,14 @@
  */
 function node_convert_node_operations() {
   $operations = array();
-  $result = db_query("SELECT name, ctid FROM {node_convert_templates}");
+  $result = db_query("SELECT name, ncid FROM {node_convert_templates}");
   while ($row = db_fetch_array($result)) {
-    $access = node_convert_check_template_permission_user(array('template_id' => $row['ctid']));
+    $access = node_convert_check_template_permission_user(array('template_id' => $row['ncid']));
     if ($access) {
-      $operations['node_convert_'. $row['ctid']] = array(
+      $operations['node_convert_'. $row['ncid']] = array(
         'label' => 'Convert template: '. $row['name'],
         'callback' => 'node_convert_convert_nodes_using_template',
-        'callback arguments' => array($row['ctid']),
+        'callback arguments' => array($row['ncid']),
       );
     }
   }
@@ -442,7 +442,7 @@
     drupal_set_message("Template created succesufuly.");
 
     if ($form_state['storage']['create_action'] == 1) {
-      $template_id = db_last_insert_id('node_convert_templates', 'ctid');
+      $template_id = db_last_insert_id('node_convert_templates', 'ncid');
       actions_save('node_convert_convert_action', 'node', array('template' => $template_id), 'Convert '. $form_state['storage']['template_name'], NULL);
     }
     // We clear the storage so redirect works
@@ -470,9 +470,9 @@
   $output = '';
   $rows = array();
   $headers = array(t("Name"), t("Source type"), t("Dest type"), t("Delete"));
-  $result = db_query("SELECT * FROM {node_convert_templates} ORDER BY ctid");
+  $result = db_query("SELECT * FROM {node_convert_templates} ORDER BY ncid");
   while ($row = db_fetch_object($result)) {
-    $rows[$row->ctid] = array(l($row->name, 'admin/build/node_convert_templates/'. $row->ctid), $row->source_type, $row->destination_type, l(t("Delete"), 'admin/build/node_convert_templates/delete/'. $row->ctid));
+    $rows[$row->ncid] = array(l($row->name, 'admin/build/node_convert_templates/'. $row->ncid), $row->source_type, $row->destination_type, l(t("Delete"), 'admin/build/node_convert_templates/delete/'. $row->ncid));
   }
   $output = theme('table', $headers, $rows);
 
@@ -484,7 +484,7 @@
   $rows = array();
   $headers = array(t("Property"), t("Value"));
   $row = node_convert_load_template($template_id);
-  $rows[] = array(t("Template id"), $row['ctid']);
+  $rows[] = array(t("Template id"), $row['ncid']);
   $rows[] = array(t("Name"), $row['name']);
   $rows[] = array(t("Source type"), $row['source_type']);
   $rows[] = array(t("Destination type"), $row['destination_type']);
@@ -525,7 +525,7 @@
 
 function node_convert_template_delete_confirm_submit($form, &$form_state) {
   if ($form_state['values']['confirm']) {
-    db_query("DELETE FROM {node_convert_templates} WHERE ctid = %d", $form_state['values']['template_id']);
+    db_query("DELETE FROM {node_convert_templates} WHERE ncid = %d", $form_state['values']['template_id']);
     if ($form_state['values']['delete_action'] == 1) {
       db_query("DELETE FROM {actions} WHERE callback = 'node_convert_convert_action' AND parameters LIKE '%%template\";s:%%:\"%d%%'", $form_state['values']['template_id']);
     }
@@ -568,9 +568,9 @@
   $result = db_query("SELECT * FROM {node_convert_templates}");
   $templates = array(0 => 'none');
   while ($row = db_fetch_array($result)) {
-    $access = node_convert_check_template_permission_user(array('template_id' => $row['ctid']));
+    $access = node_convert_check_template_permission_user(array('template_id' => $row['ncid']));
     if ($access == TRUE)
-      $templates[$row['ctid']] = $row['name'];
+      $templates[$row['ncid']] = $row['name'];
   }
   if (isset($context['template'])) {
     $default_template = $context['template'];
@@ -878,7 +878,7 @@
  *    An array containing the template information or FALSE if there is no such template
  */
 function node_convert_load_template($template_id) {
-  $template = db_fetch_array(db_query("SELECT * FROM {node_convert_templates} WHERE ctid = %d", $template_id));
+  $template = db_fetch_array(db_query("SELECT * FROM {node_convert_templates} WHERE ncid = %d", $template_id));
   if (is_array($template)) {
     $template['data'] = unserialize($template['data']);
   }
--- node_convert/node_convert.install.orig	2009-05-22 15:33:40.000000000 -0700
+++ node_convert/node_convert.install	2009-05-22 15:59:16.000000000 -0700
@@ -11,12 +11,12 @@
 function node_convert_schema() {
   $schema['node_convert_templates'] = array(
     'fields' => array(
-         'ctid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+         'ncid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
          'name' => array('type' => 'text', 'size' => 'small'),
          'source_type' => array('type' => 'text', 'size' => 'small', 'not null' => FALSE),
          'destination_type' => array('type' => 'text', 'size' => 'small', 'not null' => TRUE),
          'data' => array('type' => 'text', 'size' => 'medium')),
-    'primary key' => array('ctid'),
+    'primary key' => array('ncid'),
   );
   return $schema;
 }
@@ -29,5 +29,5 @@
 function node_convert_uninstall() {
   // Drop my tables.
   drupal_uninstall_schema('node_convert');
-  db_query("DELETE FROM {actions} WHERE callback = 'node_convert_convert_action");
+  db_query("DELETE FROM {actions} WHERE callback = 'node_convert_convert_action'");
 }