diff -u project.test project.test
--- project.test	14 Aug 2010 02:01:34 -0000
+++ project.test	16 Aug 2010 20:34:04 -0000
@@ -392,10 +392,10 @@
     $this->assertLink(t('Maintainers'), 0, ('Maintainers tab is shown.'));
     $this->drupalGet("node/$project->nid/maintainers");
     $this->assertLink($this->owner->name, 0, ('Project owner is displayed on form.'));
-    $this->assertFieldDisabled("maintainers[{$this->owner->uid}][permissions][administer project settings]", 'Checkbox is disabled for project owner');
-    $this->assertFieldDisabled("maintainers[{$this->owner->uid}][permissions][administer project maintainers]", 'Checkbox is disabled for project owner');
-    $this->assertFieldCheckedByName("maintainers[{$this->owner->uid}][permissions][administer project settings]", 'Owners permissions are automatically granted');
-    $this->assertFieldCheckedByName("maintainers[{$this->owner->uid}][permissions][administer project maintainers]", 'Owners permissions are automatically granted');
+    $this->assertFieldDisabled("maintainers[{$this->owner->uid}][permissions][administer settings]", 'Checkbox is disabled for project owner');
+    $this->assertFieldDisabled("maintainers[{$this->owner->uid}][permissions][administer maintainers]", 'Checkbox is disabled for project owner');
+    $this->assertFieldCheckedByName("maintainers[{$this->owner->uid}][permissions][administer settings]", 'Owners permissions are automatically granted');
+    $this->assertFieldCheckedByName("maintainers[{$this->owner->uid}][permissions][administer maintainers]", 'Owners permissions are automatically granted');
     $this->assertNoRaw("node/$project->nid/maintainers/delete/{$this->owner->uid}", 'No delete link is displayed for the project owner.');
 
     // Try to delete the owner anyway and make sure it fails.
@@ -419,8 +419,8 @@
     $edit['new_maintainer[user]'] = $this->maintainer->name;
     $this->drupalPost("node/$project->nid/maintainers", $edit, t('Update'));
     $this->assertLink($this->maintainer->name, 0, 'New user is displayed on form correctly.');
-    $this->assertNoFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer project settings]", 'Permissions not explicitly granted.');
-    $this->assertNoFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer project maintainers]", 'Permissions not explicitly granted.');
+    $this->assertNoFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer settings]", 'Permissions not explicitly granted.');
+    $this->assertNoFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer maintainers]", 'Permissions not explicitly granted.');
     
     // Test validation for adding a duplicate maintainer
     $edit = array();
@@ -430,9 +430,9 @@
 
     // Add permissions to user
     $edit = array();
-    $edit["maintainers[{$this->maintainer->uid}][permissions][administer project settings]"] = TRUE;
+    $edit["maintainers[{$this->maintainer->uid}][permissions][administer settings]"] = TRUE;
     $this->drupalPost("node/$project->nid/maintainers", $edit, t('Update'));
-    $this->assertFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer project settings]", 'Permissions are displayed correctly on maintainers form.');
+    $this->assertFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer settings]", 'Permissions are displayed correctly on maintainers form.');
     // Login as maintainer and check access
     $this->drupalLogin($this->maintainer);
     $this->drupalGet("node/$project->nid/edit");
@@ -446,9 +446,9 @@
     $this->drupalLogin($this->owner);
     // Add permissions to user
     $edit = array();
-    $edit["maintainers[{$this->maintainer->uid}][permissions][administer project maintainers]"] = TRUE;
+    $edit["maintainers[{$this->maintainer->uid}][permissions][administer maintainers]"] = TRUE;
     $this->drupalPost("node/$project->nid/maintainers", $edit, t('Update'));
-    $this->assertFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer project maintainers]", 'Permissions are displayed correctly on maintainers form.');
+    $this->assertFieldCheckedByName("maintainers[{$this->maintainer->uid}][permissions][administer maintainers]", 'Permissions are displayed correctly on maintainers form.');
     // Login as maintainer and check access
     $this->drupalLogin($this->maintainer);
     $this->drupalGet("node/$project->nid/maintainers");