diff --git a/resources/sql/autopatches/20150102.policyname.php b/resources/sql/autopatches/20150102.policyname.php
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20150102.policyname.php
@@ -0,0 +1,38 @@
+<?php
+
+$policies = array(
+  'Administrators',
+  'LegalpadSignature',
+  'LunarPhase',
+  'Projects',
+  'Users',
+);
+$map = array();
+
+foreach ($policies as $policy) {
+  $old_name = "PhabricatorPolicyRule{$policy}";
+  $new_name = "Phabricator{$policy}PolicyRule";
+  $map[$old_name] = $new_name;
+}
+
+echo "Migrating policies...\n";
+$table = new PhabricatorPolicy();
+$conn_w = $table->establishConnection('w');
+
+foreach (new LiskMigrationIterator($table) as $policy) {
+  $old_rules = $policy->getRules();
+  $new_rules = array();
+
+  foreach ($old_rules as $rule) {
+    $existing_rule = $rule['rule'];
+    $rule['rule'] = idx($map, $existing_rule, $existing_rule);
+    $new_rules[] = $rule;
+  }
+
+  queryfx(
+    $conn_w,
+    'UPDATE %T SET rules = %s WHERE id = %d',
+    $table->getTableName(),
+    json_encode($new_rules),
+    $policy->getID());
+}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1230,6 +1230,7 @@
     'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php',
     'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php',
     'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php',
+    'PhabricatorAdministratorsPolicyRule' => 'applications/policy/rule/PhabricatorAdministratorsPolicyRule.php',
     'PhabricatorAllCapsTranslation' => 'infrastructure/internationalization/translation/PhabricatorAllCapsTranslation.php',
     'PhabricatorAlmanacApplication' => 'applications/almanac/application/PhabricatorAlmanacApplication.php',
     'PhabricatorAmazonAuthProvider' => 'applications/auth/provider/PhabricatorAmazonAuthProvider.php',
@@ -1857,6 +1858,7 @@
     'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
     'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
     'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php',
+    'PhabricatorLegalpadSignaturePolicyRule' => 'applications/policy/rule/PhabricatorLegalpadSignaturePolicyRule.php',
     'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
     'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
     'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
@@ -1866,6 +1868,7 @@
     'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
     'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
     'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
+    'PhabricatorLunarPhasePolicyRule' => 'applications/policy/rule/PhabricatorLunarPhasePolicyRule.php',
     'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
     'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
     'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
@@ -2154,11 +2157,6 @@
     'PhabricatorPolicyPHIDTypePolicy' => 'applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php',
     'PhabricatorPolicyQuery' => 'applications/policy/query/PhabricatorPolicyQuery.php',
     'PhabricatorPolicyRule' => 'applications/policy/rule/PhabricatorPolicyRule.php',
-    'PhabricatorPolicyRuleAdministrators' => 'applications/policy/rule/PhabricatorPolicyRuleAdministrators.php',
-    'PhabricatorPolicyRuleLegalpadSignature' => 'applications/policy/rule/PhabricatorPolicyRuleLegalpadSignature.php',
-    'PhabricatorPolicyRuleLunarPhase' => 'applications/policy/rule/PhabricatorPolicyRuleLunarPhase.php',
-    'PhabricatorPolicyRuleProjects' => 'applications/policy/rule/PhabricatorPolicyRuleProjects.php',
-    'PhabricatorPolicyRuleUsers' => 'applications/policy/rule/PhabricatorPolicyRuleUsers.php',
     'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
     'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
     'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
@@ -2224,6 +2222,7 @@
     'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
     'PhabricatorProjectWatchController' => 'applications/project/controller/PhabricatorProjectWatchController.php',
     'PhabricatorProjectWikiExplainController' => 'applications/project/controller/PhabricatorProjectWikiExplainController.php',
+    'PhabricatorProjectsPolicyRule' => 'applications/policy/rule/PhabricatorProjectsPolicyRule.php',
     'PhabricatorPygmentSetupCheck' => 'applications/config/check/PhabricatorPygmentSetupCheck.php',
     'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
     'PhabricatorRecaptchaConfigOptions' => 'applications/config/option/PhabricatorRecaptchaConfigOptions.php',
@@ -2558,6 +2557,7 @@
     'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
     'PhabricatorUserTitleField' => 'applications/people/customfield/PhabricatorUserTitleField.php',
     'PhabricatorUserTransaction' => 'applications/people/storage/PhabricatorUserTransaction.php',
+    'PhabricatorUsersPolicyRule' => 'applications/policy/rule/PhabricatorUsersPolicyRule.php',
     'PhabricatorVCSResponse' => 'applications/repository/response/PhabricatorVCSResponse.php',
     'PhabricatorWatcherHasObjectEdgeType' => 'applications/transactions/edges/PhabricatorWatcherHasObjectEdgeType.php',
     'PhabricatorWordPressAuthProvider' => 'applications/auth/provider/PhabricatorWordPressAuthProvider.php',
@@ -4383,6 +4383,7 @@
     'PhabricatorActionListView' => 'AphrontView',
     'PhabricatorActionView' => 'AphrontView',
     'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel',
+    'PhabricatorAdministratorsPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorAllCapsTranslation' => 'PhabricatorTranslation',
     'PhabricatorAlmanacApplication' => 'PhabricatorApplication',
     'PhabricatorAmazonAuthProvider' => 'PhabricatorOAuth2AuthProvider',
@@ -5058,6 +5059,7 @@
     'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
     'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType',
+    'PhabricatorLegalpadSignaturePolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
     'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
@@ -5065,6 +5067,7 @@
     'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
     'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
     'PhabricatorLogoutController' => 'PhabricatorAuthController',
+    'PhabricatorLunarPhasePolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorMacroApplication' => 'PhabricatorApplication',
     'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
     'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
@@ -5353,11 +5356,6 @@
     'PhabricatorPolicyManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorPolicyPHIDTypePolicy' => 'PhabricatorPHIDType',
     'PhabricatorPolicyQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhabricatorPolicyRuleAdministrators' => 'PhabricatorPolicyRule',
-    'PhabricatorPolicyRuleLegalpadSignature' => 'PhabricatorPolicyRule',
-    'PhabricatorPolicyRuleLunarPhase' => 'PhabricatorPolicyRule',
-    'PhabricatorPolicyRuleProjects' => 'PhabricatorPolicyRule',
-    'PhabricatorPolicyRuleUsers' => 'PhabricatorPolicyRule',
     'PhabricatorPolicyTestCase' => 'PhabricatorTestCase',
     'PhabricatorPolicyTestObject' => 'PhabricatorPolicyInterface',
     'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
@@ -5443,6 +5441,7 @@
     'PhabricatorProjectUpdateController' => 'PhabricatorProjectController',
     'PhabricatorProjectWatchController' => 'PhabricatorProjectController',
     'PhabricatorProjectWikiExplainController' => 'PhabricatorProjectController',
+    'PhabricatorProjectsPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorPygmentSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorRecaptchaConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorRedirectController' => 'PhabricatorController',
@@ -5811,6 +5810,7 @@
     'PhabricatorUserTestCase' => 'PhabricatorTestCase',
     'PhabricatorUserTitleField' => 'PhabricatorUserCustomField',
     'PhabricatorUserTransaction' => 'PhabricatorApplicationTransaction',
+    'PhabricatorUsersPolicyRule' => 'PhabricatorPolicyRule',
     'PhabricatorVCSResponse' => 'AphrontResponse',
     'PhabricatorWatcherHasObjectEdgeType' => 'PhabricatorEdgeType',
     'PhabricatorWordPressAuthProvider' => 'PhabricatorOAuth2AuthProvider',
diff --git a/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php b/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
--- a/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
+++ b/src/applications/policy/__tests__/PhabricatorPolicyDataTestCase.php
@@ -48,7 +48,7 @@
         array(
           array(
             'action' => PhabricatorPolicy::ACTION_ALLOW,
-            'rule' => 'PhabricatorPolicyRuleUsers',
+            'rule' => 'PhabricatorUsersPolicyRule',
             'value' => array($user_a->getPHID()),
           ),
         ))
@@ -84,7 +84,7 @@
         array(
           array(
             'action' => PhabricatorPolicy::ACTION_ALLOW,
-            'rule' => 'PhabricatorPolicyRuleAdministrators',
+            'rule' => 'PhabricatorAdministratorsPolicyRule',
             'value' => null,
           ),
         ))
@@ -118,7 +118,7 @@
         array(
           array(
             'action' => PhabricatorPolicy::ACTION_ALLOW,
-            'rule' => 'PhabricatorPolicyRuleLunarPhase',
+            'rule' => 'PhabricatorLunarPhasePolicyRule',
             'value' => 'new',
           ),
         ))
diff --git a/src/applications/policy/rule/PhabricatorPolicyRuleAdministrators.php b/src/applications/policy/rule/PhabricatorAdministratorsPolicyRule.php
rename from src/applications/policy/rule/PhabricatorPolicyRuleAdministrators.php
rename to src/applications/policy/rule/PhabricatorAdministratorsPolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRuleAdministrators.php
+++ b/src/applications/policy/rule/PhabricatorAdministratorsPolicyRule.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorPolicyRuleAdministrators
-  extends PhabricatorPolicyRule {
+final class PhabricatorAdministratorsPolicyRule extends PhabricatorPolicyRule {
 
   public function getRuleDescription() {
     return pht('administrators');
diff --git a/src/applications/policy/rule/PhabricatorPolicyRuleLegalpadSignature.php b/src/applications/policy/rule/PhabricatorLegalpadSignaturePolicyRule.php
rename from src/applications/policy/rule/PhabricatorPolicyRuleLegalpadSignature.php
rename to src/applications/policy/rule/PhabricatorLegalpadSignaturePolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRuleLegalpadSignature.php
+++ b/src/applications/policy/rule/PhabricatorLegalpadSignaturePolicyRule.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorPolicyRuleLegalpadSignature
+final class PhabricatorLegalpadSignaturePolicyRule
   extends PhabricatorPolicyRule {
 
   private $signatures = array();
diff --git a/src/applications/policy/rule/PhabricatorPolicyRuleLunarPhase.php b/src/applications/policy/rule/PhabricatorLunarPhasePolicyRule.php
rename from src/applications/policy/rule/PhabricatorPolicyRuleLunarPhase.php
rename to src/applications/policy/rule/PhabricatorLunarPhasePolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRuleLunarPhase.php
+++ b/src/applications/policy/rule/PhabricatorLunarPhasePolicyRule.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorPolicyRuleLunarPhase
-  extends PhabricatorPolicyRule {
+final class PhabricatorLunarPhasePolicyRule extends PhabricatorPolicyRule {
 
   const PHASE_FULL = 'full';
   const PHASE_NEW = 'new';
diff --git a/src/applications/policy/rule/PhabricatorPolicyRuleProjects.php b/src/applications/policy/rule/PhabricatorProjectsPolicyRule.php
rename from src/applications/policy/rule/PhabricatorPolicyRuleProjects.php
rename to src/applications/policy/rule/PhabricatorProjectsPolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRuleProjects.php
+++ b/src/applications/policy/rule/PhabricatorProjectsPolicyRule.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorPolicyRuleProjects
-  extends PhabricatorPolicyRule {
+final class PhabricatorProjectsPolicyRule extends PhabricatorPolicyRule {
 
   private $memberships = array();
 
diff --git a/src/applications/policy/rule/PhabricatorPolicyRuleUsers.php b/src/applications/policy/rule/PhabricatorUsersPolicyRule.php
rename from src/applications/policy/rule/PhabricatorPolicyRuleUsers.php
rename to src/applications/policy/rule/PhabricatorUsersPolicyRule.php
--- a/src/applications/policy/rule/PhabricatorPolicyRuleUsers.php
+++ b/src/applications/policy/rule/PhabricatorUsersPolicyRule.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorPolicyRuleUsers
-  extends PhabricatorPolicyRule {
+final class PhabricatorUsersPolicyRule extends PhabricatorPolicyRule {
 
   public function getRuleDescription() {
     return pht('users');