Index: issue.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/issue.inc,v
retrieving revision 1.354
diff -u -F '^f' -u -F '^f' -r1.354 issue.inc
--- issue.inc	18 Jun 2009 03:28:55 -0000	1.354
+++ issue.inc	18 Apr 2010 15:53:56 -0000
@@ -159,78 +159,78 @@ function project_issue_project_issue_ass
 // Support stuff
 
 /**
- * Return information about project issue state values.
+ * Return information about project issue status values.
  *
  * @param $sid
- *   Integer state id to return information about, or 0 for all states.
+ *   Integer status id to return information about, or 0 for all statuses.
  * @param $restrict
- *   Boolean to determine if states should be restricted based on the
+ *   Boolean to determine if statuses should be restricted based on the
  *   permissions of the current user or $account if that parameter
  *   is provided.
  * @param $is_author
  *   Boolean that indicates if the current user is the author of the
- *   issue, which can potentially grant a wider selection of states.
+ *   issue, which can potentially grant a wider selection of statuses.
  * @param $current_sid
- *   The current integer state id for the issue.
+ *   The current integer status id for the issue.
  * @param $defaults
- *   Boolean to request the states used for default issue queries.
+ *   Boolean to request the statuses used for default issue queries.
  * @param $account
  *   Account of a user to pass to user_access() for access checking.
  *   This parameter will have no effect unless $restrict is also
  *   set to TRUE.
  *
  * @return
- *   An array of states (sid as key, name as value) that match the
- *   given filters, or the name of the requested state.
- *   NOTE: The state name returned is raw text, and should be filtered via
+ *   An array of statuses (sid as key, name as value) that match the
+ *   given filters, or the name of the requested status.
+ *   NOTE: The status name returned is raw text, and should be filtered via
  *   check_plain() or filter_xss() before being printed as HTML output.
  */
-function project_issue_state($sid = 0, $restrict = false, $is_author = false, $current_sid = 0, $defaults = false, $account = NULL) {
+function project_issue_status($sid = 0, $restrict = false, $is_author = false, $current_sid = 0, $defaults = false, $account = NULL) {
   static $options;
 
   if (!$options) {
-    $result = db_query('SELECT * FROM {project_issue_state} ORDER BY weight');
-    while ($state = db_fetch_object($result)) {
-      $options[] = $state;
+    $result = db_query('SELECT * FROM {project_issue_status} ORDER BY weight');
+    while ($status = db_fetch_object($result)) {
+      $options[] = $status;
     }
   }
 
-  foreach($options as $state) {
+  foreach($options as $status) {
     if ($restrict) {
       // Check if user has access,
       // or if status is default status and therefore available to all,
       // or if user is original issue author and author has access,
-      // or if the issue is already in a state, even if the user doesn't have
-      //   access to that state themselves.
-      if (user_access('set issue status '. str_replace("'", "", $state->name), $account)
+      // or if the issue is already in a status, even if the user doesn't have
+      //   access to that status themselves.
+      if (user_access('set issue status '. str_replace("'", "", $status->name), $account)
           || user_access('administer projects', $account)
-          || ($state->sid == variable_get('project_issue_default_state', 1))
-          || ($state->author_has && $is_author)
-          || ($state->sid == $current_sid) ) {
-        $states[$state->sid] = $state->name;
+          || ($status->sid == variable_get('project_issue_default_status', 1))
+          || ($status->author_has && $is_author)
+          || ($status->sid == $current_sid) ) {
+        $statuses[$status->sid] = $status->name;
       }
     }
     else if ($defaults) {
-      if ($state->default_query) {
-        $states[$state->sid] = $state->name;
+      if ($status->default_query) {
+        $statuses[$status->sid] = $status->name;
       }
     }
     else {
-      $states[$state->sid] = $state->name;
+      $statuses[$status->sid] = $status->name;
     }
   }
 
-  return $sid ? $states[$sid] : $states;
+  return $sid ? $statuses[$sid] : $statuses;
 }
 
 /**
- * Return an array of state ids that should be used for default queries.
+ * Return an array of status ids that should be used for default queries.
  */
-function project_issue_default_states() {
+function project_issue_default_statuses() {
   static $defaults;
   if (empty($defaults)) {
-    $states = project_issue_state(0, false, false, 0, true);
-    $defaults = !empty($states) ? array_keys($states) : array(1, 2, 4);
+    $statuses = project_issue_status(0, false, false, 0, true);
+    $defaults = !empty($statuses) ? array_keys($statuses) : array(1, 2, 4);
   }
   return $defaults;
 }
@@ -251,12 +251,12 @@ function project_issue_category($categor
 }
 
 function project_issue_count($pid) {
-  $state = array();
+  $status = array();
   $result = db_query('SELECT p.sid, count(p.sid) AS count FROM {node} n INNER JOIN {project_issues} p ON n.nid = p.nid WHERE n.status = 1 AND p.pid = %d GROUP BY p.sid', $pid);
   while ($data = db_fetch_object($result)) {
-    $state[$data->sid] = $data->count;
+    $status[$data->sid] = $data->count;
   }
-  return $state;
+  return $status;
 }
 
 /**
@@ -344,7 +344,7 @@ function project_issue_change_summary($f
       $user = user_load(array('uid' => $value));
       return (int) $value === 0 ? variable_get('anonymous', t('Anonymous')) : $user->name;
     case 'sid':
-      return $value ? project_issue_state($value) : t('<none>');
+      return $value ? project_issue_status($value) : t('<none>');
     default:
       return $value;
   }
Index: project_issue.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.css,v
retrieving revision 1.26
diff -u -F '^f' -u -F '^f' -r1.26 project_issue.css
--- project_issue.css	18 Jun 2009 04:54:18 -0000	1.26
+++ project_issue.css	18 Apr 2010 15:53:56 -0000
@@ -97,7 +97,7 @@
 
 /* Issue query bar UI */
 .project-issue .quick-search #edit-projects,
-.project-issue .quick-search #edit-states {
+.project-issue .quick-search #edit-statuses {
   width: 150px;
 }
 
@@ -135,49 +135,49 @@
 }
 
 /* Coloring based on issue status (issue query results and [#12345] links). */
-.project-issue tr.state-1, .project-issue-status-1 a {
+.project-issue tr.status-1, .project-issue-status-1 a {
   background-color: #fff;
 }
-.project-issue tr.state-1 td.active {
+.project-issue tr.status-1 td.active {
   background-color: #e1e7eb;
 }
-.project-issue tr.state-2, .project-issue-status-2 a {
+.project-issue tr.status-2, .project-issue-status-2 a {
   background-color: #c0ffc0;
 }
-.project-issue tr.state-2 td.active {
+.project-issue tr.status-2 td.active {
   background-color: #cec;
 }
-.project-issue tr.state-3, .project-issue-status-3 a,
-.project-issue tr.state-4, .project-issue-status-4 a,
-.project-issue tr.state-5, .project-issue-status-5 a,
-.project-issue tr.state-6, .project-issue-status-6 a {
+.project-issue tr.status-3, .project-issue-status-3 a,
+.project-issue tr.status-4, .project-issue-status-4 a,
+.project-issue tr.status-5, .project-issue-status-5 a,
+.project-issue tr.status-6, .project-issue-status-6 a {
   background-color: #ddf;
 }
-.project-issue tr.state-3 td.active, .project-issue tr.state-4 td.active, .project-issue tr.state-5 td.active, .project-issue tr.state-6 td.active {
+.project-issue tr.status-3 td.active, .project-issue tr.status-4 td.active, .project-issue tr.status-5 td.active, .project-issue tr.status-6 td.active {
   background-color: #cce;
 }
-.project-issue tr.state-7, .project-issue-status-7 a {
+.project-issue tr.status-7, .project-issue-status-7 a {
   background-color: #ffc9c9;
 }
-.project-issue tr.state-7 td.active {
+.project-issue tr.status-7 td.active {
   background-color: #eeb9b9;
 }
-.project-issue tr.state-8, .project-issue-status-8 a {
+.project-issue tr.status-8, .project-issue-status-8 a {
   background-color: #ffd;
 }
-.project-issue tr.state-8 td.active {
+.project-issue tr.status-8 td.active {
   background-color: #eed;
 }
-.project-issue tr.state-13, .project-issue-status-13 a {
+.project-issue tr.status-13, .project-issue-status-13 a {
   background-color: #ffe7dd;
 }
-.project-issue tr.state-13 td.active {
+.project-issue tr.status-13 td.active {
   background-color: #eed7cc;
 }
-.project-issue tr.state-14, .project-issue-status-14 a {
+.project-issue tr.status-14, .project-issue-status-14 a {
   background-color: #e7ffdd;
 }
-.project-issue tr.state-14 td.active {
+.project-issue tr.status-14 td.active {
   background-color: #d7eecc;
 }
 
Index: project_issue.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.install,v
retrieving revision 1.64
diff -u -F '^f' -u -F '^f' -r1.64 project_issue.install
--- project_issue.install	21 Aug 2009 22:51:31 -0000	1.64
+++ project_issue.install	18 Apr 2010 15:53:56 -0000
@@ -60,7 +60,7 @@ function project_issue_schema() {
         'not null' => TRUE,
         'default' => '',
       ),
-      'mail_copy_filter_state' => array(
+      'mail_copy_filter_status' => array(
         'description' => 'A serialized array containing the statuses to include in the e-mail sent to {project_projects}.mail_copy.',
         'type' => 'varchar',
         'length' => 255,
@@ -132,7 +132,7 @@ function project_issue_schema() {
         'default' => 0,
       ),
       'sid' => array(
-        'description' => 'Current {project_issue_state}.sid of this issue.',
+        'description' => 'Current {project_issue_status}.sid of this issue.',
         'type' => 'int',
         'unsigned' => 1,
         'not null' => TRUE,
@@ -211,7 +211,7 @@ function project_issue_schema() {
         'default' => 0,
       ),
       'sid' => array(
-        'description' => 'The {project_issue_state}.sid of this issue after this comment was made.',
+        'description' => 'The {project_issue_status}.sid of this issue after this comment was made.',
         'type' => 'int',
         'not null' => TRUE,
         'default' => 0,
@@ -280,7 +280,7 @@ function project_issue_schema() {
     ),
   );
 
-  $schema['project_issue_state'] = array(
+  $schema['project_issue_status'] = array(
     'description' => 'Table that holds all possible values for issue statuses.',
     'fields' => array(
       'sid' => array(
@@ -327,28 +327,28 @@ function project_issue_schema() {
 function project_issue_install() {
   // We need to check this before we try to create the table, so that
   // if it already exists, we don't attempt to insert our own values.
-  $project_issue_state_existed = db_table_exists('project_issue_state');
+  $project_issue_status_existed = db_table_exists('project_issue_status');
 
   // Create tables.
   drupal_install_schema('project_issue');
 
-  if (!$project_issue_state_existed) {
+  if (!$project_issue_status_existed) {
     // sid, name, weight, author-can-set, in-default-queries
-    project_issue_init_state(1, 'active', -13, 0, 1);
-    project_issue_init_state(2, 'fixed', 1, 0, 1);
-    project_issue_init_state(3, 'duplicate', 4, 0, 0);
-    project_issue_init_state(4, 'postponed', 6, 0, 1);
-    project_issue_init_state(5, "won't fix", 9, 0, 0);
-    project_issue_init_state(6, 'by design', 11, 0, 0);
-    project_issue_init_state(7, 'closed', 13, 1, 0);
-    project_issue_init_state(8, 'needs review', -8, 0, 0);
-    project_issue_init_state(13, 'needs work', -6, 0, 0);
-    project_issue_init_state(14, 'ready to commit', -2, 0, 0);
+    project_issue_init_status(1, 'active', -13, 0, 1);
+    project_issue_init_status(2, 'fixed', 1, 0, 1);
+    project_issue_init_status(3, 'duplicate', 4, 0, 0);
+    project_issue_init_status(4, 'postponed', 6, 0, 1);
+    project_issue_init_status(5, "won't fix", 9, 0, 0);
+    project_issue_init_status(6, 'by design', 11, 0, 0);
+    project_issue_init_status(7, 'closed', 13, 1, 0);
+    project_issue_init_status(8, 'needs review', -8, 0, 0);
+    project_issue_init_status(13, 'needs work', -6, 0, 0);
+    project_issue_init_status(14, 'ready to commit', -2, 0, 0);
 
     // Since we're hacking in auto-increment values here,
     // update the sequence value for Postgres -- ugly but necessary for now.
     if ($GLOBALS['db_type'] == 'pgsql') {
-      db_query("SELECT setval('project_issue_state_sid_seq', 14)");
+      db_query("SELECT setval('project_issue_status_sid_seq', 14)");
     }
   }
 
@@ -374,7 +374,7 @@ function project_issue_uninstall() {
   drupal_uninstall_schema('project_issue');
 
   $variables = array(
-    'project_issue_default_state',
+    'project_issue_default_status',
     'project_directory_issues',
     'project_reply_to',
     'project_issue_digest_last',
@@ -398,10 +398,10 @@ function project_issue_enable() {
 }
 
 /**
- * Initialize a given issue state in the database.
+ * Initialize a given issue status in the database.
  */
-function project_issue_init_state($sid, $name, $weight, $author, $query) {
-  db_query("INSERT INTO {project_issue_state} (sid, name, weight, author_has, default_query) VALUES (%d, '%s', %d, %d, %d)", $sid, $name, $weight, $author, $query);
+function project_issue_init_status($sid, $name, $weight, $author, $query) {
+  db_query("INSERT INTO {project_issue_status} (sid, name, weight, author_has, default_query) VALUES (%d, '%s', %d, %d, %d)", $sid, $name, $weight, $author, $query);
 }
 
 /**
@@ -446,3 +446,17 @@ function project_issue_update_6002() {
   return $ret;
 }
 
+/**
+ * Rename related tables and variables in the state -> status cleanup.
+ */
+function project_issue_update_6003() {
+  $ret = array();
+  db_rename_table($ret, 'project_issue_state', 'project_issue_status');
+  $project_issue_default_state = variable_get('project_issue_default_state', NULL);
+  if (isset($project_issue_default_state)) {
+    variable_set('project_issue_default_status', $project_issue_default_state);
+  }
+  variable_del('project_issue_default_state');
+  return $ret;
+}
+
Index: project_issue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/project_issue.module,v
retrieving revision 1.178
diff -u -F '^f' -u -F '^f' -r1.178 project_issue.module
--- project_issue.module	8 Feb 2010 18:02:59 -0000	1.178
+++ project_issue.module	18 Apr 2010 15:53:58 -0000
@@ -6,9 +6,9 @@
 
 /// Default age in days of issues to auto close.
 define('PROJECT_ISSUE_AUTO_CLOSE_DAYS', 14);
-/// Project issue state = fixed.
+/// Project issue status = fixed.
 define('PROJECT_ISSUE_STATE_FIXED', 2);
-/// Project issue state = closed.
+/// Project issue status = closed.
 define('PROJECT_ISSUE_STATE_CLOSED', 7);
 
 /**
@@ -104,7 +104,7 @@ function project_issue_menu() {
     'title' => 'Project issue status options',
     'description' => 'Configure what issue status values should be used on your site.',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('project_issue_admin_states_form'),
+    'page arguments' => array('project_issue_admin_statuses_form'),
     'access arguments' => array('administer projects'),
     'type' => MENU_NORMAL_ITEM,
     'weight' => 1,
@@ -113,7 +113,7 @@ function project_issue_menu() {
   $items['admin/project/project-issue-status/delete'] = array(
     'title' => 'Delete',
     'page callback' => 'drupal_get_form',
-    'page arguments' => array('project_issue_delete_state_confirm', 4),
+    'page arguments' => array('project_issue_delete_status_confirm', 4),
     'access arguments' => array('administer projects'),
     'type' => MENU_CALLBACK,
     'file' => 'includes/admin.issue_status.inc'
@@ -317,7 +317,7 @@ function project_issue_theme() {
         'summary_links' => NULL,
       ),
     ),
-    'project_issue_admin_states_form' => array(
+    'project_issue_admin_statuses_form' => array(
       'file' => 'includes/admin.issue_status.inc',
       'arguments' => array(
         'form' => NULL,
@@ -487,8 +487,8 @@ function project_issue_perm() {
     'access own project issues',
     'assign and be assigned project issues',
   );
-  $states = project_issue_state();
-  foreach($states as $key => $value) {
+  $statuses = project_issue_status();
+  foreach($statuses as $key => $value) {
     $perms[] = "set issue status ". str_replace("'", "", $value);
   }
   return $perms;
@@ -918,8 +918,8 @@ function project_issue_my_projects_table
     ),
     array('data' => t('Issue links'), 'class' => 'project-issue-links'),
   );
-  $default_states = implode(',', project_issue_default_states());
-  $result = db_query(db_rewrite_sql("SELECT n.nid, n.title, COUNT(ni.nid) AS count, MAX(ni.changed) AS max_issue_changed FROM {node} n LEFT JOIN {project_issues} pi ON n.nid = pi.pid AND pi.sid IN ($default_states) LEFT JOIN {node} ni ON ni.nid = pi.nid AND ni.status = 1 WHERE n.type = 'project_project' AND n.status = 1 AND n.uid = %d GROUP BY n.nid, n.title") . tablesort_sql($header), $uid);
+  $default_statuses = implode(',', project_issue_default_statuses());
+  $result = db_query(db_rewrite_sql("SELECT n.nid, n.title, COUNT(ni.nid) AS count, MAX(ni.changed) AS max_issue_changed FROM {node} n LEFT JOIN {project_issues} pi ON n.nid = pi.pid AND pi.sid IN ($default_statuses) LEFT JOIN {node} ni ON ni.nid = pi.nid AND ni.status = 1 WHERE n.type = 'project_project' AND n.status = 1 AND n.uid = %d GROUP BY n.nid, n.title") . tablesort_sql($header), $uid);
 
   $any_admin = FALSE;
   $projects = array();
@@ -1118,11 +1118,11 @@ function theme_project_issue_issue_link(
     // We have an assigned user, but we're not going to print it next to the
     // issue link, so include it in title. l() runs $attributes through
     // drupal_attributes() which escapes the value.
-    $attributes = array('title' => t('Status: !status, Assigned to: !username', array('!status' => project_issue_state($node->project_issue['sid']), '!username' => $username)));
+    $attributes = array('title' => t('Status: !status, Assigned to: !username', array('!status' => project_issue_status($node->project_issue['sid']), '!username' => $username)));
   }
   else {
     // Just the status.
-    $attributes = array('title' => t('Status: !status', array('!status' => project_issue_state($node->project_issue['sid']))));
+    $attributes = array('title' => t('Status: !status', array('!status' => project_issue_status($node->project_issue['sid']))));
   }
 
   if (isset($comment_id)) {
@@ -1323,7 +1323,7 @@ function project_issue_token_values($typ
       $values['project_issue_category'] = project_issue_category($issue->category, FALSE);
       $values['project_issue_component'] = check_plain($issue->component);
       $values['project_issue_priority'] = project_issue_priority($issue->priority);
-      $values['project_issue_status'] = check_plain(project_issue_state($issue->sid));
+      $values['project_issue_status'] = check_plain(project_issue_status($issue->sid));
     }
     return $values;
   }
@@ -1526,7 +1526,7 @@ function project_issue_preprocess_views_
   $view = $variables['view'];
   if ($view->plugin_name == 'project_issue_table') {
     foreach ($view->result as $num => $result) {
-      $variables['row_classes'][$num][] = "state-$result->project_issues_sid";
+      $variables['row_classes'][$num][] = "status-$result->project_issues_sid";
       $variables['row_classes'][$num][] = "priority-$result->project_issues_priority";
     }
     $variables['class'] .= " project-issue";
Index: generate/project_issue_generate.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/generate/project_issue_generate.inc,v
retrieving revision 1.13
diff -u -F '^f' -u -F '^f' -r1.13 project_issue_generate.inc
--- generate/project_issue_generate.inc	21 Mar 2009 18:50:17 -0000	1.13
+++ generate/project_issue_generate.inc	18 Apr 2010 15:53:59 -0000
@@ -152,7 +152,7 @@ function project_issue_generate_issue_co
       $releases = project_release_get_releases($project_node, FALSE);
       $issues[$k]->rid = array_rand($releases);
     }
-    // Construct a comment to put the issue into the state we just decided.
+    // Construct a comment to put the issue into the status we just decided.
     $comment = array();
     $comment['uid'] = $account->uid;
     $comment['project_info'] = array('pid' => $issues[$k]->pid, 'component' => $issues[$k]->component, 'rid' => $issues[$k]->rid);
@@ -229,20 +229,20 @@ function _project_issue_generate_get_fie
 }
 
 function _project_issue_generate_get_permitted_sids($user) {
-  static $permitted_states;
+  static $permitted_statuses;
 
-  if (!isset($permitted_states)) {
-    $permitted_states = array();
+  if (!isset($permitted_statuses)) {
+    $permitted_statuses = array();
   }
 
   if (isset($user->uid)) {
-    if (isset($permitted_states[$user->uid])) {
-      return $permitted_states[$user->uid];
+    if (isset($permitted_statuses[$user->uid])) {
+      return $permitted_statuses[$user->uid];
     }
     else {
-      $states = project_issue_state($sid = 0, TRUE, TRUE, 0, FALSE, $user);
-      $permitted_states[$user->uid] = $states;
-      return $states;
+      $statuses = project_issue_status($sid = 0, TRUE, TRUE, 0, FALSE, $user);
+      $permitted_statuses[$user->uid] = $statuses;
+      return $statuses;
     }
   }
   return array();
Index: includes/admin.issue_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/admin.issue_status.inc,v
retrieving revision 1.1
diff -u -F '^f' -u -F '^f' -r1.1 admin.issue_status.inc
--- includes/admin.issue_status.inc	4 Apr 2009 07:03:28 -0000	1.1
+++ includes/admin.issue_status.inc	18 Apr 2010 15:53:59 -0000
@@ -6,7 +6,7 @@
  * Code for the issue status admin configuration form.
  */
 
-function theme_project_issue_admin_states_form($form) {
+function theme_project_issue_admin_statuses_form($form) {
   drupal_add_tabledrag('project-issue-status-admin-table', 'order', 'self', 'project-issue-status-weight');
   $header = array(
     array('data' => t('ID')),
@@ -26,7 +26,7 @@ function theme_project_issue_admin_state
         drupal_render($form['status'][$key]['weight']),
         drupal_render($form['status'][$key]['author_has']),
         drupal_render($form['status'][$key]['default_query']),
-        drupal_render($form['default_state'][$key]),
+        drupal_render($form['default_status'][$key]),
         drupal_render($form['delete'][$key]),
       ),
     );
@@ -47,47 +47,47 @@ function theme_project_issue_admin_state
   return $output;
 }
 
-function project_issue_admin_states_form(&$form_state) {
-  $result = db_query('SELECT * FROM {project_issue_state} ORDER BY weight');
-  $default_state = variable_get('project_issue_default_state', 1);
-  $default_states = project_issue_default_states();
+function project_issue_admin_statuses_form(&$form_state) {
+  $result = db_query('SELECT * FROM {project_issue_status} ORDER BY weight');
+  $default_status = variable_get('project_issue_default_status', 1);
+  $default_statuses = project_issue_default_statuses();
   $form['status']['#tree'] = TRUE;
-  while ($state = db_fetch_object($result)) {
-    $options[$state->sid] = '';
-    $form['status'][$state->sid]['sid'] = array(
+  while ($status = db_fetch_object($result)) {
+    $options[$status->sid] = '';
+    $form['status'][$status->sid]['sid'] = array(
       '#type' => 'markup',
-      '#value' => $state->sid,
+      '#value' => $status->sid,
     );
-    $form['status'][$state->sid]['name'] = array(
+    $form['status'][$status->sid]['name'] = array(
       '#type' => 'textfield',
-      '#default_value' => $state->name,
+      '#default_value' => $status->name,
       '#size' => 20,
       '#maxlength' => 255,
     );
-    $form['status'][$state->sid]['weight'] = array(
+    $form['status'][$status->sid]['weight'] = array(
       '#type' => 'weight',
-      '#default_value' => $state->weight,
+      '#default_value' => $status->weight,
       '#delta' => 15,
       '#attributes' => array('class' => 'project-issue-status-weight'),
     );
-    $form['status'][$state->sid]['author_has'] = array(
+    $form['status'][$status->sid]['author_has'] = array(
       '#type' => 'checkbox',
-      '#default_value' => $state->author_has,
+      '#default_value' => $status->author_has,
     );
-    $form['status'][$state->sid]['default_query'] = array(
+    $form['status'][$status->sid]['default_query'] = array(
       '#type' => 'checkbox',
-      '#default_value' => in_array($state->sid, $default_states),
+      '#default_value' => in_array($status->sid, $default_statuses),
     );
-    $del_link = ($state->sid != $default_state) ? l(t('Delete'), 'admin/project/project-issue-status/delete/'. $state->sid) : '';
-    $form['delete'][$state->sid] = array(
+    $del_link = ($status->sid != $default_status) ? l(t('Delete'), 'admin/project/project-issue-status/delete/'. $status->sid) : '';
+    $form['delete'][$status->sid] = array(
       '#type' => 'markup',
       '#value' => $del_link,
     );
   }
-  $form['default_state'] = array(
+  $form['default_status'] = array(
     '#type' => 'radios',
     '#options' => $options,
-    '#default_value' => $default_state,
+    '#default_value' => $default_status,
   );
   $form['status_add']['name'] = array(
     '#type' => 'textfield',
@@ -115,29 +115,29 @@ function project_issue_admin_states_form
 }
 
 /**
- * Submit handler for project_issue_admin_states_form.
+ * Submit handler for project_issue_admin_statuses_form.
  */
-function project_issue_admin_states_form_submit($form, &$form_state) {
+function project_issue_admin_statuses_form_submit($form, &$form_state) {
   // Check for and apply changes or additions to project issue status options.
-  if (isset($form_state['values']['default_state'])) {
-    variable_set('project_issue_default_state', $form_state['values']['default_state']);
+  if (isset($form_state['values']['default_status'])) {
+    variable_set('project_issue_default_status', $form_state['values']['default_status']);
   }
   // Update existing status options.
   if($form_state['values']['status']) {
     foreach ($form_state['values']['status'] as $sid => $value) {
-      $state = db_fetch_object(db_query('SELECT name, weight, author_has, default_query FROM {project_issue_state} WHERE sid = %d', $sid));
+      $status = db_fetch_object(db_query('SELECT name, weight, author_has, default_query FROM {project_issue_status} WHERE sid = %d', $sid));
       // Check to see whether the record needs updating.
-      if (($state->name != $value['name']) || ($state->weight != $value['weight']) || ($state->author_has != $value['author_has']) || ($state->default_query != $value['default_query'])) {
-        db_query("UPDATE {project_issue_state} SET name = '%s', weight = %d, author_has = %d, default_query = %d WHERE sid = %d", $value['name'], $value['weight'], $value['author_has'], $value['default_query'], $sid);
+      if (($status->name != $value['name']) || ($status->weight != $value['weight']) || ($status->author_has != $value['author_has']) || ($status->default_query != $value['default_query'])) {
+        db_query("UPDATE {project_issue_status} SET name = '%s', weight = %d, author_has = %d, default_query = %d WHERE sid = %d", $value['name'], $value['weight'], $value['author_has'], $value['default_query'], $sid);
       }
     }
   }
   // Add any new status options.
   if (isset($form_state['values']['status_add']) && !empty($form_state['values']['status_add']['name'])) {
-    // Check to see whether the state already exists:
-    $issue_state = db_result(db_query("SELECT COUNT(*) FROM {project_issue_state} WHERE name = '%s'", $form_state['values']['status_add']['name']));
-    if (empty($issue_state)) {
-      db_query("INSERT INTO {project_issue_state} (name, weight, author_has, default_query) VALUES ('%s', %d, %d, %d)", $form_state['values']['status_add']['name'], $form_state['values']['status_add']['weight'], $form_state['values']['status_add']['author_has'], $form_state['values']['status_add']['default_query']);
+    // Check to see whether the status already exists:
+    $issue_status = db_result(db_query("SELECT COUNT(*) FROM {project_issue_status} WHERE name = '%s'", $form_state['values']['status_add']['name']));
+    if (empty($issue_status)) {
+      db_query("INSERT INTO {project_issue_status} (name, weight, author_has, default_query) VALUES ('%s', %d, %d, %d)", $form_state['values']['status_add']['name'], $form_state['values']['status_add']['weight'], $form_state['values']['status_add']['author_has'], $form_state['values']['status_add']['default_query']);
     }
     else {
       drupal_set_message(t('Status %status already exists.', array ('%status' => $form_state['values']['status_add']['name'])), 'error');
@@ -145,9 +145,9 @@ function project_issue_admin_states_form
   }
 }
 
-function project_issue_delete_state_confirm(&$form_state, $sid) {
-  $states = project_issue_state();
-  $name = $states[$sid];
+function project_issue_delete_status_confirm(&$form_state, $sid) {
+  $statuses = project_issue_status();
+  $name = $statuses[$sid];
 
   $total = db_result(db_query('SELECT COUNT(nid) AS total FROM {project_issues} WHERE sid = %d', $sid));
   if ($total > 0) {
@@ -155,7 +155,7 @@ function project_issue_delete_state_conf
       '#type' => 'select',
       '#title' => t('Reassign status'),
       '#default_value' => $sid,
-      '#options' => $states,
+      '#options' => $statuses,
       '#description' => t('There are !total existing issues with the status of @name. Please select a new status for these issues.', array('!total' => $total, '@name' => $name)),
     );
   }
@@ -176,17 +176,17 @@ function project_issue_delete_state_conf
   );
 }
 
-function project_issue_delete_state_confirm_validate($form, &$form_state) {
+function project_issue_delete_status_confirm_validate($form, &$form_state) {
   if ($form_state['values']['new_sid'] == $form_state['values']['sid']) {
     form_set_error('new_sid', t('Choose a new issue status for existing issues of status %name.', array('%name' => $form_state['values']['name'])));
   }
 }
 
-function project_issue_delete_state_confirm_submit($form, &$form_state) {
+function project_issue_delete_status_confirm_submit($form, &$form_state) {
   if ($form_state['values']['new_sid']) {
     db_query('UPDATE {project_issues} SET sid = %d WHERE sid = %d', $form_state['values']['new_sid'], $form_state['values']['sid']);
   }
-  db_query('DELETE FROM {project_issue_state} WHERE sid = %d', $form_state['values']['sid']);
+  db_query('DELETE FROM {project_issue_status} WHERE sid = %d', $form_state['values']['sid']);
   drupal_set_message(t('Project issue status %issue deleted.', array('%issue' => $form_state['values']['name'])));
   $form_state['redirect'] ='admin/project/project-issue-status';
 }
Index: includes/admin.settings.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/admin.settings.inc,v
retrieving revision 1.2
diff -u -F '^f' -u -F '^f' -r1.2 admin.settings.inc
--- includes/admin.settings.inc	4 Apr 2009 06:30:21 -0000	1.2
+++ includes/admin.settings.inc	18 Apr 2010 15:53:59 -0000
@@ -57,7 +57,7 @@ function project_issue_settings_form(&$f
     '#default_value' => (int) variable_get('project_issue_auto_close_days', PROJECT_ISSUE_AUTO_CLOSE_DAYS),
     '#size' => 4,
     '#maxlength' => 10,
-    '#description' => t('Issues being in "fixed" state for the specified number of days will be closed by the followup user specified above. For example, if this is 14, and an issue is set to fixed on January 1, then it will be closed on January 15.'),
+    '#description' => t('Issues being in "fixed" status for the specified number of days will be closed by the followup user specified above. For example, if this is 14, and an issue is set to fixed on January 1, then it will be closed on January 15.'),
   );
   
   $defaults = array(t('Code'), t('Documentation'), t('Miscellaneous'), t('User interface'));
Index: includes/comment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/comment.inc,v
retrieving revision 1.157
diff -u -F '^f' -u -F '^f' -r1.157 comment.inc
--- includes/comment.inc	18 Feb 2010 00:19:27 -0000	1.157
+++ includes/comment.inc	18 Apr 2010 15:53:59 -0000
@@ -571,7 +571,7 @@ function project_issue_update_by_comment
   // the updates to the issue with the latest available published comment.
   $comment_data = project_issue_get_newest_comment($comment_data);
 
-  // Update the issue data to reflect the new final states.
+  // Update the issue data to reflect the new final metadata.
   db_query("UPDATE {project_issues} SET pid = %d, category = '%s', component = '%s', priority = %d, rid = %d, assigned = %d, sid = %d WHERE nid = %d", $comment_data->pid, $comment_data->category, $comment_data->component, $comment_data->priority, $comment_data->rid, $comment_data->assigned, $comment_data->sid, $comment_data->nid);
 
   // Update the issue title.
Index: includes/cron.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/cron.inc,v
retrieving revision 1.6
diff -u -F '^f' -u -F '^f' -r1.6 cron.inc
--- includes/cron.inc	21 Mar 2009 18:50:18 -0000	1.6
+++ includes/cron.inc	18 Apr 2010 15:53:59 -0000
@@ -104,7 +104,7 @@ function project_mail_reminder() {
         if ($node->assigned) {
           $body .= "  assigned: $node->assigned_name\n";
         }
-        $body .= '  state: '. project_issue_state($node->sid) ."\n";
+        $body .= '  status: '. project_issue_status($node->sid) ."\n";
         $body .= '  age: '. format_interval(time() - $node->created) ."\n";
         $body .= '  url: '. url("node/$node->nid", array('absolute' => TRUE)) ."\n";
         $body .= "\n";
Index: includes/issue_cockpit.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/issue_cockpit.inc,v
retrieving revision 1.6
diff -u -F '^f' -u -F '^f' -r1.6 issue_cockpit.inc
--- includes/issue_cockpit.inc	6 May 2009 23:43:34 -0000	1.6
+++ includes/issue_cockpit.inc	18 Apr 2010 15:53:59 -0000
@@ -41,7 +41,7 @@ function template_preprocess_project_iss
   $vars['make_issues'] = $has_issues && node_access('create', 'project_issue');
 
   if ($vars['view_issues']) {
-    $open_states = '('. implode(',', array_keys(project_issue_state(0, FALSE, FALSE, 0, TRUE))) .')';
+    $open_statuses = '('. implode(',', array_keys(project_issue_status(0, FALSE, FALSE, 0, TRUE))) .')';
 
     $vars['path'] = 'project/issues/'. $node->project['uri'];
     $vars['form'] = drupal_get_form('project_issue_issue_cockpit_searchbox', $node);
@@ -55,11 +55,11 @@ function template_preprocess_project_iss
     }
 
     if (isset($vars['categories']['All'])) {
-      $vars['categories']['All']['open'] = db_result(db_query(db_rewrite_sql('SELECT count(*) FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_states), $node->nid));
+      $vars['categories']['All']['open'] = db_result(db_query(db_rewrite_sql('SELECT count(*) FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_statuses), $node->nid));
       $vars['categories']['All']['total'] = db_result(db_query(db_rewrite_sql('SELECT count(*) FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d'), $node->nid));
     }
 
-    $result = db_query(db_rewrite_sql('SELECT count(*) AS open, i.category FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_states .' GROUP BY i.category'), $node->nid);
+    $result = db_query(db_rewrite_sql('SELECT count(*) AS open, i.category FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_statuses .' GROUP BY i.category'), $node->nid);
     while ($category = db_fetch_object($result)) {
       if (isset($vars['categories'][$category->category])) {
         $vars['categories'][$category->category]['open'] = $category->open;
@@ -75,7 +75,7 @@ function template_preprocess_project_iss
 
     $vars['issue_subscribe'] = l(t('Subscribe via e-mail'), 'project/issues/subscribe-mail/'. $node->project['uri'], array('query' => drupal_get_destination()));
     $vars['issue_statistics'] = l(t('Issue statistics'), 'project/issues/statistics/'. $node->project['uri']);
-    $vars['oldest'] = db_result(db_query(db_rewrite_sql('SELECT min(n.created) FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_states), $node->nid));
+    $vars['oldest'] = db_result(db_query(db_rewrite_sql('SELECT min(n.created) FROM {node} n INNER JOIN {project_issues} i ON n.nid = i.nid WHERE n.status = 1 AND i.pid = %d AND i.sid IN '. $open_statuses), $node->nid));
   }
 }
 
Index: includes/issue_node_form.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/issue_node_form.inc,v
retrieving revision 1.5
diff -u -F '^f' -u -F '^f' -r1.5 issue_node_form.inc
--- includes/issue_node_form.inc	8 Oct 2009 23:36:16 -0000	1.5
+++ includes/issue_node_form.inc	18 Apr 2010 15:53:59 -0000
@@ -134,7 +134,7 @@ function _project_issue_form($node, $for
     drupal_set_breadcrumb($breadcrumb);
   }
 
-  $default_state = variable_get('project_issue_default_state', 1);
+  $default_status = variable_get('project_issue_default_status', 1);
 
   // Fetch a list of all projects to test for access.
   $uris = NULL;
@@ -216,7 +216,7 @@ function _project_issue_form($node, $for
     }
     $categories = array_merge(array(t('<none>')), project_issue_category(0, 0));
     $priorities = project_issue_priority();
-    $states = project_issue_state(0, TRUE, !empty($node->nid) && ($node->uid == $user->uid), $node->project_issue['sid']);
+    $statuses = project_issue_status(0, TRUE, !empty($node->nid) && ($node->uid == $user->uid), $node->project_issue['sid']);
     $assigned = project_issue_assigned_choices($node);
   }
 
@@ -295,23 +295,23 @@ function _project_issue_form($node, $for
       '#default_value' => $node->project_issue['assigned'],
       '#options' => $assigned,
     );
-    if (count($states) > 1) {
+    if (count($statuses) > 1) {
       $form['issue_info']['sid'] = array(
         '#type' => 'select',
         '#title' => t('Status'),
-        '#default_value' => $node->project_issue['sid'] ? $node->project_issue['sid'] : $default_state,
-        '#options' => $states,
+        '#default_value' => $node->project_issue['sid'] ? $node->project_issue['sid'] : $default_status,
+        '#options' => $statuses,
       );
     }
     else {
       $form['issue_info']['sid'] = array(
         '#type' => 'value',
-        '#value' => $default_state,
+        '#value' => $default_status,
       );
       $form['issue_info']['status'] = array(
         '#type' => 'item',
         '#title' => t('Status'),
-        '#value' => check_plain(project_issue_state($default_state)),
+        '#value' => check_plain(project_issue_status($default_status)),
       );
     }
   }
@@ -450,12 +450,12 @@ function _project_issue_validate($node) 
  *   in $node, not in the $node->project_issue array.
  */
 function _project_issue_insert($node) {
-  // Permanently store the original issue states in a serialized array. This
-  // is a bit yucky, but we need them for proper handling of states workflow.
-  // The current states need to be stored in {project_issues} as well for
+  // Permanently store the original issue metadata in a serialized array. This
+  // is a bit yucky, but we need them for proper handling of metadata workflow.
+  // The current metadata needs to be stored in {project_issues} as well for
   // query efficiency in issue queue searches, and it seems too messy to add a
   // bunch of new columns to the {project_issues} table for the original
-  // states.
+  // metadata.
   $original_issue_data = new stdClass();
   $fields = array(
     'pid' => 0,
Index: includes/issue_node_view.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/issue_node_view.inc,v
retrieving revision 1.1
diff -u -F '^f' -u -F '^f' -r1.1 issue_node_view.inc
--- includes/issue_node_view.inc	18 Jun 2009 03:28:55 -0000	1.1
+++ includes/issue_node_view.inc	18 Apr 2010 15:53:59 -0000
@@ -53,7 +53,7 @@ function _project_issue_view($node, $tea
     );
     $current_data['sid'] = array(
       'label' => t('Status'),
-      'current' => project_issue_state($node->project_issue['sid']),
+      'current' => project_issue_status($node->project_issue['sid']),
     );
 
     // Allow modules to alter the metadata displayed in the table on the actual
Index: includes/mail.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/mail.inc,v
retrieving revision 1.125
diff -u -F '^f' -u -F '^f' -r1.125 mail.inc
--- includes/mail.inc	17 Apr 2010 22:04:49 -0000	1.125
+++ includes/mail.inc	18 Apr 2010 15:54:00 -0000
@@ -77,8 +77,8 @@ function _project_issue_mailhandler($nod
               }
               break;
             case 'sid':
-              if (($state = array_search($node->project_issue[$text], project_issue_state()))) {
-                $entry->project_issue['sid'] = $state;
+              if (($status = array_search($node->project_issue[$text], project_issue_status()))) {
+                $entry->project_issue['sid'] = $status;
               }
               break;
             case 'component':
@@ -93,7 +93,7 @@ function _project_issue_mailhandler($nod
       }
 
       if (empty($entry->nid)) {
-        $entry->sid = variable_get('project_issue_default_state', 1);
+        $entry->sid = variable_get('project_issue_default_status', 1);
         $entry->type = 'project_issue';
         $entry = node_validate($entry, $error);
         $error or ($entry->nid = node_save($entry));
@@ -314,7 +314,7 @@ function project_issue_mail_notify($nid)
     return;
   }
 
-  if (is_array($project->project_issue['mail_copy_filter_state']) && count(array_filter($project->project_issue['mail_copy_filter_state'])) && !$project->project_issue['mail_copy_filter_state'][$node->project_issue['sid']]) {
+  if (is_array($project->project_issue['mail_copy_filter_status']) && count(array_filter($project->project_issue['mail_copy_filter_status'])) && !$project->project_issue['mail_copy_filter_status'][$node->project_issue['sid']]) {
     return;
   }
 
Index: includes/project_edit_issues.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/project_edit_issues.inc,v
retrieving revision 1.3
diff -u -F '^f' -u -F '^f' -r1.3 project_edit_issues.inc
--- includes/project_edit_issues.inc	21 Aug 2009 21:58:23 -0000	1.3
+++ includes/project_edit_issues.inc	18 Apr 2010 15:54:00 -0000
@@ -170,19 +170,19 @@ function project_issue_project_edit_form
       '#default_value' => isset($node->project_issue['mail_copy_filter'][$key]) ? $node->project_issue['mail_copy_filter'][$key] : NULL,
     );
   }
-  $options = project_issue_state();
-  $form['email']['states'] = array(
+  $options = project_issue_status();
+  $form['email']['statuses'] = array(
     '#type' => 'item',
     '#title' => t('States'),
-    '#description' => t('Which issue states to e-mail. If none is checked all states will be posted.'),
+    '#description' => t('Which issue statuses to e-mail. If none are checked all statuses will be e-mailed.'),
   );
-  $form['email']['mail_copy_filter_state']['#tree'] = TRUE;
+  $form['email']['mail_copy_filter_status']['#tree'] = TRUE;
   foreach ($options as $key => $choice) {
-    $form['email']['mail_copy_filter_state'][$key] = array(
+    $form['email']['mail_copy_filter_status'][$key] = array(
       '#type' => 'checkbox',
       '#title' => check_plain($choice),
       '#return_value' => $key,
-      '#default_value' => isset($node->project_issue['mail_copy_filter_state'][$key]) ? $node->project_issue['mail_copy_filter_state'][$key] : NULL,
+      '#default_value' => isset($node->project_issue['mail_copy_filter_status'][$key]) ? $node->project_issue['mail_copy_filter_status'][$key] : NULL,
     );
   }
 
@@ -241,9 +241,9 @@ function project_issue_project_edit_form
   $components = serialize(array_keys($components));
   $default_component = !empty($form_state['values']['default_component']) ? $form_state['values']['default_component'] : '';
   $mail_copy_filter = serialize($form_state['values']['mail_copy_filter']);
-  $mail_copy_filter_state = serialize($form_state['values']['mail_copy_filter_state']);
+  $mail_copy_filter_status = serialize($form_state['values']['mail_copy_filter_status']);
 
-  db_query("UPDATE {project_issue_projects} SET issues = %d, components = '%s',default_component = '%s', mail_digest = '%s', mail_reminder = %d, mail_copy = '%s', mail_copy_filter = '%s', mail_copy_filter_state = '%s', help = '%s' WHERE nid = %d", $form_state['values']['issues'], $components, $default_component, $form_state['values']['mail_digest'], $form_state['values']['mail_reminder'], $form_state['values']['mail_copy'], $mail_copy_filter, $mail_copy_filter_state, $form_state['values']['help'], $form_state['values']['nid']);
+  db_query("UPDATE {project_issue_projects} SET issues = %d, components = '%s',default_component = '%s', mail_digest = '%s', mail_reminder = %d, mail_copy = '%s', mail_copy_filter = '%s', mail_copy_filter_status = '%s', help = '%s' WHERE nid = %d", $form_state['values']['issues'], $components, $default_component, $form_state['values']['mail_digest'], $form_state['values']['mail_reminder'], $form_state['values']['mail_copy'], $mail_copy_filter, $mail_copy_filter_status, $form_state['values']['help'], $form_state['values']['nid']);
   db_query("UPDATE {node} SET changed = %d WHERE nid = %d", time(), $form_state['values']['nid']);
   drupal_set_message(t('Issue settings have been saved.'));
 }
Index: includes/project_node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/project_node.inc,v
retrieving revision 1.1
diff -u -F '^f' -u -F '^f' -r1.1 project_node.inc
--- includes/project_node.inc	18 Jun 2009 03:30:22 -0000	1.1
+++ includes/project_node.inc	18 Apr 2010 15:54:00 -0000
@@ -32,7 +32,7 @@ function project_issue_project_load(&$no
   $node->project_issue['components'] = unserialize($project->components);
   $node->project_issue['default_component'] = $project->default_component;
   $node->project_issue['mail_copy_filter'] = unserialize($project->mail_copy_filter);
-  $node->project_issue['mail_copy_filter_state'] = unserialize($project->mail_copy_filter_state);
+  $node->project_issue['mail_copy_filter_status'] = unserialize($project->mail_copy_filter_status);
   foreach (array('issues', 'help', 'mail_digest', 'mail_copy', 'mail_reminder') as $field) {
     $node->project_issue[$field] = $project->$field;
   }
Index: includes/statistics.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/includes/statistics.inc,v
retrieving revision 1.1
diff -u -F '^f' -u -F '^f' -r1.1 statistics.inc
--- includes/statistics.inc	18 Jun 2009 03:24:03 -0000	1.1
+++ includes/statistics.inc	18 Apr 2010 15:54:00 -0000
@@ -5,7 +5,7 @@
  * Page callback for the issue statistics page.
  */
 function project_issue_statistics($project = NULL) {
-  $states = project_issue_state();
+  $statuses = project_issue_status();
   if ($project->nid) {
     $filter = sprintf(' AND p.pid = %d ', (int)$project->nid);
     project_project_set_breadcrumb($project, TRUE);
@@ -44,7 +44,7 @@ function project_issue_statistics($proje
   $total = db_result(db_query(db_rewrite_sql('SELECT COUNT(p.nid) AS total FROM {project_issues} p INNER JOIN {node} n ON n.nid = p.nid WHERE n.status = 1%s', 'p'), $filter));
   $result = db_query(db_rewrite_sql('SELECT COUNT(p.nid) AS total, p.sid FROM {project_issues} p INNER JOIN {node} n ON n.nid = p.nid WHERE n.status = 1%s GROUP BY p.sid', 'p'), $filter);
   while ($stat = db_fetch_object($result)) {
-    $rows[$stat->sid][0] = check_plain(project_issue_state($stat->sid));
+    $rows[$stat->sid][0] = check_plain(project_issue_status($stat->sid));
     $rows[$stat->sid][1] = array('data' => $stat->total, 'class' => 'project-issue-numeric');
     $rows[$stat->sid][2] = array('data' => number_format($stat->total / $total * 100) .'%', 'class' => 'project-issue-numeric-light');
     $rows[$stat->sid][3] = array('data' => '0', 'class' => 'project-issue-numeric');
@@ -64,7 +64,7 @@ function project_issue_statistics($proje
     // to build our own tablesorting mechanism.
     $header = array();
     $header['project'] = array('data' => t('Project'), 'field' => 'title');
-    foreach ($states as $key => $value) {
+    foreach ($statuses as $key => $value) {
       $header[$key] = array('data' => check_plain($value), 'field' => $key);
     }
     $header['total'] = array('data' => t('Total'), 'field' => 'total');
@@ -86,8 +86,8 @@ function project_issue_statistics($proje
           $where = '';
           break;
         default:
-          if ($state = array_search($_GET['order'], $states)) {
-            $args[] = $state;
+          if ($status = array_search($_GET['order'], $statuses)) {
+            $args[] = $status;
           }
           else {
             $args[] = 1;
@@ -103,7 +103,7 @@ function project_issue_statistics($proje
     $rows = array();
     $projects = pager_query(db_rewrite_sql("SELECT pn.nid, pn.title, COUNT(n.nid) AS total FROM {node} n INNER JOIN {project_issues} p ON n.nid = p.nid INNER JOIN {node} pn ON p.pid = pn.nid WHERE n.status = 1 AND pn.status = 1$where GROUP BY pn.nid, pn.title ORDER BY $column $sort"), 15, 0, db_rewrite_sql("SELECT COUNT(DISTINCT(n.nid)) FROM {node} n INNER JOIN {project_issues} p ON n.nid = p.pid INNER JOIN {node} pin ON p.nid = pin.nid WHERE n.status = 1 AND pin.status = 1$where"), $args);
     $orig = array('project' => array('data' => 0));
-    foreach ($states as $key => $value) {
+    foreach ($statuses as $key => $value) {
       $orig[$key] = array('data' => '', 'class' => 'project-issue-numeric');
     }
     $orig['total'] = array('data' => '', 'class' => 'project-issue-numeric');
Index: translations/project_issue.pot
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/translations/project_issue.pot,v
retrieving revision 1.1
diff -u -F '^f' -u -F '^f' -r1.1 project_issue.pot
--- translations/project_issue.pot	30 Jan 2009 07:20:27 -0000	1.1
+++ translations/project_issue.pot	18 Apr 2010 15:54:01 -0000
@@ -553,7 +553,7 @@
 msgstr ""
 
 #: project_issue.module:456
-msgid "Issues being in \"fixed\" state for the specified number of days will be closed by the followup user specified above. For example, if this is 14, and an issue is set to fixed on January 1, then it will be closed on January 15."
+msgid "Issues being in \"fixed\" status for the specified number of days will be closed by the followup user specified above. For example, if this is 14, and an issue is set to fixed on January 1, then it will be closed on January 15."
 msgstr ""
 
 #: project_issue.module:473
@@ -641,7 +641,7 @@
 msgstr ""
 
 #: project_issue.module:762
-msgid "Which issue states to e-mail. If none is checked all states will be posted."
+msgid "Which issue statuses to e-mail. If none is checked all statuses will be e-mailed."
 msgstr ""
 
 #: project_issue.module:777
@@ -957,7 +957,7 @@
 msgstr ""
 
 #: project_issue.install:128
-msgid "Current {project_issue_state}.sid of this issue."
+msgid "Current {project_issue_status}.sid of this issue."
 msgstr ""
 
 #: project_issue.install:135
@@ -1005,7 +1005,7 @@
 msgstr ""
 
 #: project_issue.install:207
-msgid "The {project_issue_state}.sid of this issue after this comment was made."
+msgid "The {project_issue_status}.sid of this issue after this comment was made."
 msgstr ""
 
 #: project_issue.install:213
Index: views/handlers/project_issue_handler_field_issue_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/views/handlers/project_issue_handler_field_issue_status.inc,v
retrieving revision 1.2
diff -u -F '^f' -u -F '^f' -r1.2 project_issue_handler_field_issue_status.inc
--- views/handlers/project_issue_handler_field_issue_status.inc	20 Jan 2009 18:38:04 -0000	1.2
+++ views/handlers/project_issue_handler_field_issue_status.inc	18 Apr 2010 15:54:01 -0000
@@ -8,7 +8,7 @@
 class project_issue_handler_field_issue_status extends views_handler_field {
   function render($values) {
     module_load_include('inc', 'project_issue', 'issue');
-    return check_plain(project_issue_state($values->{$this->field_alias}));
+    return check_plain(project_issue_status($values->{$this->field_alias}));
   }
 }
 
Index: views/handlers/project_issue_handler_filter_issue_status.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/project_issue/views/handlers/project_issue_handler_filter_issue_status.inc,v
retrieving revision 1.5
diff -u -F '^f' -u -F '^f' -r1.5 project_issue_handler_filter_issue_status.inc
--- views/handlers/project_issue_handler_filter_issue_status.inc	9 Apr 2009 18:32:58 -0000	1.5
+++ views/handlers/project_issue_handler_filter_issue_status.inc	18 Apr 2010 15:54:01 -0000
@@ -9,7 +9,7 @@
  * "open" issue status values as currently configured on the site.
  */
 class project_issue_handler_filter_issue_status extends views_handler_filter_in_operator {
-  var $open_states = array();
+  var $open_statuses = array();
 
   /**
    * Return the values to use for this filter.
@@ -19,17 +19,17 @@
    */
   function get_value_options() {
     module_load_include('inc', 'project_issue', 'issue');
-    $this->value_options = array('Open' => t('- Open issues -')) + project_issue_state();
+    $this->value_options = array('Open' => t('- Open issues -')) + project_issue_status();
   }
 
   /**
    * Cache and return an array of status integers for "open" issue statuses.
    */
-  function get_open_states() {
-    if (empty($open_states)) {
-      $open_states = array_keys(project_issue_state(0, FALSE, FALSE, 0, TRUE));
+  function get_open_statuses() {
+    if (empty($open_statuses)) {
+      $open_statuses = array_keys(project_issue_status(0, FALSE, FALSE, 0, TRUE));
     }
-    return $open_states;
+    return $open_statuses;
   }
 
   /**
@@ -42,7 +42,7 @@
     $values = array();
     foreach ($this->value as $key => $value) {
       if ($value == 'Open') {
-        $values += $this->get_open_states();
+        $values += $this->get_open_statuses();
       }
       else {
         $values[$key] = $value;