--- comment.inc.orig	2007-12-29 22:11:44.000000000 -0500
+++ comment.inc	2007-12-30 21:07:03.000000000 -0500
@@ -13,7 +13,7 @@ function project_comment_page($op, $nid)
     if ($_POST['op'] == t('Preview') || $_POST['op'] == t('Submit')) {
       project_comment_validate($edit);
     } else {
-      foreach (array('nid', 'type', 'pid', 'rid', 'category', 'component', 'priority', 'assigned', 'sid', 'title') as $var) {
+      foreach (array('nid', 'type', 'project_id', 'rid', 'category', 'component', 'priority', 'assigned', 'sid', 'title') as $var) {
         $edit->$var = $node->$var;
       }
       project_comment_validate($edit);
@@ -21,7 +21,7 @@ function project_comment_page($op, $nid)
     $output .= drupal_get_form('project_comment_form', $edit);
 
     // set breadcrumb
-    $project = node_load(array('nid' => $node->pid));
+    $project = node_load(array('nid' => $node->project_id));
     $breadcrumb[] = l($project->title, 'node/'. $project->nid);
     $breadcrumb[] = l(t('Issues'), 'project/issues/'. $project->uri);
     $breadcrumb[] = l($node->title, 'node/'. $node->nid);
@@ -147,7 +147,7 @@ function _project_comment_view_single($c
 
   $fields = array(
     'title' => t('Title'),
-    'pid' => t('Project'),
+    'project_id' => t('Project'),
     'rid' => t('Version'),
     'component' => t('Component'),
     'category' => t('Category'),
@@ -232,7 +232,7 @@ function project_comment_save($edit) {
     $node = node_load(array('nid' => $edit->nid, 'type' => 'project_issue'));
 
     // Check if comment changed any of the state values and update the node if necessary
-    foreach (array('pid', 'rid', 'category', 'component', 'priority', 'assigned', 'sid', 'title') as $var) {
+    foreach (array('project_id', 'rid', 'category', 'component', 'priority', 'assigned', 'sid', 'title') as $var) {
       if ($node->$var != $edit->$var) {
         $data['old']->$var = $node->$var;
         $data['new']->$var = $edit->$var;