diff --git a/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
index da0c8017e0..d89786a5c1 100644
--- a/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
+++ b/src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class PhabricatorCountdownDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'countdown.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/differential/capability/DifferentialDefaultViewCapability.php b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
index fa34df7f40..0ce774ab42 100644
--- a/src/applications/differential/capability/DifferentialDefaultViewCapability.php
+++ b/src/applications/differential/capability/DifferentialDefaultViewCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class DifferentialDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'differential.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
index 9c9fad4bbf..cc1df67d9b 100644
--- a/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
+++ b/src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class DiffusionCreateRepositoriesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create Repositories');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create new repositories.');
   }
 
 }
diff --git a/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
index f5e4e36a23..8246fd3cc1 100644
--- a/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultEditCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class DiffusionDefaultEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Edit Policy');
   }
 
 }
diff --git a/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
index edb7e65292..236a13ea1e 100644
--- a/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultPushCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class DiffusionDefaultPushCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.push';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Push Policy');
   }
 
 }
diff --git a/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
index b861f1455c..5de11739ce 100644
--- a/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
+++ b/src/applications/diffusion/capability/DiffusionDefaultViewCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class DiffusionDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/diffusion/capability/DiffusionPushCapability.php b/src/applications/diffusion/capability/DiffusionPushCapability.php
index 2f418cafd7..6e9625c786 100644
--- a/src/applications/diffusion/capability/DiffusionPushCapability.php
+++ b/src/applications/diffusion/capability/DiffusionPushCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class DiffusionPushCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.push';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Push');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to push to this repository.');
   }
 
 }
diff --git a/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
index 9b2a422f50..fa13b0e5bb 100644
--- a/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
+++ b/src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class DrydockCreateBlueprintsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.blueprint.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create Blueprints');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create Drydock blueprints.');
   }
 
 }
diff --git a/src/applications/drydock/capability/DrydockDefaultEditCapability.php b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
index b3421c49e1..4b431f653d 100644
--- a/src/applications/drydock/capability/DrydockDefaultEditCapability.php
+++ b/src/applications/drydock/capability/DrydockDefaultEditCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class DrydockDefaultEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Blueprint Edit Policy');
   }
 
 }
diff --git a/src/applications/drydock/capability/DrydockDefaultViewCapability.php b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
index a94f931ba8..af51edc38d 100644
--- a/src/applications/drydock/capability/DrydockDefaultViewCapability.php
+++ b/src/applications/drydock/capability/DrydockDefaultViewCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class DrydockDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Blueprint View Policy');
   }
 
 }
diff --git a/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
index b82dcbd2f8..a3134d61bd 100644
--- a/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
+++ b/src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php
@@ -1,21 +1,17 @@
 <?php
 
 final class HarbormasterManagePlansCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'harbormaster.plans';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Manage Build Plans');
   }
 
   public function describeCapabilityRejection() {
     return pht(
       'You do not have permission to manage Harbormaster build plans.');
   }
 
 }
diff --git a/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
index bed90d77d5..1f75c8ccd7 100644
--- a/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
+++ b/src/applications/herald/capability/HeraldManageGlobalRulesCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class HeraldManageGlobalRulesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'herald.global';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Manage Global Rules');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to manage global Herald rules.');
   }
 
 }
diff --git a/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
index 4924cfc283..046a4adcb3 100644
--- a/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
+++ b/src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class LegalpadCreateDocumentsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create Documents');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create new documents.');
   }
 
 }
diff --git a/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
index 435dfb576d..944c50879c 100644
--- a/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
+++ b/src/applications/legalpad/capability/LegalpadDefaultEditCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class LegalpadDefaultEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Edit Policy');
   }
 
 }
diff --git a/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
index 363a09fb9d..6bbdb56912 100644
--- a/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
+++ b/src/applications/legalpad/capability/LegalpadDefaultViewCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class LegalpadDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/macro/capability/PhabricatorMacroManageCapability.php b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
index 8c17c1385a..c01e3f8428 100644
--- a/src/applications/macro/capability/PhabricatorMacroManageCapability.php
+++ b/src/applications/macro/capability/PhabricatorMacroManageCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class PhabricatorMacroManageCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'macro.manage';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Manage Macros');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to manage image macros.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestBulkEditCapability.php b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
index 22584da110..47860eab23 100644
--- a/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
+++ b/src/applications/maniphest/capability/ManiphestBulkEditCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class ManiphestBulkEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.bulk';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Bulk Edit Tasks');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to bulk edit tasks.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
index 41b02838a2..82010f14c6 100644
--- a/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
+++ b/src/applications/maniphest/capability/ManiphestDefaultEditCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class ManiphestDefaultEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Edit Policy');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
index 50d7e2ca6d..a57ea10984 100644
--- a/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
+++ b/src/applications/maniphest/capability/ManiphestDefaultViewCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class ManiphestDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
index 8b46bb20d9..5da3adf55e 100644
--- a/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditAssignCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class ManiphestEditAssignCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.assign';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Assign Tasks');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to assign tasks.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
index ed8431bfb9..55dd37a91f 100644
--- a/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class ManiphestEditPoliciesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.policies';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Edit Task Policies');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to edit task policies.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
index 29f8543623..09da656f4c 100644
--- a/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditPriorityCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class ManiphestEditPriorityCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.priority';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Prioritize Tasks');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to prioritize tasks.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
index f35d1d4917..46367ae24b 100644
--- a/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditProjectsCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class ManiphestEditProjectsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.projects';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Edit Task Projects');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to edit task projects.');
   }
 
 }
diff --git a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
index 023a031f1e..171c2c77cb 100644
--- a/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
+++ b/src/applications/maniphest/capability/ManiphestEditStatusCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class ManiphestEditStatusCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.status';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Edit Task Status');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to edit task status.');
   }
 
 }
diff --git a/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
index 0c06fdad69..25597f52d3 100644
--- a/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php
@@ -1,16 +1,12 @@
 <?php
 
 final class NuanceSourceDefaultEditCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Source Edit Policy');
   }
 
 }
diff --git a/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
index 1f6a5500e9..450983d4b7 100644
--- a/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class NuanceSourceDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Source View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/nuance/capability/NuanceSourceManageCapability.php b/src/applications/nuance/capability/NuanceSourceManageCapability.php
index 44775479b2..e27387f2b4 100644
--- a/src/applications/nuance/capability/NuanceSourceManageCapability.php
+++ b/src/applications/nuance/capability/NuanceSourceManageCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class NuanceSourceManageCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.manage';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Manage Sources');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to manage sources.');
   }
 
 }
diff --git a/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
index 8e935dc881..a7935aed52 100644
--- a/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
+++ b/src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class PhabricatorOAuthServerCreateClientsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'oauthserver.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create OAuth Applications');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create OAuth applications.');
   }
 
 }
diff --git a/src/applications/paste/capability/PasteDefaultViewCapability.php b/src/applications/paste/capability/PasteDefaultViewCapability.php
index 471852c9af..bcafb5c065 100644
--- a/src/applications/paste/capability/PasteDefaultViewCapability.php
+++ b/src/applications/paste/capability/PasteDefaultViewCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class PasteDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'paste.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
index 955101e2c6..3a2225f36e 100644
--- a/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
+++ b/src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php
@@ -1,24 +1,20 @@
 <?php
 
 final class PeopleBrowseUserDirectoryCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'people.browse';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Browse User Directory');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to browse the user directory.');
   }
 
 }
diff --git a/src/applications/pholio/capability/PholioDefaultEditCapability.php b/src/applications/pholio/capability/PholioDefaultEditCapability.php
index 4eb6b1e143..11c91c5e8f 100644
--- a/src/applications/pholio/capability/PholioDefaultEditCapability.php
+++ b/src/applications/pholio/capability/PholioDefaultEditCapability.php
@@ -1,15 +1,11 @@
 <?php
 
 final class PholioDefaultEditCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'pholio.default.edit';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default Edit Policy');
   }
 
 }
diff --git a/src/applications/pholio/capability/PholioDefaultViewCapability.php b/src/applications/pholio/capability/PholioDefaultViewCapability.php
index efd50417df..815174a54f 100644
--- a/src/applications/pholio/capability/PholioDefaultViewCapability.php
+++ b/src/applications/pholio/capability/PholioDefaultViewCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class PholioDefaultViewCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'pholio.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/phragment/capability/PhragmentCanCreateCapability.php b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
index f166e78b63..c2739c5df1 100644
--- a/src/applications/phragment/capability/PhragmentCanCreateCapability.php
+++ b/src/applications/phragment/capability/PhragmentCanCreateCapability.php
@@ -1,19 +1,15 @@
 <?php
 
 final class PhragmentCanCreateCapability extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'phragment.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create Fragments');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create fragments.');
   }
 
 }
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
index aa5369c17b..94915917f1 100644
--- a/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php
@@ -1,18 +1,16 @@
 <?php
 
 final class PhabricatorPolicyCanEditCapability
   extends PhabricatorPolicyCapability {
 
-  public function getCapabilityKey() {
-    return self::CAN_EDIT;
-  }
+  const CAPABILITY = self::CAN_EDIT;
 
   public function getCapabilityName() {
     return pht('Can Edit');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to edit this object.');
   }
 
 }
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
index 480eabf4de..f00c93edc6 100644
--- a/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php
@@ -1,18 +1,16 @@
 <?php
 
 final class PhabricatorPolicyCanJoinCapability
   extends PhabricatorPolicyCapability {
 
-  public function getCapabilityKey() {
-    return self::CAN_JOIN;
-  }
+  const CAPABILITY = self::CAN_JOIN;
 
   public function getCapabilityName() {
     return pht('Can Join');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to join this object.');
   }
 
 }
diff --git a/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
index f23756931d..9890eac562 100644
--- a/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCanViewCapability.php
@@ -1,22 +1,20 @@
 <?php
 
 final class PhabricatorPolicyCanViewCapability
   extends PhabricatorPolicyCapability {
 
-  public function getCapabilityKey() {
-    return self::CAN_VIEW;
-  }
+  const CAPABILITY = self::CAN_VIEW;
 
   public function getCapabilityName() {
     return pht('Can View');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to view this object.');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }
diff --git a/src/applications/policy/capability/PhabricatorPolicyCapability.php b/src/applications/policy/capability/PhabricatorPolicyCapability.php
index 1cff309a64..346a6fb4e1 100644
--- a/src/applications/policy/capability/PhabricatorPolicyCapability.php
+++ b/src/applications/policy/capability/PhabricatorPolicyCapability.php
@@ -1,70 +1,90 @@
 <?php
 
 abstract class PhabricatorPolicyCapability extends Phobject {
 
   const CAN_VIEW        = 'view';
   const CAN_EDIT        = 'edit';
   const CAN_JOIN        = 'join';
 
   /**
    * Get the unique key identifying this capability. This key must be globally
    * unique. Application capabilities should be namespaced. For example:
    *
    *   application.create
    *
    * @return string Globally unique capability key.
    */
-  abstract public function getCapabilityKey();
+  final public function getCapabilityKey() {
+    $class = new ReflectionClass($this);
+
+    $const = $class->getConstant('CAPABILITY');
+    if ($const === false) {
+      throw new Exception(
+        pht(
+          'PolicyCapability class "%s" must define an CAPABILITY property.',
+          get_class($this)));
+    }
+
+    if (!is_string($const)) {
+      throw new Exception(
+        pht(
+          'PolicyCapability class "%s" has an invalid CAPABILITY '.
+          'property. Capability constants must be a string.',
+          get_class($this)));
+    }
+
+    return $const;
+  }
 
 
   /**
    * Return a human-readable descriptive name for this capability, like
    * "Can View".
    *
    * @return string Human-readable name describing the capability.
    */
   abstract public function getCapabilityName();
 
 
   /**
    * Return a human-readable string describing what not having this capability
    * prevents the user from doing. For example:
    *
    *   - You do not have permission to edit this object.
    *   - You do not have permission to create new tasks.
    *
    * @return string Human-readable name describing what failing a check for this
    *   capability prevents the user from doing.
    */
   public function describeCapabilityRejection() {
     return null;
   }
 
   /**
    * Can this capability be set to "public"? Broadly, this is only appropriate
    * for view and view-related policies.
    *
    * @return bool True to allow the "public" policy. Returns false by default.
    */
   public function shouldAllowPublicPolicySetting() {
     return false;
   }
 
   final public static function getCapabilityByKey($key) {
     return idx(self::getCapabilityMap(), $key);
   }
 
   final public static function getCapabilityMap() {
     static $map;
     if ($map === null) {
       $capabilities = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
 
       $map = mpull($capabilities, null, 'getCapabilityKey');
     }
 
     return $map;
   }
 
 }
diff --git a/src/applications/project/capability/ProjectCreateProjectsCapability.php b/src/applications/project/capability/ProjectCreateProjectsCapability.php
index 032d3735ee..f2cbc4e850 100644
--- a/src/applications/project/capability/ProjectCreateProjectsCapability.php
+++ b/src/applications/project/capability/ProjectCreateProjectsCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class ProjectCreateProjectsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'project.create';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Can Create Projects');
   }
 
   public function describeCapabilityRejection() {
     return pht('You do not have permission to create new projects.');
   }
 
 }
diff --git a/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
index ae5a49a627..7f433497e4 100644
--- a/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
+++ b/src/applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php
@@ -1,20 +1,16 @@
 <?php
 
 final class PhabricatorSlowvoteDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'slowvote.default.view';
 
-  public function getCapabilityKey() {
-    return self::CAPABILITY;
-  }
-
   public function getCapabilityName() {
     return pht('Default View Policy');
   }
 
   public function shouldAllowPublicPolicySetting() {
     return true;
   }
 
 }