diff -u project.install project.install
--- project.install	14 Aug 2010 01:57:12 -0000
+++ project.install	16 Aug 2010 20:15:07 -0000
@@ -121,14 +121,14 @@
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_settings' => array(
+      'administer_settings' => array(
         'description' => t('Can this user edit the given project and modify its settings.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_maintainers' => array(
+      'administer_maintainers' => array(
         'description' => t('Can this user manipulate the maintainers for the given project.'),
         'type' => 'int',
         'unsigned' => TRUE,
@@ -194,14 +194,14 @@
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_settings' => array(
+      'administer_settings' => array(
         'description' => t('Can this user edit the given project and modify its settings.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_maintainers' => array(
+      'administer_maintainers' => array(
         'description' => t('Can this user manipulate the maintainers for the given project.'),
         'type' => 'int',
         'unsigned' => TRUE,
@@ -215,14 +215,14 @@
 
   // Initially populate the table so that every project owner has full
   // powers on their own projects.
-  $ret[] = update_sql("INSERT INTO {project_maintainer} (nid, uid, administer_project_settings, administer_project_maintainers) SELECT nid, uid, 1, 1 FROM {node} WHERE type = 'project_project'");
+  $ret[] = update_sql("INSERT INTO {project_maintainer} (nid, uid, administer_settings, administer_maintainers) SELECT nid, uid, 1, 1 FROM {node} WHERE type = 'project_project'");
 
   // If CVS module is enabled, also populate the table from the
   // {cvs_project_maintainers} table so that anyone with CVS access
   // who is not the project owner can administer the project but not
   // manipulate the per-project permissions.
   if (module_exists('cvs')) {
-    $ret[] = update_sql("INSERT INTO {project_maintainer} (nid, uid, administer_project_settings, administer_project_maintainers) SELECT cpm.nid, cpm.uid, 1, 0 FROM {cvs_project_maintainers} cpm INNER JOIN {node} n ON cpm.nid = n.nid WHERE cpm.uid != n.uid");
+    $ret[] = update_sql("INSERT INTO {project_maintainer} (nid, uid, administer_settings, administer_maintainers) SELECT cpm.nid, cpm.uid, 1, 0 FROM {cvs_project_maintainers} cpm INNER JOIN {node} n ON cpm.nid = n.nid WHERE cpm.uid != n.uid");
   }
 
   return $ret;
diff -u project.module project.module
--- project.module	14 Aug 2010 02:15:08 -0000
+++ project.module	16 Aug 2010 20:16:48 -0000
@@ -523,7 +523,7 @@
     'page callback' => 'drupal_get_form',
     'page arguments' => array('project_maintainers_form', 1),
     'access callback' => 'project_check_access',
-    'access arguments' => array(1, 'administer project maintainers'),
+    'access arguments' => array(1, 'administer maintainers'),
     'file' => 'includes/project_maintainers.inc',
     'type' => MENU_LOCAL_TASK,
     'weight' => 4,
@@ -532,7 +532,7 @@
     'page callback' => 'drupal_get_form',
     'page arguments' => array('project_maintainer_delete_confirm', 1, 4),
     'access callback' => 'project_check_access',
-    'access arguments' => array(1, 'administer project maintainers'),
+    'access arguments' => array(1, 'administer maintainers'),
     'file' => 'includes/project_maintainers.inc',
     'type' => MENU_CALLBACK,
   );
@@ -716,7 +716,7 @@
       if ($node->type == 'project_release') {
         $node = node_load($node->project_release['pid']);
       }
-      if (project_check_access($node, 'administer project settings')) {
+      if (project_check_access($node, 'administer settings')) {
         return TRUE;
       }
       if (!user_access('access projects')) {
@@ -736,7 +736,7 @@
       }
       break;
     case 'update':
-      if (project_check_access($node, 'administer project settings')) {
+      if (project_check_access($node, 'administer settings')) {
         return TRUE;
       }
       break;
@@ -772,12 +772,12 @@
  */
 function project_project_permission_info() {
   return array(
-    'administer project settings' => array(
-      'title' => t('Administer project settings'),
+    'administer settings' => array(
+      'title' => t('Administer settings'),
       'description' => t('Allows a user to edit a project and modify its settings.'),
     ),
-    'administer project maintainers' => array(
-      'title' => t('Administer project maintainers'),
+    'administer maintainers' => array(
+      'title' => t('Administer maintainers'),
       'description' => t('Allows a user to add and remove other project maintainers and to modify their permissions.'),
     ),
   );
@@ -804,10 +804,10 @@
  */
 function project_maintainer_save($nid, $uid, $permissions = array()) {
   // Try to update an existing record, if any.
-  db_query("UPDATE {project_maintainer} SET administer_project_settings = %d, administer_project_maintainers = %d WHERE nid = %d AND uid = %d", !empty($permissions['administer project settings']), !empty($permissions['administer project maintainers']), $nid, $uid);
+  db_query("UPDATE {project_maintainer} SET administer_settings = %d, administer_maintainers = %d WHERE nid = %d AND uid = %d", !empty($permissions['administer settings']), !empty($permissions['administer maintainers']), $nid, $uid);
   if (!db_affected_rows()) {
     // Didn't update anything, add this as a new maintainer, instead.
-    db_query("INSERT INTO {project_maintainer} (nid, uid, administer_project_settings, administer_project_maintainers) VALUES (%d, %d, %d, %d)", $nid, $uid, !empty($permissions['administer project settings']), !empty($permissions['administer project maintainers']));
+    db_query("INSERT INTO {project_maintainer} (nid, uid, administer_settings, administer_maintainers) VALUES (%d, %d, %d, %d)", $nid, $uid, !empty($permissions['administer settings']), !empty($permissions['administer maintainers']));
   }
 
   // Invoke hook_project_maintainer_save() to let other modules know this
diff -u release/project_release.install release/project_release.install
--- release/project_release.install	14 Aug 2010 00:53:02 -0000
+++ release/project_release.install	16 Aug 2010 20:19:46 -0000
@@ -369,7 +369,7 @@
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_releases' => array(
+      'administer_releases' => array(
         'description' => t('Can this user create and administer releases for the given project.'),
         'type' => 'int',
         'unsigned' => TRUE,
@@ -759,7 +759,7 @@
         'not null' => TRUE,
         'default' => 0,
       ),
-      'administer_project_releases' => array(
+      'administer_releases' => array(
         'description' => t('Can this user create and administer releases for the given project.'),
         'type' => 'int',
         'unsigned' => TRUE,
@@ -773,13 +773,13 @@
 
   // Initially populate the table so that every project owner has full
   // powers on their own projects.
-  $ret[] = update_sql("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_project_releases) SELECT nid, uid, 1 FROM {node} WHERE type = 'project_project'");
+  $ret[] = update_sql("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_releases) SELECT nid, uid, 1 FROM {node} WHERE type = 'project_project'");
 
   // If CVS module is enabled, also populate the table from the
   // {cvs_project_maintainers} table so that anyone with CVS access
   // who is not the project owner can administer releases.
   if (module_exists('cvs')) {
-    $ret[] = update_sql("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_project_releases) SELECT cpm.nid, cpm.uid, 1 FROM {cvs_project_maintainers} cpm INNER JOIN {node} n ON cpm.nid = n.nid WHERE cpm.uid != n.uid");
+    $ret[] = update_sql("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_releases) SELECT cpm.nid, cpm.uid, 1 FROM {cvs_project_maintainers} cpm INNER JOIN {node} n ON cpm.nid = n.nid WHERE cpm.uid != n.uid");
   }
 
   return $ret;
diff -u release/project_release.module release/project_release.module
--- release/project_release.module	14 Aug 2010 02:14:07 -0000
+++ release/project_release.module	16 Aug 2010 20:19:51 -0000
@@ -41,7 +41,7 @@
     'page callback' => 'project_release_project_edit_releases',
     'page arguments' => array(1),
     'access callback' => 'project_check_access',
-    'access arguments' => array(1, 'administer project releases'),
+    'access arguments' => array(1, 'administer releases'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'includes/project_edit_releases.inc',
   );
@@ -120,7 +120,7 @@
       // We can't just use project_project_access() here, since we
       // need to check access to the project itself, not the release
       // node, so we use the helper method and pass the project id.
-      return project_check_access($node->project_release['pid'], 'administer project releases');
+      return project_check_access($node->project_release['pid'], 'administer releases');
     case 'delete':
       // No one should ever delete a release node, only unpublish it.
       return FALSE;
@@ -146,8 +146,8 @@
  */
 function project_release_project_permission_info() {
   return array(
-    'administer project releases' => array(
-      'title' => t('Administer project releases'),
+    'administer releases' => array(
+      'title' => t('Administer releases'),
       'description' => t('Allows a user to create and update releases, and to control which branches are recommended or supported.'),
     ),
   );
@@ -157,10 +157,10 @@
  * Implement hook_project_maintainer_save()
  */
 function project_release_project_maintainer_save($nid, $uid, $permissions = array()) {
-  db_query("UPDATE {project_release_project_maintainer} SET administer_project_releases = %d WHERE nid = %d AND uid = %d", !empty($permissions['administer project releases']), $nid, $uid);
+  db_query("UPDATE {project_release_project_maintainer} SET administer_releases = %d WHERE nid = %d AND uid = %d", !empty($permissions['administer releases']), $nid, $uid);
   if (!db_affected_rows()) {
     // If we didn't have a record to update, add this as a new maintainer.
-    db_query("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_project_releases) VALUES (%d, %d, %d)", $nid, $uid, !empty($permissions['administer project releases']));
+    db_query("INSERT INTO {project_release_project_maintainer} (nid, uid, administer_releases) VALUES (%d, %d, %d)", $nid, $uid, !empty($permissions['administer releases']));
   }
 }
 
@@ -175,12 +175,12 @@
  * Implement hook_project_maintainer_project_load()
  */
 function project_release_project_maintainer_project_load($nid, &$maintainers) {
-  $query = db_query('SELECT u.uid, u.name, prpm.administer_project_releases FROM {project_release_project_maintainer} prpm INNER JOIN {users} u ON prpm.uid = u.uid WHERE prpm.nid = %d', $nid);
+  $query = db_query('SELECT u.uid, u.name, prpm.administer_releases FROM {project_release_project_maintainer} prpm INNER JOIN {users} u ON prpm.uid = u.uid WHERE prpm.nid = %d', $nid);
   while ($maintainer = db_fetch_object($query)) {
     if (empty($maintainers[$maintainer->uid])) {
       $maintainers[$maintainer->uid]['name'] = $maintainer->name;
     }
-    $maintainers[$maintainer->uid]['permissions']['administer project releases'] = $maintainer->administer_project_releases;
+    $maintainers[$maintainer->uid]['permissions']['administer releases'] = $maintainer->administer_releases;
   }
 }
 
@@ -652,7 +652,7 @@
   }
 
   // Display packaging errors to admins.
-  if (project_check_access($node->project_release['pid'], 'administer project releases')) {
+  if (project_check_access($node->project_release['pid'], 'administer releases')) {
     $rows = array();
     $result = db_query('SELECT * FROM {project_release_package_errors} WHERE nid = %d', $node->nid);
     $error = db_fetch_object($result);
@@ -733,7 +733,7 @@
   $where = '';
   $join = '';
   $args = array($project->nid);
-  if (!project_check_access($project, 'administer project releases')) {
+  if (!project_check_access($project, 'administer releases')) {
     if (!empty($rids)) {
       $where = "AND (n.status = %d OR n.nid IN (". db_placeholders($rids) ."))";
       $args[] = 1;
@@ -1273,7 +1273,7 @@
     ),
   );
 
-  if (project_check_access($node->nid, 'administer project releases')) {
+  if (project_check_access($node->nid, 'administer releases')) {
     $links['project_release']['links']['add_new_release'] = l(t('Add new release'), 'node/add/project_release/'. $node->nid);
     $links['project_release']['links']['administer_releases'] = l(t('Administer releases'), 'node/'. $node->nid .'/edit/releases');
   }
diff -u release/includes/release_node_form.inc release/includes/release_node_form.inc
--- release/includes/release_node_form.inc	14 Aug 2010 01:46:23 -0000
+++ release/includes/release_node_form.inc	16 Aug 2010 20:17:48 -0000
@@ -24,7 +24,7 @@
     }
     // Make sure this user should have permissions to add releases for
     // the requested project
-    if (!project_check_access($project, 'administer project releases')) {
+    if (!project_check_access($project, 'administer releases')) {
       drupal_access_denied();
       module_invoke_all('exit');
       exit;