Rename policy capabilities

Summary: Ref T5655. Rename `PhabricatorPolicyCapability` subclasses for consistency.

Test Plan: Browsed a few applications, nothing seemed broken.

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin, hach-que

Maniphest Tasks: T5655

Differential Revision: https://secure.phabricator.com/D10037

src/__phutil_library_map__.php

@@ -335,7 +335,6 @@ phutil_register_library_map(array(
     'DifferentialAuthorField' => 'applications/differential/customfield/DifferentialAuthorField.php',
     'DifferentialBlameRevisionField' => 'applications/differential/customfield/DifferentialBlameRevisionField.php',
     'DifferentialBranchField' => 'applications/differential/customfield/DifferentialBranchField.php',
-    'DifferentialCapabilityDefaultView' => 'applications/differential/capability/DifferentialCapabilityDefaultView.php',
     'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
     'DifferentialChangesSinceLastUpdateField' => 'applications/differential/customfield/DifferentialChangesSinceLastUpdateField.php',
     'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
@@ -370,6 +369,7 @@ phutil_register_library_map(array(
     'DifferentialCustomFieldStorage' => 'applications/differential/storage/DifferentialCustomFieldStorage.php',
     'DifferentialCustomFieldStringIndex' => 'applications/differential/storage/DifferentialCustomFieldStringIndex.php',
     'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
+    'DifferentialDefaultViewCapability' => 'applications/differential/capability/DifferentialDefaultViewCapability.php',
     'DifferentialDependenciesField' => 'applications/differential/customfield/DifferentialDependenciesField.php',
     'DifferentialDependsOnField' => 'applications/differential/customfield/DifferentialDependsOnField.php',
     'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
@@ -475,11 +475,6 @@ phutil_register_library_map(array(
     'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
     'DiffusionBrowseSearchController' => 'applications/diffusion/controller/DiffusionBrowseSearchController.php',
     'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
-    'DiffusionCapabilityCreateRepositories' => 'applications/diffusion/capability/DiffusionCapabilityCreateRepositories.php',
-    'DiffusionCapabilityDefaultEdit' => 'applications/diffusion/capability/DiffusionCapabilityDefaultEdit.php',
-    'DiffusionCapabilityDefaultPush' => 'applications/diffusion/capability/DiffusionCapabilityDefaultPush.php',
-    'DiffusionCapabilityDefaultView' => 'applications/diffusion/capability/DiffusionCapabilityDefaultView.php',
-    'DiffusionCapabilityPush' => 'applications/diffusion/capability/DiffusionCapabilityPush.php',
     'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
     'DiffusionCommentListView' => 'applications/diffusion/view/DiffusionCommentListView.php',
     'DiffusionCommentView' => 'applications/diffusion/view/DiffusionCommentView.php',
@@ -496,6 +491,10 @@ phutil_register_library_map(array(
     'DiffusionCommitRemarkupRule' => 'applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php',
     'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php',
     'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
+    'DiffusionCreateRepositoriesCapability' => 'applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php',
+    'DiffusionDefaultEditCapability' => 'applications/diffusion/capability/DiffusionDefaultEditCapability.php',
+    'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php',
+    'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php',
     'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
     'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
     'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
@@ -541,6 +540,7 @@ phutil_register_library_map(array(
     'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php',
     'DiffusionPathTreeController' => 'applications/diffusion/controller/DiffusionPathTreeController.php',
     'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
+    'DiffusionPushCapability' => 'applications/diffusion/capability/DiffusionPushCapability.php',
     'DiffusionPushEventViewController' => 'applications/diffusion/controller/DiffusionPushEventViewController.php',
     'DiffusionPushLogController' => 'applications/diffusion/controller/DiffusionPushLogController.php',
     'DiffusionPushLogListController' => 'applications/diffusion/controller/DiffusionPushLogListController.php',
@@ -670,14 +670,14 @@ phutil_register_library_map(array(
     'DrydockBlueprintTransaction' => 'applications/drydock/storage/DrydockBlueprintTransaction.php',
     'DrydockBlueprintTransactionQuery' => 'applications/drydock/query/DrydockBlueprintTransactionQuery.php',
     'DrydockBlueprintViewController' => 'applications/drydock/controller/DrydockBlueprintViewController.php',
-    'DrydockCapabilityCreateBlueprints' => 'applications/drydock/capability/DrydockCapabilityCreateBlueprints.php',
-    'DrydockCapabilityDefaultEdit' => 'applications/drydock/capability/DrydockCapabilityDefaultEdit.php',
-    'DrydockCapabilityDefaultView' => 'applications/drydock/capability/DrydockCapabilityDefaultView.php',
     'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
     'DrydockConsoleController' => 'applications/drydock/controller/DrydockConsoleController.php',
     'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
     'DrydockController' => 'applications/drydock/controller/DrydockController.php',
+    'DrydockCreateBlueprintsCapability' => 'applications/drydock/capability/DrydockCreateBlueprintsCapability.php',
     'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
+    'DrydockDefaultEditCapability' => 'applications/drydock/capability/DrydockDefaultEditCapability.php',
+    'DrydockDefaultViewCapability' => 'applications/drydock/capability/DrydockDefaultViewCapability.php',
     'DrydockFilesystemInterface' => 'applications/drydock/interface/filesystem/DrydockFilesystemInterface.php',
     'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php',
     'DrydockLease' => 'applications/drydock/storage/DrydockLease.php',
@@ -778,12 +778,12 @@ phutil_register_library_map(array(
     'HarbormasterBuildableTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildableTransactionEditor.php',
     'HarbormasterBuildableTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildableTransactionQuery.php',
     'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
-    'HarbormasterCapabilityManagePlans' => 'applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php',
     'HarbormasterCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php',
     'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
     'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
     'HarbormasterHTTPRequestBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php',
     'HarbormasterLeaseHostBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterLeaseHostBuildStepImplementation.php',
+    'HarbormasterManagePlansCapability' => 'applications/harbormaster/capability/HarbormasterManagePlansCapability.php',
     'HarbormasterManagementBuildWorkflow' => 'applications/harbormaster/management/HarbormasterManagementBuildWorkflow.php',
     'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
     'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
@@ -811,7 +811,6 @@ phutil_register_library_map(array(
     'HeraldAction' => 'applications/herald/storage/HeraldAction.php',
     'HeraldAdapter' => 'applications/herald/adapter/HeraldAdapter.php',
     'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
-    'HeraldCapabilityManageGlobalRules' => 'applications/herald/capability/HeraldCapabilityManageGlobalRules.php',
     'HeraldCommitAdapter' => 'applications/herald/adapter/HeraldCommitAdapter.php',
     'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
     'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
@@ -826,6 +825,7 @@ phutil_register_library_map(array(
     'HeraldInvalidActionException' => 'applications/herald/engine/exception/HeraldInvalidActionException.php',
     'HeraldInvalidConditionException' => 'applications/herald/engine/exception/HeraldInvalidConditionException.php',
     'HeraldInvalidFieldException' => 'applications/herald/engine/exception/HeraldInvalidFieldException.php',
+    'HeraldManageGlobalRulesCapability' => 'applications/herald/capability/HeraldManageGlobalRulesCapability.php',
     'HeraldManiphestTaskAdapter' => 'applications/herald/adapter/HeraldManiphestTaskAdapter.php',
     'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
     'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
@@ -865,12 +865,12 @@ phutil_register_library_map(array(
     'JavelinUIExample' => 'applications/uiexample/examples/JavelinUIExample.php',
     'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php',
     'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php',
-    'LegalpadCapabilityCreateDocuments' => 'applications/legalpad/capability/LegalpadCapabilityCreateDocuments.php',
-    'LegalpadCapabilityDefaultEdit' => 'applications/legalpad/capability/LegalpadCapabilityDefaultEdit.php',
-    'LegalpadCapabilityDefaultView' => 'applications/legalpad/capability/LegalpadCapabilityDefaultView.php',
     'LegalpadConstants' => 'applications/legalpad/constants/LegalpadConstants.php',
     'LegalpadController' => 'applications/legalpad/controller/LegalpadController.php',
+    'LegalpadCreateDocumentsCapability' => 'applications/legalpad/capability/LegalpadCreateDocumentsCapability.php',
     'LegalpadDAO' => 'applications/legalpad/storage/LegalpadDAO.php',
+    'LegalpadDefaultEditCapability' => 'applications/legalpad/capability/LegalpadDefaultEditCapability.php',
+    'LegalpadDefaultViewCapability' => 'applications/legalpad/capability/LegalpadDefaultViewCapability.php',
     'LegalpadDocument' => 'applications/legalpad/storage/LegalpadDocument.php',
     'LegalpadDocumentBody' => 'applications/legalpad/storage/LegalpadDocumentBody.php',
     'LegalpadDocumentCommentController' => 'applications/legalpad/controller/LegalpadDocumentCommentController.php',
@@ -911,14 +911,7 @@ phutil_register_library_map(array(
     'LiskRawMigrationIterator' => 'infrastructure/storage/lisk/LiskRawMigrationIterator.php',
     'ManiphestActionMenuEventListener' => 'applications/maniphest/event/ManiphestActionMenuEventListener.php',
     'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
-    'ManiphestCapabilityBulkEdit' => 'applications/maniphest/capability/ManiphestCapabilityBulkEdit.php',
+    'ManiphestBulkEditCapability' => 'applications/maniphest/capability/ManiphestBulkEditCapability.php',
-    'ManiphestCapabilityDefaultEdit' => 'applications/maniphest/capability/ManiphestCapabilityDefaultEdit.php',
-    'ManiphestCapabilityDefaultView' => 'applications/maniphest/capability/ManiphestCapabilityDefaultView.php',
-    'ManiphestCapabilityEditAssign' => 'applications/maniphest/capability/ManiphestCapabilityEditAssign.php',
-    'ManiphestCapabilityEditPolicies' => 'applications/maniphest/capability/ManiphestCapabilityEditPolicies.php',
-    'ManiphestCapabilityEditPriority' => 'applications/maniphest/capability/ManiphestCapabilityEditPriority.php',
-    'ManiphestCapabilityEditProjects' => 'applications/maniphest/capability/ManiphestCapabilityEditProjects.php',
-    'ManiphestCapabilityEditStatus' => 'applications/maniphest/capability/ManiphestCapabilityEditStatus.php',
     'ManiphestConfiguredCustomField' => 'applications/maniphest/field/ManiphestConfiguredCustomField.php',
     'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
     'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
@@ -930,6 +923,13 @@ phutil_register_library_map(array(
     'ManiphestCustomFieldStorage' => 'applications/maniphest/storage/ManiphestCustomFieldStorage.php',
     'ManiphestCustomFieldStringIndex' => 'applications/maniphest/storage/ManiphestCustomFieldStringIndex.php',
     'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
+    'ManiphestDefaultEditCapability' => 'applications/maniphest/capability/ManiphestDefaultEditCapability.php',
+    'ManiphestDefaultViewCapability' => 'applications/maniphest/capability/ManiphestDefaultViewCapability.php',
+    'ManiphestEditAssignCapability' => 'applications/maniphest/capability/ManiphestEditAssignCapability.php',
+    'ManiphestEditPoliciesCapability' => 'applications/maniphest/capability/ManiphestEditPoliciesCapability.php',
+    'ManiphestEditPriorityCapability' => 'applications/maniphest/capability/ManiphestEditPriorityCapability.php',
+    'ManiphestEditProjectsCapability' => 'applications/maniphest/capability/ManiphestEditProjectsCapability.php',
+    'ManiphestEditStatusCapability' => 'applications/maniphest/capability/ManiphestEditStatusCapability.php',
     'ManiphestExcelDefaultFormat' => 'applications/maniphest/export/ManiphestExcelDefaultFormat.php',
     'ManiphestExcelFormat' => 'applications/maniphest/export/ManiphestExcelFormat.php',
     'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
@@ -974,9 +974,6 @@ phutil_register_library_map(array(
     'MetaMTAMailSentGarbageCollector' => 'applications/metamta/garbagecollector/MetaMTAMailSentGarbageCollector.php',
     'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php',
     'MetaMTAReceivedMailStatus' => 'applications/metamta/constants/MetaMTAReceivedMailStatus.php',
-    'NuanceCapabilitySourceDefaultEdit' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php',
-    'NuanceCapabilitySourceDefaultView' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultView.php',
-    'NuanceCapabilitySourceManage' => 'applications/nuance/capability/NuanceCapabilitySourceManage.php',
     'NuanceConstants' => 'applications/nuance/constants/NuanceConstants.php',
     'NuanceController' => 'applications/nuance/controller/NuanceController.php',
     'NuanceDAO' => 'applications/nuance/storage/NuanceDAO.php',
@@ -1012,9 +1009,12 @@ phutil_register_library_map(array(
     'NuanceRequestorTransactionQuery' => 'applications/nuance/query/NuanceRequestorTransactionQuery.php',
     'NuanceRequestorViewController' => 'applications/nuance/controller/NuanceRequestorViewController.php',
     'NuanceSource' => 'applications/nuance/storage/NuanceSource.php',
+    'NuanceSourceDefaultEditCapability' => 'applications/nuance/capability/NuanceSourceDefaultEditCapability.php',
+    'NuanceSourceDefaultViewCapability' => 'applications/nuance/capability/NuanceSourceDefaultViewCapability.php',
     'NuanceSourceDefinition' => 'applications/nuance/source/NuanceSourceDefinition.php',
     'NuanceSourceEditController' => 'applications/nuance/controller/NuanceSourceEditController.php',
     'NuanceSourceEditor' => 'applications/nuance/editor/NuanceSourceEditor.php',
+    'NuanceSourceManageCapability' => 'applications/nuance/capability/NuanceSourceManageCapability.php',
     'NuanceSourcePHIDType' => 'applications/nuance/phid/NuanceSourcePHIDType.php',
     'NuanceSourceQuery' => 'applications/nuance/query/NuanceSourceQuery.php',
     'NuanceSourceTransaction' => 'applications/nuance/storage/NuanceSourceTransaction.php',
@@ -1112,12 +1112,12 @@ phutil_register_library_map(array(
     'PassphraseRemarkupRule' => 'applications/passphrase/remarkup/PassphraseRemarkupRule.php',
     'PassphraseSSHKey' => 'applications/passphrase/keys/PassphraseSSHKey.php',
     'PassphraseSecret' => 'applications/passphrase/storage/PassphraseSecret.php',
-    'PasteCapabilityDefaultView' => 'applications/paste/capability/PasteCapabilityDefaultView.php',
     'PasteCreateMailReceiver' => 'applications/paste/mail/PasteCreateMailReceiver.php',
+    'PasteDefaultViewCapability' => 'applications/paste/capability/PasteDefaultViewCapability.php',
     'PasteEmbedView' => 'applications/paste/view/PasteEmbedView.php',
     'PasteMockMailReceiver' => 'applications/paste/mail/PasteMockMailReceiver.php',
     'PasteReplyHandler' => 'applications/paste/mail/PasteReplyHandler.php',
-    'PeopleCapabilityBrowseUserDirectory' => 'applications/people/capability/PeopleCapabilityBrowseUserDirectory.php',
+    'PeopleBrowseUserDirectoryCapability' => 'applications/people/capability/PeopleBrowseUserDirectoryCapability.php',
     'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
     'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
     'PhabricatorAWSConfigOptions' => 'applications/config/option/PhabricatorAWSConfigOptions.php',
@@ -1376,10 +1376,10 @@ phutil_register_library_map(array(
     'PhabricatorCoreConfigOptions' => 'applications/config/option/PhabricatorCoreConfigOptions.php',
     'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
     'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
-    'PhabricatorCountdownCapabilityDefaultView' => 'applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php',
     'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
     'PhabricatorCountdownCountdownPHIDType' => 'applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php',
     'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
+    'PhabricatorCountdownDefaultViewCapability' => 'applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php',
     'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
     'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
     'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
@@ -1686,7 +1686,6 @@ phutil_register_library_map(array(
     'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
     'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
     'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
-    'PhabricatorMacroCapabilityManage' => 'applications/macro/capability/PhabricatorMacroCapabilityManage.php',
     'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
     'PhabricatorMacroConfigOptions' => 'applications/macro/config/PhabricatorMacroConfigOptions.php',
     'PhabricatorMacroController' => 'applications/macro/controller/PhabricatorMacroController.php',
@@ -1697,6 +1696,7 @@ phutil_register_library_map(array(
     'PhabricatorMacroListController' => 'applications/macro/controller/PhabricatorMacroListController.php',
     'PhabricatorMacroMacroPHIDType' => 'applications/macro/phid/PhabricatorMacroMacroPHIDType.php',
     'PhabricatorMacroMailReceiver' => 'applications/macro/mail/PhabricatorMacroMailReceiver.php',
+    'PhabricatorMacroManageCapability' => 'applications/macro/capability/PhabricatorMacroManageCapability.php',
     'PhabricatorMacroMemeController' => 'applications/macro/controller/PhabricatorMacroMemeController.php',
     'PhabricatorMacroMemeDialogController' => 'applications/macro/controller/PhabricatorMacroMemeDialogController.php',
     'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
@@ -1811,13 +1811,13 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
     'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
     'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php',
-    'PhabricatorOAuthServerCapabilityCreateClients' => 'applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php',
     'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
     'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php',
     'PhabricatorOAuthServerClientPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php',
     'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
     'PhabricatorOAuthServerClientSearchEngine' => 'applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php',
     'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
+    'PhabricatorOAuthServerCreateClientsCapability' => 'applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php',
     'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
     'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
     'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
@@ -1928,10 +1928,10 @@ phutil_register_library_map(array(
     'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php',
     'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
     'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
+    'PhabricatorPolicyCanEditCapability' => 'applications/policy/capability/PhabricatorPolicyCanEditCapability.php',
+    'PhabricatorPolicyCanJoinCapability' => 'applications/policy/capability/PhabricatorPolicyCanJoinCapability.php',
+    'PhabricatorPolicyCanViewCapability' => 'applications/policy/capability/PhabricatorPolicyCanViewCapability.php',
     'PhabricatorPolicyCapability' => 'applications/policy/capability/PhabricatorPolicyCapability.php',
-    'PhabricatorPolicyCapabilityCanEdit' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanEdit.php',
-    'PhabricatorPolicyCapabilityCanJoin' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanJoin.php',
-    'PhabricatorPolicyCapabilityCanView' => 'applications/policy/capability/PhabricatorPolicyCapabilityCanView.php',
     'PhabricatorPolicyConfigOptions' => 'applications/policy/config/PhabricatorPolicyConfigOptions.php',
     'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
     'PhabricatorPolicyController' => 'applications/policy/controller/PhabricatorPolicyController.php',
@@ -2217,13 +2217,13 @@ phutil_register_library_map(array(
     'PhabricatorSetupIssueExample' => 'applications/uiexample/examples/PhabricatorSetupIssueExample.php',
     'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
     'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
-    'PhabricatorSlowvoteCapabilityDefaultView' => 'applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php',
     'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
     'PhabricatorSlowvoteCloseController' => 'applications/slowvote/controller/PhabricatorSlowvoteCloseController.php',
     'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/PhabricatorSlowvoteComment.php',
     'PhabricatorSlowvoteCommentController' => 'applications/slowvote/controller/PhabricatorSlowvoteCommentController.php',
     'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
     'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
+    'PhabricatorSlowvoteDefaultViewCapability' => 'applications/slowvote/capability/PhabricatorSlowvoteDefaultViewCapability.php',
     'PhabricatorSlowvoteEditController' => 'applications/slowvote/controller/PhabricatorSlowvoteEditController.php',
     'PhabricatorSlowvoteEditor' => 'applications/slowvote/editor/PhabricatorSlowvoteEditor.php',
     'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
@@ -2453,11 +2453,11 @@ phutil_register_library_map(array(
     'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php',
     'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php',
     'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php',
-    'PholioCapabilityDefaultEdit' => 'applications/pholio/capability/PholioCapabilityDefaultEdit.php',
-    'PholioCapabilityDefaultView' => 'applications/pholio/capability/PholioCapabilityDefaultView.php',
     'PholioConstants' => 'applications/pholio/constants/PholioConstants.php',
     'PholioController' => 'applications/pholio/controller/PholioController.php',
     'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
+    'PholioDefaultEditCapability' => 'applications/pholio/capability/PholioDefaultEditCapability.php',
+    'PholioDefaultViewCapability' => 'applications/pholio/capability/PholioDefaultViewCapability.php',
     'PholioImage' => 'applications/pholio/storage/PholioImage.php',
     'PholioImagePHIDType' => 'applications/pholio/phid/PholioImagePHIDType.php',
     'PholioImageQuery' => 'applications/pholio/query/PholioImageQuery.php',
@@ -2538,7 +2538,7 @@ phutil_register_library_map(array(
     'PhortuneTestPaymentProvider' => 'applications/phortune/provider/PhortuneTestPaymentProvider.php',
     'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
     'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
-    'PhragmentCapabilityCanCreate' => 'applications/phragment/capability/PhragmentCapabilityCanCreate.php',
+    'PhragmentCanCreateCapability' => 'applications/phragment/capability/PhragmentCanCreateCapability.php',
     'PhragmentController' => 'applications/phragment/controller/PhragmentController.php',
     'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
     'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
@@ -2647,7 +2647,7 @@ phutil_register_library_map(array(
     'PonderVoteEditor' => 'applications/ponder/editor/PonderVoteEditor.php',
     'PonderVoteSaveController' => 'applications/ponder/controller/PonderVoteSaveController.php',
     'ProjectBoardTaskCard' => 'applications/project/view/ProjectBoardTaskCard.php',
-    'ProjectCapabilityCreateProjects' => 'applications/project/capability/ProjectCapabilityCreateProjects.php',
+    'ProjectCreateProjectsCapability' => 'applications/project/capability/ProjectCreateProjectsCapability.php',
     'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
     'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
     'ReleephAuthorFieldSpecification' => 'applications/releeph/field/specification/ReleephAuthorFieldSpecification.php',
@@ -3060,7 +3060,6 @@ phutil_register_library_map(array(
     'DifferentialAuthorField' => 'DifferentialCustomField',
     'DifferentialBlameRevisionField' => 'DifferentialStoredCustomField',
     'DifferentialBranchField' => 'DifferentialCustomField',
-    'DifferentialCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'DifferentialChangesSinceLastUpdateField' => 'DifferentialCustomField',
     'DifferentialChangeset' => array(
       'DifferentialDAO',
@@ -3093,6 +3092,7 @@ phutil_register_library_map(array(
     'DifferentialCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
     'DifferentialCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
     'DifferentialDAO' => 'PhabricatorLiskDAO',
+    'DifferentialDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'DifferentialDependenciesField' => 'DifferentialCustomField',
     'DifferentialDependsOnField' => 'DifferentialCustomField',
     'DifferentialDiff' => array(
@@ -3206,11 +3206,6 @@ phutil_register_library_map(array(
     'DiffusionBrowseMainController' => 'DiffusionBrowseController',
     'DiffusionBrowseSearchController' => 'DiffusionBrowseController',
     'DiffusionBrowseTableView' => 'DiffusionView',
-    'DiffusionCapabilityCreateRepositories' => 'PhabricatorPolicyCapability',
-    'DiffusionCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
-    'DiffusionCapabilityDefaultPush' => 'PhabricatorPolicyCapability',
-    'DiffusionCapabilityDefaultView' => 'PhabricatorPolicyCapability',
-    'DiffusionCapabilityPush' => 'PhabricatorPolicyCapability',
     'DiffusionChangeController' => 'DiffusionController',
     'DiffusionCommentListView' => 'AphrontView',
     'DiffusionCommentView' => 'AphrontView',
@@ -3227,6 +3222,10 @@ phutil_register_library_map(array(
     'DiffusionCommitRemarkupRule' => 'PhabricatorRemarkupRuleObject',
     'DiffusionCommitTagsController' => 'DiffusionController',
     'DiffusionController' => 'PhabricatorController',
+    'DiffusionCreateRepositoriesCapability' => 'PhabricatorPolicyCapability',
+    'DiffusionDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability',
+    'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'DiffusionDiffController' => 'DiffusionController',
     'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
     'DiffusionEmptyResultView' => 'DiffusionView',
@@ -3264,6 +3263,7 @@ phutil_register_library_map(array(
     'DiffusionPathQueryTestCase' => 'PhabricatorTestCase',
     'DiffusionPathTreeController' => 'DiffusionController',
     'DiffusionPathValidateController' => 'DiffusionController',
+    'DiffusionPushCapability' => 'PhabricatorPolicyCapability',
     'DiffusionPushEventViewController' => 'DiffusionPushLogController',
     'DiffusionPushLogController' => 'DiffusionController',
     'DiffusionPushLogListController' => 'DiffusionPushLogController',
@@ -3393,13 +3393,13 @@ phutil_register_library_map(array(
     'DrydockBlueprintTransaction' => 'PhabricatorApplicationTransaction',
     'DrydockBlueprintTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'DrydockBlueprintViewController' => 'DrydockBlueprintController',
-    'DrydockCapabilityCreateBlueprints' => 'PhabricatorPolicyCapability',
-    'DrydockCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
-    'DrydockCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'DrydockCommandInterface' => 'DrydockInterface',
     'DrydockConsoleController' => 'DrydockController',
     'DrydockController' => 'PhabricatorController',
+    'DrydockCreateBlueprintsCapability' => 'PhabricatorPolicyCapability',
     'DrydockDAO' => 'PhabricatorLiskDAO',
+    'DrydockDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'DrydockDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'DrydockFilesystemInterface' => 'DrydockInterface',
     'DrydockLease' => array(
       'DrydockDAO',
@@ -3536,12 +3536,12 @@ phutil_register_library_map(array(
     'HarbormasterBuildableTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'HarbormasterBuildableTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'HarbormasterBuildableViewController' => 'HarbormasterController',
-    'HarbormasterCapabilityManagePlans' => 'PhabricatorPolicyCapability',
     'HarbormasterCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterController' => 'PhabricatorController',
     'HarbormasterDAO' => 'PhabricatorLiskDAO',
     'HarbormasterHTTPRequestBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
     'HarbormasterLeaseHostBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
+    'HarbormasterManagePlansCapability' => 'PhabricatorPolicyCapability',
     'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
     'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
@@ -3568,7 +3568,6 @@ phutil_register_library_map(array(
     'HarbormasterWorker' => 'PhabricatorWorker',
     'HeraldAction' => 'HeraldDAO',
     'HeraldApplyTranscript' => 'HeraldDAO',
-    'HeraldCapabilityManageGlobalRules' => 'PhabricatorPolicyCapability',
     'HeraldCommitAdapter' => 'HeraldAdapter',
     'HeraldCondition' => 'HeraldDAO',
     'HeraldController' => 'PhabricatorController',
@@ -3579,6 +3578,7 @@ phutil_register_library_map(array(
     'HeraldInvalidActionException' => 'Exception',
     'HeraldInvalidConditionException' => 'Exception',
     'HeraldInvalidFieldException' => 'Exception',
+    'HeraldManageGlobalRulesCapability' => 'PhabricatorPolicyCapability',
     'HeraldManiphestTaskAdapter' => 'HeraldAdapter',
     'HeraldNewController' => 'HeraldController',
     'HeraldPholioMockAdapter' => 'HeraldAdapter',
@@ -3621,11 +3621,11 @@ phutil_register_library_map(array(
     'JavelinUIExample' => 'PhabricatorUIExample',
     'JavelinViewExample' => 'PhabricatorUIExample',
     'JavelinViewExampleServerView' => 'AphrontView',
-    'LegalpadCapabilityCreateDocuments' => 'PhabricatorPolicyCapability',
-    'LegalpadCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
-    'LegalpadCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'LegalpadController' => 'PhabricatorController',
+    'LegalpadCreateDocumentsCapability' => 'PhabricatorPolicyCapability',
     'LegalpadDAO' => 'PhabricatorLiskDAO',
+    'LegalpadDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'LegalpadDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'LegalpadDocument' => array(
       'LegalpadDAO',
       'PhabricatorPolicyInterface',
@@ -3676,14 +3676,7 @@ phutil_register_library_map(array(
     'LiskRawMigrationIterator' => 'PhutilBufferedIterator',
     'ManiphestActionMenuEventListener' => 'PhabricatorEventListener',
     'ManiphestBatchEditController' => 'ManiphestController',
-    'ManiphestCapabilityBulkEdit' => 'PhabricatorPolicyCapability',
+    'ManiphestBulkEditCapability' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityDefaultView' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityEditAssign' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityEditPolicies' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityEditPriority' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityEditProjects' => 'PhabricatorPolicyCapability',
-    'ManiphestCapabilityEditStatus' => 'PhabricatorPolicyCapability',
     'ManiphestConfiguredCustomField' => array(
       'ManiphestCustomField',
       'PhabricatorStandardCustomFieldInterface',
@@ -3697,6 +3690,13 @@ phutil_register_library_map(array(
     'ManiphestCustomFieldStorage' => 'PhabricatorCustomFieldStorage',
     'ManiphestCustomFieldStringIndex' => 'PhabricatorCustomFieldStringIndexStorage',
     'ManiphestDAO' => 'PhabricatorLiskDAO',
+    'ManiphestDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestDefaultViewCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestEditAssignCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestEditPoliciesCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestEditPriorityCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestEditProjectsCapability' => 'PhabricatorPolicyCapability',
+    'ManiphestEditStatusCapability' => 'PhabricatorPolicyCapability',
     'ManiphestExcelDefaultFormat' => 'ManiphestExcelFormat',
     'ManiphestExportController' => 'ManiphestController',
     'ManiphestHovercardEventListener' => 'PhabricatorEventListener',
@@ -3749,9 +3749,6 @@ phutil_register_library_map(array(
     'MetaMTAMailSentGarbageCollector' => 'PhabricatorGarbageCollector',
     'MetaMTANotificationType' => 'MetaMTAConstants',
     'MetaMTAReceivedMailStatus' => 'MetaMTAConstants',
-    'NuanceCapabilitySourceDefaultEdit' => 'PhabricatorPolicyCapability',
-    'NuanceCapabilitySourceDefaultView' => 'PhabricatorPolicyCapability',
-    'NuanceCapabilitySourceManage' => 'PhabricatorPolicyCapability',
     'NuanceController' => 'PhabricatorController',
     'NuanceDAO' => 'PhabricatorLiskDAO',
     'NuanceItem' => array(
@@ -3795,9 +3792,12 @@ phutil_register_library_map(array(
       'NuanceDAO',
       'PhabricatorPolicyInterface',
     ),
+    'NuanceSourceDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'NuanceSourceDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'NuanceSourceDefinition' => 'Phobject',
     'NuanceSourceEditController' => 'NuanceController',
     'NuanceSourceEditor' => 'PhabricatorApplicationTransactionEditor',
+    'NuanceSourceManageCapability' => 'PhabricatorPolicyCapability',
     'NuanceSourcePHIDType' => 'PhabricatorPHIDType',
     'NuanceSourceQuery' => 'NuanceQuery',
     'NuanceSourceTransaction' => 'NuanceTransaction',
@@ -3897,12 +3897,12 @@ phutil_register_library_map(array(
     'PassphraseRemarkupRule' => 'PhabricatorRemarkupRuleObject',
     'PassphraseSSHKey' => 'PassphraseAbstractKey',
     'PassphraseSecret' => 'PassphraseDAO',
-    'PasteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PasteCreateMailReceiver' => 'PhabricatorMailReceiver',
+    'PasteDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'PasteEmbedView' => 'AphrontView',
     'PasteMockMailReceiver' => 'PhabricatorObjectMailReceiver',
     'PasteReplyHandler' => 'PhabricatorMailReplyHandler',
-    'PeopleCapabilityBrowseUserDirectory' => 'PhabricatorPolicyCapability',
+    'PeopleBrowseUserDirectoryCapability' => 'PhabricatorPolicyCapability',
     'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
     'Phabricator404Controller' => 'PhabricatorController',
     'PhabricatorAWSConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -4187,10 +4187,10 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorCountdownApplication' => 'PhabricatorApplication',
-    'PhabricatorCountdownCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PhabricatorCountdownController' => 'PhabricatorController',
     'PhabricatorCountdownCountdownPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorCountdownDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
     'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
     'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
@@ -4504,7 +4504,6 @@ phutil_register_library_map(array(
     'PhabricatorLogoutController' => 'PhabricatorAuthController',
     'PhabricatorMacroApplication' => 'PhabricatorApplication',
     'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
-    'PhabricatorMacroCapabilityManage' => 'PhabricatorPolicyCapability',
     'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
     'PhabricatorMacroConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMacroController' => 'PhabricatorController',
@@ -4515,6 +4514,7 @@ phutil_register_library_map(array(
     'PhabricatorMacroListController' => 'PhabricatorMacroController',
     'PhabricatorMacroMacroPHIDType' => 'PhabricatorPHIDType',
     'PhabricatorMacroMailReceiver' => 'PhabricatorObjectMailReceiver',
+    'PhabricatorMacroManageCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorMacroMemeController' => 'PhabricatorMacroController',
     'PhabricatorMacroMemeDialogController' => 'PhabricatorMacroController',
     'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -4625,7 +4625,6 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
     'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO',
     'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'PhabricatorSettingsPanel',
-    'PhabricatorOAuthServerCapabilityCreateClients' => 'PhabricatorPolicyCapability',
     'PhabricatorOAuthServerClient' => array(
       'PhabricatorOAuthServerDAO',
       'PhabricatorPolicyInterface',
@@ -4635,6 +4634,7 @@ phutil_register_library_map(array(
     'PhabricatorOAuthServerClientQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorOAuthServerClientSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorOAuthServerController' => 'PhabricatorController',
+    'PhabricatorOAuthServerCreateClientsCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
     'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
     'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
@@ -4748,10 +4748,10 @@ phutil_register_library_map(array(
     'PhabricatorPolicyApplication' => 'PhabricatorApplication',
     'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery',
     'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery',
+    'PhabricatorPolicyCanEditCapability' => 'PhabricatorPolicyCapability',
+    'PhabricatorPolicyCanJoinCapability' => 'PhabricatorPolicyCapability',
+    'PhabricatorPolicyCanViewCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorPolicyCapability' => 'Phobject',
-    'PhabricatorPolicyCapabilityCanEdit' => 'PhabricatorPolicyCapability',
-    'PhabricatorPolicyCapabilityCanJoin' => 'PhabricatorPolicyCapability',
-    'PhabricatorPolicyCapabilityCanView' => 'PhabricatorPolicyCapability',
     'PhabricatorPolicyConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPolicyController' => 'PhabricatorController',
     'PhabricatorPolicyDAO' => 'PhabricatorLiskDAO',
@@ -5066,13 +5066,13 @@ phutil_register_library_map(array(
     'PhabricatorSetupIssueExample' => 'PhabricatorUIExample',
     'PhabricatorSetupIssueView' => 'AphrontView',
     'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
-    'PhabricatorSlowvoteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
     'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController',
     'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO',
     'PhabricatorSlowvoteCommentController' => 'PhabricatorSlowvoteController',
     'PhabricatorSlowvoteController' => 'PhabricatorController',
     'PhabricatorSlowvoteDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorSlowvoteDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'PhabricatorSlowvoteEditController' => 'PhabricatorSlowvoteController',
     'PhabricatorSlowvoteEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
@@ -5322,10 +5322,10 @@ phutil_register_library_map(array(
     'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhluxViewController' => 'PhluxController',
     'PholioActionMenuEventListener' => 'PhabricatorEventListener',
-    'PholioCapabilityDefaultEdit' => 'PhabricatorPolicyCapability',
-    'PholioCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PholioController' => 'PhabricatorController',
     'PholioDAO' => 'PhabricatorLiskDAO',
+    'PholioDefaultEditCapability' => 'PhabricatorPolicyCapability',
+    'PholioDefaultViewCapability' => 'PhabricatorPolicyCapability',
     'PholioImage' => array(
       'PholioDAO',
       'PhabricatorMarkupInterface',
@@ -5435,7 +5435,7 @@ phutil_register_library_map(array(
     'PhortuneTestPaymentProvider' => 'PhortunePaymentProvider',
     'PhortuneWePayPaymentProvider' => 'PhortunePaymentProvider',
     'PhragmentBrowseController' => 'PhragmentController',
-    'PhragmentCapabilityCanCreate' => 'PhabricatorPolicyCapability',
+    'PhragmentCanCreateCapability' => 'PhabricatorPolicyCapability',
     'PhragmentController' => 'PhabricatorController',
     'PhragmentCreateController' => 'PhragmentController',
     'PhragmentDAO' => 'PhabricatorLiskDAO',
@@ -5584,7 +5584,7 @@ phutil_register_library_map(array(
     'PonderVote' => 'PonderConstants',
     'PonderVoteEditor' => 'PhabricatorEditor',
     'PonderVoteSaveController' => 'PonderController',
-    'ProjectCapabilityCreateProjects' => 'PhabricatorPolicyCapability',
+    'ProjectCreateProjectsCapability' => 'PhabricatorPolicyCapability',
     'ProjectRemarkupRule' => 'PhabricatorRemarkupRuleObject',
     'QueryFormattingTestCase' => 'PhabricatorTestCase',
     'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification',

src/applications/countdown/application/PhabricatorCountdownApplication.php

@@ -50,7 +50,7 @@ final class PhabricatorCountdownApplication extends PhabricatorApplication {
 
   public function getCustomCapabilities() {
     return array(
-      PhabricatorCountdownCapabilityDefaultView::CAPABILITY => array(
+      PhabricatorCountdownDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for new countdowns.'),
       ),
     );

src/applications/countdown/capability/PhabricatorCountdownDefaultViewCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorCountdownCapabilityDefaultView
+final class PhabricatorCountdownDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'countdown.default.view';

src/applications/countdown/storage/PhabricatorCountdown.php

@@ -16,7 +16,7 @@ final class PhabricatorCountdown
       ->executeOne();
 
     $view_policy = $app->getPolicy(
-      PhabricatorCountdownCapabilityDefaultView::CAPABILITY);
+      PhabricatorCountdownDefaultViewCapability::CAPABILITY);
 
     return id(new PhabricatorCountdown())
       ->setAuthorPHID($actor->getPHID())

src/applications/differential/application/PhabricatorDifferentialApplication.php

@@ -133,7 +133,7 @@ EOTEXT
 
   protected function getCustomCapabilities() {
     return array(
-      DifferentialCapabilityDefaultView::CAPABILITY => array(
+      DifferentialDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created revisions.'),
       ),
     );

src/applications/differential/capability/DifferentialDefaultViewCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DifferentialCapabilityDefaultView
+final class DifferentialDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'differential.default.view';

src/applications/differential/controller/DifferentialRevisionLandController.php

@@ -121,7 +121,7 @@ final class DifferentialRevisionLandController extends DifferentialController {
     $can_push = PhabricatorPolicyFilter::hasCapability(
       $request->getUser(),
       $repository,
-      DiffusionCapabilityPush::CAPABILITY);
+      DiffusionPushCapability::CAPABILITY);
 
     if (!$can_push) {
       throw new Exception(
@@ -159,4 +159,5 @@ final class DifferentialRevisionLandController extends DifferentialController {
     $lock->lock();
     return $lock;
   }
+
 }

src/applications/differential/landing/DifferentialLandingStrategy.php

@@ -8,7 +8,7 @@ abstract class DifferentialLandingStrategy {
     PhabricatorRepository $repository);
 
   /**
-   * returns PhabricatorActionView or null.
+   * @return PhabricatorActionView or null.
    */
   abstract function createMenuItem(
     PhabricatorUser $viewer,
@@ -16,7 +16,7 @@ abstract class DifferentialLandingStrategy {
     PhabricatorRepository $repository);
 
   /**
-   * returns PhabricatorActionView which can be attached to the revision view.
+   * @return PhabricatorActionView which can be attached to the revision view.
    */
   protected function createActionView($revision, $name) {
     $strategy = get_class($this);
@@ -34,8 +34,8 @@ abstract class DifferentialLandingStrategy {
    * By default, this method checks for push permissions, and for the
    * revision being Accepted.
    *
-   * @return FALSE for "not disabled";
+   * @return False for "not disabled"; human-readable text explaining why, if
-   *         Human-readable text explaining why, if it is disabled;
+   *         it is disabled.
    */
   public function isActionDisabled(
     PhabricatorUser $viewer,
@@ -50,7 +50,7 @@ abstract class DifferentialLandingStrategy {
     if (!PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $repository,
-        DiffusionCapabilityPush::CAPABILITY)) {
+        DiffusionPushCapability::CAPABILITY)) {
       return pht('You do not have permissions to push to this repository.');
     }
 
@@ -58,29 +58,26 @@ abstract class DifferentialLandingStrategy {
   }
 
   /**
-   * might break if repository is not Git.
+   * Might break if repository is not Git.
    */
   protected function getGitWorkspace(PhabricatorRepository $repository) {
     try {
         return DifferentialGetWorkingCopy::getCleanGitWorkspace($repository);
     } catch (Exception $e) {
-      throw new PhutilProxyException(
+      throw new PhutilProxyException('Failed to allocate a workspace', $e);
-        'Failed to allocate a workspace',
-        $e);
     }
   }
 
   /**
-   * might break if repository is not Mercurial.
+   * Might break if repository is not Mercurial.
    */
   protected function getMercurialWorkspace(PhabricatorRepository $repository) {
     try {
       return DifferentialGetWorkingCopy::getCleanMercurialWorkspace(
         $repository);
     } catch (Exception $e) {
-      throw new PhutilProxyException(
+      throw new PhutilProxyException('Failed to allocate a workspace', $e);
-        'Failed to allocate a workspace',
-        $e);
     }
   }
+
 }

src/applications/differential/storage/DifferentialRevision.php

@@ -57,7 +57,7 @@ final class DifferentialRevision extends DifferentialDAO
       ->executeOne();
 
     $view_policy = $app->getPolicy(
-      DifferentialCapabilityDefaultView::CAPABILITY);
+      DifferentialDefaultViewCapability::CAPABILITY);
 
     return id(new DifferentialRevision())
       ->setViewPolicy($view_policy)

src/applications/diffusion/application/PhabricatorDiffusionApplication.php

@@ -130,12 +130,12 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      DiffusionCapabilityDefaultView::CAPABILITY => array(),
+      DiffusionDefaultViewCapability::CAPABILITY => array(),
-      DiffusionCapabilityDefaultEdit::CAPABILITY => array(
+      DiffusionDefaultEditCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
-      DiffusionCapabilityDefaultPush::CAPABILITY => array(),
+      DiffusionDefaultPushCapability::CAPABILITY => array(),
-      DiffusionCapabilityCreateRepositories::CAPABILITY => array(
+      DiffusionCreateRepositoriesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );

src/applications/diffusion/capability/DiffusionCreateRepositoriesCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DiffusionCapabilityCreateRepositories
+final class DiffusionCreateRepositoriesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.create';

src/applications/diffusion/capability/DiffusionDefaultEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DiffusionCapabilityDefaultEdit
+final class DiffusionDefaultEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.edit';
 

src/applications/diffusion/capability/DiffusionDefaultPushCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DiffusionCapabilityDefaultPush
+final class DiffusionDefaultPushCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.push';
 

src/applications/diffusion/capability/DiffusionDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DiffusionCapabilityDefaultView
+final class DiffusionDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.default.view';
 

src/applications/diffusion/capability/DiffusionPushCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DiffusionCapabilityPush
+final class DiffusionPushCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'diffusion.push';
 

src/applications/diffusion/controller/DiffusionRepositoryCreateController.php

@@ -38,7 +38,7 @@ final class DiffusionRepositoryCreateController
       case 'import':
       case 'create':
         $this->requireApplicationCapability(
-          DiffusionCapabilityCreateRepositories::CAPABILITY);
+          DiffusionCreateRepositoriesCapability::CAPABILITY);
 
         $cancel_uri = $this->getApplicationURI('new/');
         break;
@@ -671,7 +671,7 @@ final class DiffusionRepositoryCreateController
 
     $push_policy = id(new AphrontFormPolicyControl())
       ->setUser($viewer)
-      ->setCapability(DiffusionCapabilityPush::CAPABILITY)
+      ->setCapability(DiffusionPushCapability::CAPABILITY)
       ->setPolicyObject($repository)
       ->setPolicies($policies)
       ->setName('pushPolicy');
@@ -849,5 +849,4 @@ final class DiffusionRepositoryCreateController
     return $this->repository;
   }
 
-
 }

src/applications/diffusion/controller/DiffusionRepositoryEditMainController.php

@@ -372,7 +372,7 @@ final class DiffusionRepositoryEditMainController
       $descriptions[PhabricatorPolicyCapability::CAN_EDIT]);
 
     $pushable = $repository->isHosted()
-      ? $descriptions[DiffusionCapabilityPush::CAPABILITY]
+      ? $descriptions[DiffusionPushCapability::CAPABILITY]
       : phutil_tag('em', array(), pht('Not a Hosted Repository'));
     $view->addProperty(pht('Pushable By'), $pushable);
 

src/applications/diffusion/controller/DiffusionRepositoryListController.php

@@ -41,7 +41,7 @@ final class DiffusionRepositoryListController extends DiffusionController {
     $crumbs = parent::buildApplicationCrumbs();
 
     $can_create = $this->hasApplicationCapability(
-      DiffusionCapabilityCreateRepositories::CAPABILITY);
+      DiffusionCreateRepositoriesCapability::CAPABILITY);
 
     $crumbs->addAction(
       id(new PHUIListItemView())

src/applications/diffusion/controller/DiffusionRepositoryNewController.php

@@ -1,14 +1,13 @@
 <?php
 
-final class DiffusionRepositoryNewController
+final class DiffusionRepositoryNewController extends DiffusionController {
-  extends DiffusionController {
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      DiffusionCapabilityCreateRepositories::CAPABILITY);
+      DiffusionCreateRepositoriesCapability::CAPABILITY);
 
     if ($request->isFormPost()) {
       if ($request->getStr('type')) {

src/applications/diffusion/controller/DiffusionServeController.php

@@ -144,7 +144,7 @@ final class DiffusionServeController extends DiffusionController {
           $can_push = PhabricatorPolicyFilter::hasCapability(
             $viewer,
             $repository,
-            DiffusionCapabilityPush::CAPABILITY);
+            DiffusionPushCapability::CAPABILITY);
           if (!$can_push) {
             if ($viewer->isLoggedIn()) {
               return new PhabricatorVCSResponse(

src/applications/diffusion/ssh/DiffusionSSHWorkflow.php

@@ -118,7 +118,7 @@ abstract class DiffusionSSHWorkflow extends PhabricatorSSHWorkflow {
         $can_push = PhabricatorPolicyFilter::hasCapability(
           $viewer,
           $repository,
-          DiffusionCapabilityPush::CAPABILITY);
+          DiffusionPushCapability::CAPABILITY);
         if (!$can_push) {
           throw new Exception(
             pht('You do not have permission to push to this repository.'));

src/applications/drydock/application/PhabricatorDrydockApplication.php

@@ -67,11 +67,11 @@ final class PhabricatorDrydockApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      DrydockCapabilityDefaultView::CAPABILITY => array(),
+      DrydockDefaultViewCapability::CAPABILITY => array(),
-      DrydockCapabilityDefaultEdit::CAPABILITY => array(
+      DrydockDefaultEditCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
-      DrydockCapabilityCreateBlueprints::CAPABILITY => array(
+      DrydockCreateBlueprintsCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );

src/applications/drydock/capability/DrydockCreateBlueprintsCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class DrydockCapabilityCreateBlueprints
+final class DrydockCreateBlueprintsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.blueprint.create';

src/applications/drydock/capability/DrydockDefaultEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DrydockCapabilityDefaultEdit
+final class DrydockDefaultEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.default.edit';
 

src/applications/drydock/capability/DrydockDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class DrydockCapabilityDefaultView
+final class DrydockDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'drydock.default.view';
 

src/applications/drydock/controller/DrydockBlueprintCreateController.php

@@ -8,7 +8,7 @@ final class DrydockBlueprintCreateController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      DrydockCapabilityCreateBlueprints::CAPABILITY);
+      DrydockCreateBlueprintsCapability::CAPABILITY);
 
     $implementations =
       DrydockBlueprintImplementation::getAllBlueprintImplementations();

src/applications/drydock/controller/DrydockBlueprintEditController.php

@@ -30,7 +30,7 @@ final class DrydockBlueprintEditController extends DrydockBlueprintController {
       $cancel_uri = $this->getApplicationURI('blueprint/'.$this->id.'/');
     } else {
       $this->requireApplicationCapability(
-        DrydockCapabilityCreateBlueprints::CAPABILITY);
+        DrydockCreateBlueprintsCapability::CAPABILITY);
 
       $class = $request->getStr('class');
 

src/applications/drydock/controller/DrydockBlueprintListController.php

@@ -24,7 +24,7 @@ final class DrydockBlueprintListController extends DrydockBlueprintController {
 
   public function buildApplicationCrumbs() {
     $can_create = $this->hasApplicationCapability(
-      DrydockCapabilityCreateBlueprints::CAPABILITY);
+      DrydockCreateBlueprintsCapability::CAPABILITY);
 
     $crumbs = parent::buildApplicationCrumbs();
     $crumbs->addAction(

src/applications/drydock/storage/DrydockBlueprint.php

@@ -18,9 +18,9 @@ final class DrydockBlueprint extends DrydockDAO
       ->executeOne();
 
     $view_policy = $app->getPolicy(
-      DrydockCapabilityDefaultView::CAPABILITY);
+      DrydockDefaultViewCapability::CAPABILITY);
     $edit_policy = $app->getPolicy(
-      DrydockCapabilityDefaultEdit::CAPABILITY);
+      DrydockDefaultEditCapability::CAPABILITY);
 
     return id(new DrydockBlueprint())
       ->setViewPolicy($view_policy)

src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php

@@ -83,7 +83,7 @@ final class PhabricatorHarbormasterApplication extends PhabricatorApplication {
 
   public function getCustomCapabilities() {
     return array(
-      HarbormasterCapabilityManagePlans::CAPABILITY => array(
+      HarbormasterManagePlansCapability::CAPABILITY => array(
         'caption' => pht('Can create and manage build plans.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),

src/applications/harbormaster/capability/HarbormasterManagePlansCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HarbormasterCapabilityManagePlans
+final class HarbormasterManagePlansCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'harbormaster.plans';

src/applications/harbormaster/controller/HarbormasterPlanDisableController.php

@@ -14,7 +14,7 @@ final class HarbormasterPlanDisableController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $plan = id(new HarbormasterBuildPlanQuery())
       ->setViewer($viewer)

src/applications/harbormaster/controller/HarbormasterPlanEditController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterPlanEditController
+final class HarbormasterPlanEditController extends HarbormasterPlanController {
-  extends HarbormasterPlanController {
 
   private $id;
 
@@ -14,7 +13,7 @@ final class HarbormasterPlanEditController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     if ($this->id) {
       $plan = id(new HarbormasterBuildPlanQuery())

src/applications/harbormaster/controller/HarbormasterPlanOrderController.php

@@ -15,7 +15,7 @@ final class HarbormasterPlanOrderController extends HarbormasterController {
     $request->validateCSRF();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $plan = id(new HarbormasterBuildPlanQuery())
       ->setViewer($user)

src/applications/harbormaster/controller/HarbormasterPlanRunController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterPlanRunController
+final class HarbormasterPlanRunController extends HarbormasterController {
-  extends HarbormasterController {
 
   private $id;
 
@@ -14,7 +13,7 @@ final class HarbormasterPlanRunController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $plan_id = $this->id;
     $plan = id(new HarbormasterBuildPlanQuery())

src/applications/harbormaster/controller/HarbormasterPlanViewController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterPlanViewController
+final class HarbormasterPlanViewController extends HarbormasterPlanController {
-  extends HarbormasterPlanController {
 
   private $id;
 
@@ -85,7 +84,7 @@ final class HarbormasterPlanViewController
       ->execute();
 
     $can_edit = $this->hasApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $i = 1;
     $step_list = id(new PHUIObjectItemListView())
@@ -215,7 +214,7 @@ final class HarbormasterPlanViewController
       ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
 
     $can_edit = $this->hasApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $list->addAction(
       id(new PhabricatorActionView())

src/applications/harbormaster/controller/HarbormasterStepAddController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterStepAddController
+final class HarbormasterStepAddController extends HarbormasterController {
-  extends HarbormasterController {
 
   private $id;
 
@@ -14,12 +13,12 @@ final class HarbormasterStepAddController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $plan = id(new HarbormasterBuildPlanQuery())
-        ->setViewer($viewer)
+      ->setViewer($viewer)
-        ->withIDs(array($this->id))
+      ->withIDs(array($this->id))
-        ->executeOne();
+      ->executeOne();
     if (!$plan) {
       return new Aphront404Response();
     }
@@ -31,8 +30,7 @@ final class HarbormasterStepAddController
     if ($request->isFormPost()) {
       $class = $request->getStr('class');
       if (!HarbormasterBuildStepImplementation::getImplementation($class)) {
-        $errors[] = pht(
+        $errors[] = pht('Choose the type of build step you want to add.');
-          'Choose the type of build step you want to add.');
       }
       if (!$errors) {
         $new_uri = $this->getApplicationURI("step/new/{$plan_id}/{$class}/");

src/applications/harbormaster/controller/HarbormasterStepDeleteController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterStepDeleteController
+final class HarbormasterStepDeleteController extends HarbormasterController {
-  extends HarbormasterController {
 
   private $id;
 
@@ -14,7 +13,7 @@ final class HarbormasterStepDeleteController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     $id = $this->id;
 

src/applications/harbormaster/controller/HarbormasterStepEditController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class HarbormasterStepEditController
+final class HarbormasterStepEditController extends HarbormasterController {
-  extends HarbormasterController {
 
   private $id;
   private $planID;
@@ -18,7 +17,7 @@ final class HarbormasterStepEditController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      HarbormasterCapabilityManagePlans::CAPABILITY);
+      HarbormasterManagePlansCapability::CAPABILITY);
 
     if ($this->id) {
       $step = id(new HarbormasterBuildStepQuery())
@@ -200,5 +199,4 @@ final class HarbormasterStepEditController
       ->appendChild($form);
   }
 
-
 }

src/applications/herald/application/PhabricatorHeraldApplication.php

@@ -63,7 +63,7 @@ final class PhabricatorHeraldApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      HeraldCapabilityManageGlobalRules::CAPABILITY => array(
+      HeraldManageGlobalRulesCapability::CAPABILITY => array(
         'caption' => pht('Global rules can bypass access controls.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),

src/applications/herald/capability/HeraldManageGlobalRulesCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class HeraldCapabilityManageGlobalRules
+final class HeraldManageGlobalRulesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'herald.global';

src/applications/herald/controller/HeraldDisableController.php

@@ -30,7 +30,7 @@ final class HeraldDisableController extends HeraldController {
 
     if ($rule->isGlobalRule()) {
       $this->requireApplicationCapability(
-        HeraldCapabilityManageGlobalRules::CAPABILITY);
+        HeraldManageGlobalRulesCapability::CAPABILITY);
     }
 
     $view_uri = $this->getApplicationURI("rule/{$id}/");

src/applications/herald/controller/HeraldNewController.php

@@ -251,7 +251,7 @@ final class HeraldNewController extends HeraldController {
       )) + $rule_type_map;
 
     list($can_global, $global_link) = $this->explainApplicationCapability(
-      HeraldCapabilityManageGlobalRules::CAPABILITY,
+      HeraldManageGlobalRulesCapability::CAPABILITY,
       pht('You have permission to create and manage global rules.'),
       pht('You do not have permission to create or manage global rules.'));
 
@@ -313,4 +313,5 @@ final class HeraldNewController extends HeraldController {
 
     return $radio;
   }
+
 }

src/applications/herald/controller/HeraldRuleController.php

@@ -10,7 +10,6 @@ final class HeraldRuleController extends HeraldController {
   }
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
 
@@ -83,7 +82,7 @@ final class HeraldRuleController extends HeraldController {
 
     if ($rule->isGlobalRule()) {
       $this->requireApplicationCapability(
-        HeraldCapabilityManageGlobalRules::CAPABILITY);
+        HeraldManageGlobalRulesCapability::CAPABILITY);
     }
 
     $adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());
@@ -666,5 +665,4 @@ final class HeraldRuleController extends HeraldController {
     return $all_rules;
   }
 
-
 }

src/applications/herald/storage/HeraldRule.php

@@ -223,7 +223,7 @@ final class HeraldRule extends HeraldDAO
         case PhabricatorPolicyCapability::CAN_EDIT:
           $app = 'PhabricatorHeraldApplication';
           $herald = PhabricatorApplication::getByClass($app);
-          $global = HeraldCapabilityManageGlobalRules::CAPABILITY;
+          $global = HeraldManageGlobalRulesCapability::CAPABILITY;
           return $herald->getPolicy($global);
       }
     } else if ($this->isObjectRule()) {

src/applications/legalpad/application/PhabricatorLegalpadApplication.php

@@ -68,9 +68,9 @@ final class PhabricatorLegalpadApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      LegalpadCapabilityCreateDocuments::CAPABILITY => array(),
+      LegalpadCreateDocumentsCapability::CAPABILITY => array(),
-      LegalpadCapabilityDefaultView::CAPABILITY => array(),
+      LegalpadDefaultViewCapability::CAPABILITY => array(),
-      LegalpadCapabilityDefaultEdit::CAPABILITY => array(),
+      LegalpadDefaultEditCapability::CAPABILITY => array(),
     );
   }
 

src/applications/legalpad/capability/LegalpadCreateDocumentsCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class LegalpadCapabilityCreateDocuments
+final class LegalpadCreateDocumentsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.create';

src/applications/legalpad/capability/LegalpadDefaultEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class LegalpadCapabilityDefaultEdit
+final class LegalpadDefaultEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.default.edit';
 

src/applications/legalpad/capability/LegalpadDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class LegalpadCapabilityDefaultView
+final class LegalpadDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'legalpad.default.view';
 

src/applications/legalpad/controller/LegalpadDocumentEditController.php

@@ -16,7 +16,7 @@ final class LegalpadDocumentEditController extends LegalpadController {
       $is_create = true;
 
       $this->requireApplicationCapability(
-        LegalpadCapabilityCreateDocuments::CAPABILITY);
+        LegalpadCreateDocumentsCapability::CAPABILITY);
 
       $document = LegalpadDocument::initializeNewDocument($user);
       $body = id(new LegalpadDocumentBody())

src/applications/legalpad/controller/LegalpadDocumentListController.php

@@ -26,7 +26,7 @@ final class LegalpadDocumentListController extends LegalpadController {
     $crumbs = parent::buildApplicationCrumbs();
 
     $can_create = $this->hasApplicationCapability(
-      LegalpadCapabilityCreateDocuments::CAPABILITY);
+      LegalpadCreateDocumentsCapability::CAPABILITY);
 
     $crumbs->addAction(
       id(new PHUIListItemView())

src/applications/legalpad/storage/LegalpadDocument.php

@@ -33,8 +33,8 @@ final class LegalpadDocument extends LegalpadDAO
       ->withClasses(array('PhabricatorLegalpadApplication'))
       ->executeOne();
 
-    $view_policy = $app->getPolicy(LegalpadCapabilityDefaultView::CAPABILITY);
+    $view_policy = $app->getPolicy(LegalpadDefaultViewCapability::CAPABILITY);
-    $edit_policy = $app->getPolicy(LegalpadCapabilityDefaultEdit::CAPABILITY);
+    $edit_policy = $app->getPolicy(LegalpadDefaultEditCapability::CAPABILITY);
 
     return id(new LegalpadDocument())
       ->setVersions(0)

src/applications/macro/application/PhabricatorMacroApplication.php

@@ -50,7 +50,7 @@ final class PhabricatorMacroApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      PhabricatorMacroCapabilityManage::CAPABILITY => array(
+      PhabricatorMacroManageCapability::CAPABILITY => array(
         'caption' => pht('Allows creating and editing macros.'),
       ),
     );

src/applications/macro/capability/PhabricatorMacroManageCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorMacroCapabilityManage
+final class PhabricatorMacroManageCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'macro.manage';

src/applications/macro/controller/PhabricatorMacroAudioController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorMacroAudioController
+final class PhabricatorMacroAudioController extends PhabricatorMacroController {
-  extends PhabricatorMacroController {
 
   private $id;
 
@@ -10,9 +9,8 @@ final class PhabricatorMacroAudioController
   }
 
   public function processRequest() {
-
     $this->requireApplicationCapability(
-      PhabricatorMacroCapabilityManage::CAPABILITY);
+      PhabricatorMacroManageCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $viewer = $request->getUser();
@@ -157,4 +155,5 @@ final class PhabricatorMacroAudioController
         'title' => $title,
       ));
   }
+
 }

src/applications/macro/controller/PhabricatorMacroController.php

@@ -1,7 +1,6 @@
 <?php
 
-abstract class PhabricatorMacroController
+abstract class PhabricatorMacroController extends PhabricatorController {
-  extends PhabricatorController {
 
   protected function buildSideNavView($for_app = false) {
     $nav = new AphrontSideNavFilterView();
@@ -29,7 +28,7 @@ abstract class PhabricatorMacroController
     $crumbs = parent::buildApplicationCrumbs();
 
     $can_manage = $this->hasApplicationCapability(
-      PhabricatorMacroCapabilityManage::CAPABILITY);
+      PhabricatorMacroManageCapability::CAPABILITY);
 
     $crumbs->addAction(
       id(new PHUIListItemView())

src/applications/macro/controller/PhabricatorMacroDisableController.php

@@ -10,9 +10,8 @@ final class PhabricatorMacroDisableController
   }
 
   public function processRequest() {
-
     $this->requireApplicationCapability(
-      PhabricatorMacroCapabilityManage::CAPABILITY);
+      PhabricatorMacroManageCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $user = $request->getUser();
@@ -55,4 +54,5 @@ final class PhabricatorMacroDisableController
 
     return id(new AphrontDialogResponse())->setDialog($dialog);
   }
+
 }

src/applications/macro/controller/PhabricatorMacroEditController.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorMacroEditController
+final class PhabricatorMacroEditController extends PhabricatorMacroController {
-  extends PhabricatorMacroController {
 
   private $id;
 
@@ -10,9 +9,8 @@ final class PhabricatorMacroEditController
   }
 
   public function processRequest() {
-
     $this->requireApplicationCapability(
-      PhabricatorMacroCapabilityManage::CAPABILITY);
+      PhabricatorMacroManageCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $user = $request->getUser();
@@ -262,4 +260,5 @@ final class PhabricatorMacroEditController
         'title' => $title,
       ));
   }
+
 }

src/applications/macro/controller/PhabricatorMacroViewController.php

@@ -118,9 +118,8 @@ final class PhabricatorMacroViewController
   }
 
   private function buildActionView(PhabricatorFileImageMacro $macro) {
-
     $can_manage = $this->hasApplicationCapability(
-      PhabricatorMacroCapabilityManage::CAPABILITY);
+      PhabricatorMacroManageCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $view = id(new PhabricatorActionListView())

src/applications/maniphest/application/PhabricatorManiphestApplication.php

@@ -104,18 +104,18 @@ final class PhabricatorManiphestApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      ManiphestCapabilityDefaultView::CAPABILITY => array(
+      ManiphestDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created tasks.'),
       ),
-      ManiphestCapabilityDefaultEdit::CAPABILITY => array(
+      ManiphestDefaultEditCapability::CAPABILITY => array(
         'caption' => pht('Default edit policy for newly created tasks.'),
       ),
-      ManiphestCapabilityEditStatus::CAPABILITY => array(),
+      ManiphestEditStatusCapability::CAPABILITY => array(),
-      ManiphestCapabilityEditAssign::CAPABILITY => array(),
+      ManiphestEditAssignCapability::CAPABILITY => array(),
-      ManiphestCapabilityEditPolicies::CAPABILITY => array(),
+      ManiphestEditPoliciesCapability::CAPABILITY => array(),
-      ManiphestCapabilityEditPriority::CAPABILITY => array(),
+      ManiphestEditPriorityCapability::CAPABILITY => array(),
-      ManiphestCapabilityEditProjects::CAPABILITY => array(),
+      ManiphestEditProjectsCapability::CAPABILITY => array(),
-      ManiphestCapabilityBulkEdit::CAPABILITY => array(),
+      ManiphestBulkEditCapability::CAPABILITY => array(),
     );
   }
 

src/applications/maniphest/capability/ManiphestBulkEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ManiphestCapabilityBulkEdit
+final class ManiphestBulkEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.bulk';
 

src/applications/maniphest/capability/ManiphestDefaultEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ManiphestCapabilityDefaultEdit
+final class ManiphestDefaultEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.default.edit';
 

src/applications/maniphest/capability/ManiphestDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ManiphestCapabilityDefaultView
+final class ManiphestDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.default.view';
 

src/applications/maniphest/capability/ManiphestEditAssignCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ManiphestCapabilityEditAssign
+final class ManiphestEditAssignCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.assign';
 

src/applications/maniphest/capability/ManiphestEditPoliciesCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class ManiphestCapabilityEditPolicies
+final class ManiphestEditPoliciesCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.policies';

src/applications/maniphest/capability/ManiphestEditPriorityCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class ManiphestCapabilityEditPriority
+final class ManiphestEditPriorityCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.priority';

src/applications/maniphest/capability/ManiphestEditProjectsCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class ManiphestCapabilityEditProjects
+final class ManiphestEditProjectsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.projects';

src/applications/maniphest/capability/ManiphestEditStatusCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class ManiphestCapabilityEditStatus
+final class ManiphestEditStatusCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'maniphest.edit.status';
 

src/applications/maniphest/controller/ManiphestBatchEditController.php

@@ -4,7 +4,7 @@ final class ManiphestBatchEditController extends ManiphestController {
 
   public function processRequest() {
     $this->requireApplicationCapability(
-      ManiphestCapabilityBulkEdit::CAPABILITY);
+      ManiphestBulkEditCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $user = $request->getUser();

src/applications/maniphest/controller/ManiphestTaskDetailController.php

@@ -13,7 +13,6 @@ final class ManiphestTaskDetailController extends ManiphestController {
   }
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
 
@@ -162,13 +161,13 @@ final class ManiphestTaskDetailController extends ManiphestController {
 
     $requires = array(
       ManiphestTransaction::TYPE_OWNER =>
-        ManiphestCapabilityEditAssign::CAPABILITY,
+        ManiphestEditAssignCapability::CAPABILITY,
       ManiphestTransaction::TYPE_PRIORITY =>
-        ManiphestCapabilityEditPriority::CAPABILITY,
+        ManiphestEditPriorityCapability::CAPABILITY,
       ManiphestTransaction::TYPE_PROJECTS =>
-        ManiphestCapabilityEditProjects::CAPABILITY,
+        ManiphestEditProjectsCapability::CAPABILITY,
       ManiphestTransaction::TYPE_STATUS =>
-        ManiphestCapabilityEditStatus::CAPABILITY,
+        ManiphestEditStatusCapability::CAPABILITY,
     );
 
     foreach ($transaction_types as $type => $name) {

src/applications/maniphest/controller/ManiphestTaskEditController.php

@@ -9,21 +9,20 @@ final class ManiphestTaskEditController extends ManiphestController {
   }
 
   public function processRequest() {
-
     $request = $this->getRequest();
     $user = $request->getUser();
     $response_type = $request->getStr('responseType', 'task');
 
     $can_edit_assign = $this->hasApplicationCapability(
-      ManiphestCapabilityEditAssign::CAPABILITY);
+      ManiphestEditAssignCapability::CAPABILITY);
     $can_edit_policies = $this->hasApplicationCapability(
-      ManiphestCapabilityEditPolicies::CAPABILITY);
+      ManiphestEditPoliciesCapability::CAPABILITY);
     $can_edit_priority = $this->hasApplicationCapability(
-      ManiphestCapabilityEditPriority::CAPABILITY);
+      ManiphestEditPriorityCapability::CAPABILITY);
     $can_edit_projects = $this->hasApplicationCapability(
-      ManiphestCapabilityEditProjects::CAPABILITY);
+      ManiphestEditProjectsCapability::CAPABILITY);
     $can_edit_status = $this->hasApplicationCapability(
-      ManiphestCapabilityEditStatus::CAPABILITY);
+      ManiphestEditStatusCapability::CAPABILITY);
 
     $parent_task = null;
     $template_id = null;
@@ -750,4 +749,5 @@ final class ManiphestTaskEditController extends ManiphestController {
         'pageObjects' => $page_objects,
       ));
   }
+
 }

src/applications/maniphest/editor/ManiphestTransactionEditor.php

@@ -432,15 +432,15 @@ final class ManiphestTransactionEditor
 
     $app_capability_map = array(
       ManiphestTransaction::TYPE_PRIORITY =>
-        ManiphestCapabilityEditPriority::CAPABILITY,
+        ManiphestEditPriorityCapability::CAPABILITY,
       ManiphestTransaction::TYPE_STATUS =>
-        ManiphestCapabilityEditStatus::CAPABILITY,
+        ManiphestEditStatusCapability::CAPABILITY,
       ManiphestTransaction::TYPE_OWNER =>
-        ManiphestCapabilityEditAssign::CAPABILITY,
+        ManiphestEditAssignCapability::CAPABILITY,
       PhabricatorTransactions::TYPE_EDIT_POLICY =>
-        ManiphestCapabilityEditPolicies::CAPABILITY,
+        ManiphestEditPoliciesCapability::CAPABILITY,
       PhabricatorTransactions::TYPE_VIEW_POLICY =>
-        ManiphestCapabilityEditPolicies::CAPABILITY,
+        ManiphestEditPoliciesCapability::CAPABILITY,
     );
 
 
@@ -450,7 +450,7 @@ final class ManiphestTransactionEditor
     if ($transaction_type == PhabricatorTransactions::TYPE_EDGE) {
       switch ($xaction->getMetadataValue('edge:type')) {
         case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
-          $app_capability = ManiphestCapabilityEditProjects::CAPABILITY;
+          $app_capability = ManiphestEditProjectsCapability::CAPABILITY;
           break;
       }
     } else {

src/applications/maniphest/query/ManiphestTaskSearchEngine.php

@@ -539,12 +539,12 @@ final class ManiphestTaskSearchEngine
       $can_edit_priority = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $this->getApplication(),
-        ManiphestCapabilityEditPriority::CAPABILITY);
+        ManiphestEditPriorityCapability::CAPABILITY);
 
       $can_bulk_edit = PhabricatorPolicyFilter::hasCapability(
         $viewer,
         $this->getApplication(),
-        ManiphestCapabilityBulkEdit::CAPABILITY);
+        ManiphestBulkEditCapability::CAPABILITY);
     }
 
     return id(new ManiphestTaskResultListView())

src/applications/maniphest/storage/ManiphestTask.php

@@ -45,8 +45,8 @@ final class ManiphestTask extends ManiphestDAO
       ->withClasses(array('PhabricatorManiphestApplication'))
       ->executeOne();
 
-    $view_policy = $app->getPolicy(ManiphestCapabilityDefaultView::CAPABILITY);
+    $view_policy = $app->getPolicy(ManiphestDefaultViewCapability::CAPABILITY);
-    $edit_policy = $app->getPolicy(ManiphestCapabilityDefaultEdit::CAPABILITY);
+    $edit_policy = $app->getPolicy(ManiphestDefaultEditCapability::CAPABILITY);
 
     return id(new ManiphestTask())
       ->setStatus(ManiphestTaskStatus::getDefaultStatus())

src/applications/nuance/application/PhabricatorNuanceApplication.php

@@ -64,13 +64,13 @@ final class PhabricatorNuanceApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      NuanceCapabilitySourceDefaultView::CAPABILITY => array(
+      NuanceSourceDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created sources.'),
       ),
-      NuanceCapabilitySourceDefaultEdit::CAPABILITY => array(
+      NuanceSourceDefaultEditCapability::CAPABILITY => array(
         'caption' => pht('Default edit policy for newly created sources.'),
       ),
-      NuanceCapabilitySourceManage::CAPABILITY => array(),
+      NuanceSourceManageCapability::CAPABILITY => array(),
     );
   }
 

src/applications/nuance/capability/NuanceSourceDefaultEditCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class NuanceCapabilitySourceDefaultEdit
+final class NuanceSourceDefaultEditCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.default.edit';

src/applications/nuance/capability/NuanceSourceDefaultViewCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class NuanceCapabilitySourceDefaultView
+final class NuanceSourceDefaultViewCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.default.view';

src/applications/nuance/capability/NuanceSourceManageCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class NuanceCapabilitySourceManage
+final class NuanceSourceManageCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'nuance.source.manage';
 

src/applications/nuance/controller/NuanceSourceEditController.php

@@ -18,7 +18,7 @@ final class NuanceSourceEditController extends NuanceController {
 
   public function processRequest() {
     $can_edit = $this->requireApplicationCapability(
-      NuanceCapabilitySourceManage::CAPABILITY);
+      NuanceSourceManageCapability::CAPABILITY);
 
     $request = $this->getRequest();
     $user = $request->getUser();

src/applications/nuance/storage/NuanceSource.php

@@ -41,9 +41,9 @@ final class NuanceSource extends NuanceDAO
       ->executeOne();
 
     $view_policy = $app->getPolicy(
-      NuanceCapabilitySourceDefaultView::CAPABILITY);
+      NuanceSourceDefaultViewCapability::CAPABILITY);
     $edit_policy = $app->getPolicy(
-      NuanceCapabilitySourceDefaultEdit::CAPABILITY);
+      NuanceSourceDefaultEditCapability::CAPABILITY);
 
     $definitions = NuanceSourceDefinition::getAllDefinitions();
     $lucky_definition = head($definitions);

src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php

@@ -58,7 +58,7 @@ final class PhabricatorOAuthServerApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      PhabricatorOAuthServerCapabilityCreateClients::CAPABILITY => array(
+      PhabricatorOAuthServerCreateClientsCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );

src/applications/oauthserver/capability/PhabricatorOAuthServerCreateClientsCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorOAuthServerCapabilityCreateClients
+final class PhabricatorOAuthServerCreateClientsCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'oauthserver.create';

src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php

@@ -29,7 +29,7 @@ final class PhabricatorOAuthClientEditController
       $is_new = false;
     } else {
       $this->requireApplicationCapability(
-        PhabricatorOAuthServerCapabilityCreateClients::CAPABILITY);
+        PhabricatorOAuthServerCreateClientsCapability::CAPABILITY);
 
       $client = PhabricatorOAuthServerClient::initializeNewClient($viewer);
 

src/applications/paste/application/PhabricatorPasteApplication.php

@@ -47,7 +47,7 @@ final class PhabricatorPasteApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      PasteCapabilityDefaultView::CAPABILITY => array(
+      PasteDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created pastes.'),
       ),
     );

src/applications/paste/capability/PasteDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PasteCapabilityDefaultView
+final class PasteDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'paste.default.view';
 

src/applications/paste/storage/PhabricatorPaste.php

@@ -25,7 +25,7 @@ final class PhabricatorPaste extends PhabricatorPasteDAO
       ->withClasses(array('PhabricatorPasteApplication'))
       ->executeOne();
 
-    $view_policy = $app->getPolicy(PasteCapabilityDefaultView::CAPABILITY);
+    $view_policy = $app->getPolicy(PasteDefaultViewCapability::CAPABILITY);
 
     return id(new PhabricatorPaste())
       ->setTitle('')

src/applications/people/application/PhabricatorPeopleApplication.php

@@ -76,10 +76,9 @@ final class PhabricatorPeopleApplication extends PhabricatorApplication {
     );
   }
 
-
   protected function getCustomCapabilities() {
     return array(
-      PeopleCapabilityBrowseUserDirectory::CAPABILITY => array(),
+      PeopleBrowseUserDirectoryCapability::CAPABILITY => array(),
     );
   }
 

src/applications/people/capability/PeopleBrowseUserDirectoryCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PeopleCapabilityBrowseUserDirectory
+final class PeopleBrowseUserDirectoryCapability
   extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'people.browse';
@@ -18,8 +18,7 @@ final class PeopleCapabilityBrowseUserDirectory
   }
 
   public function describeCapabilityRejection() {
-    return pht(
+    return pht('You do not have permission to browse the user directory.');
-      'You do not have permission to browse the user directory.');
   }
 
 }

src/applications/people/controller/PhabricatorPeopleListController.php

@@ -22,7 +22,7 @@ final class PhabricatorPeopleListController
     $viewer = $request->getUser();
 
     $this->requireApplicationCapability(
-      PeopleCapabilityBrowseUserDirectory::CAPABILITY);
+      PeopleBrowseUserDirectoryCapability::CAPABILITY);
 
     $controller = id(new PhabricatorApplicationSearchController($request))
       ->setQueryKey($this->key)

src/applications/people/query/PhabricatorPeopleSearchEngine.php

@@ -46,7 +46,7 @@ final class PhabricatorPeopleSearchEngine
     $can_browse = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $this->getApplication(),
-      PeopleCapabilityBrowseUserDirectory::CAPABILITY);
+      PeopleBrowseUserDirectoryCapability::CAPABILITY);
     if (!$can_browse) {
       $query->withPHIDs(array($viewer->getPHID()));
     }

src/applications/pholio/application/PhabricatorPholioApplication.php

@@ -72,8 +72,8 @@ final class PhabricatorPholioApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      PholioCapabilityDefaultView::CAPABILITY => array(),
+      PholioDefaultViewCapability::CAPABILITY => array(),
-      PholioCapabilityDefaultEdit::CAPABILITY => array(),
+      PholioDefaultEditCapability::CAPABILITY => array(),
     );
   }
 

src/applications/pholio/capability/PholioDefaultEditCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PholioCapabilityDefaultEdit
+final class PholioDefaultEditCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'pholio.default.edit';
 

src/applications/pholio/capability/PholioDefaultViewCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PholioCapabilityDefaultView
+final class PholioDefaultViewCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'pholio.default.view';
 

src/applications/pholio/storage/PholioMock.php

@@ -35,8 +35,8 @@ final class PholioMock extends PholioDAO
       ->withClasses(array('PhabricatorPholioApplication'))
       ->executeOne();
 
-    $view_policy = $app->getPolicy(PholioCapabilityDefaultView::CAPABILITY);
+    $view_policy = $app->getPolicy(PholioDefaultViewCapability::CAPABILITY);
-    $edit_policy = $app->getPolicy(PholioCapabilityDefaultEdit::CAPABILITY);
+    $edit_policy = $app->getPolicy(PholioDefaultEditCapability::CAPABILITY);
 
     return id(new PholioMock())
       ->setAuthorPHID($actor->getPHID())

src/applications/phragment/application/PhabricatorPhragmentApplication.php

@@ -63,7 +63,7 @@ final class PhabricatorPhragmentApplication extends PhabricatorApplication {
 
   protected function getCustomCapabilities() {
     return array(
-      PhragmentCapabilityCanCreate::CAPABILITY => array(),
+      PhragmentCanCreateCapability::CAPABILITY => array(),
     );
   }
 

src/applications/phragment/capability/PhragmentCanCreateCapability.php

@@ -1,7 +1,6 @@
 <?php
 
-final class PhragmentCapabilityCanCreate
+final class PhragmentCanCreateCapability extends PhabricatorPolicyCapability {
-  extends PhabricatorPolicyCapability {
 
   const CAPABILITY = 'phragment.create';
 

src/applications/phragment/controller/PhragmentBrowseController.php

@@ -29,7 +29,7 @@ final class PhragmentBrowseController extends PhragmentController {
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     if ($this->hasApplicationCapability(
-      PhragmentCapabilityCanCreate::CAPABILITY)) {
+      PhragmentCanCreateCapability::CAPABILITY)) {
       $crumbs->addAction(
         id(new PHUIListItemView())
           ->setName(pht('Create Fragment'))

src/applications/phragment/controller/PhragmentHistoryController.php

@@ -26,7 +26,7 @@ final class PhragmentHistoryController extends PhragmentController {
 
     $crumbs = $this->buildApplicationCrumbsWithPath($parents);
     if ($this->hasApplicationCapability(
-      PhragmentCapabilityCanCreate::CAPABILITY)) {
+      PhragmentCanCreateCapability::CAPABILITY)) {
       $crumbs->addAction(
         id(new PHUIListItemView())
           ->setName(pht('Create Fragment'))

src/applications/policy/capability/PhabricatorPolicyCanEditCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorPolicyCapabilityCanEdit
+final class PhabricatorPolicyCanEditCapability
   extends PhabricatorPolicyCapability {
 
   public function getCapabilityKey() {

src/applications/policy/capability/PhabricatorPolicyCanJoinCapability.php

@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorPolicyCapabilityCanJoin
+final class PhabricatorPolicyCanJoinCapability
   extends PhabricatorPolicyCapability {
 
   public function getCapabilityKey() {