diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1f6d2a9c5c..b216b0f4a9 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1625,16 +1625,16 @@ phutil_register_library_map(array(
     'PhabricatorDashboardPanelTransactionEditor' => 'applications/dashboard/editor/PhabricatorDashboardPanelTransactionEditor.php',
     'PhabricatorDashboardPanelTransactionQuery' => 'applications/dashboard/query/PhabricatorDashboardPanelTransactionQuery.php',
     'PhabricatorDashboardPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelType.php',
-    'PhabricatorDashboardPanelTypeQuery' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelTypeQuery.php',
-    'PhabricatorDashboardPanelTypeTabs' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelTypeTabs.php',
-    'PhabricatorDashboardPanelTypeText' => 'applications/dashboard/paneltype/PhabricatorDashboardPanelTypeText.php',
     'PhabricatorDashboardPanelViewController' => 'applications/dashboard/controller/PhabricatorDashboardPanelViewController.php',
     'PhabricatorDashboardQuery' => 'applications/dashboard/query/PhabricatorDashboardQuery.php',
+    'PhabricatorDashboardQueryPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php',
     'PhabricatorDashboardRemarkupRule' => 'applications/dashboard/remarkup/PhabricatorDashboardRemarkupRule.php',
     'PhabricatorDashboardRemovePanelController' => 'applications/dashboard/controller/PhabricatorDashboardRemovePanelController.php',
     'PhabricatorDashboardRenderingEngine' => 'applications/dashboard/engine/PhabricatorDashboardRenderingEngine.php',
     'PhabricatorDashboardSchemaSpec' => 'applications/dashboard/storage/PhabricatorDashboardSchemaSpec.php',
     'PhabricatorDashboardSearchEngine' => 'applications/dashboard/query/PhabricatorDashboardSearchEngine.php',
+    'PhabricatorDashboardTabsPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php',
+    'PhabricatorDashboardTextPanelType' => 'applications/dashboard/paneltype/PhabricatorDashboardTextPanelType.php',
     'PhabricatorDashboardTransaction' => 'applications/dashboard/storage/PhabricatorDashboardTransaction.php',
     'PhabricatorDashboardTransactionEditor' => 'applications/dashboard/editor/PhabricatorDashboardTransactionEditor.php',
     'PhabricatorDashboardTransactionQuery' => 'applications/dashboard/query/PhabricatorDashboardTransactionQuery.php',
@@ -4815,16 +4815,16 @@ phutil_register_library_map(array(
     'PhabricatorDashboardPanelTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorDashboardPanelTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorDashboardPanelType' => 'Phobject',
-    'PhabricatorDashboardPanelTypeQuery' => 'PhabricatorDashboardPanelType',
-    'PhabricatorDashboardPanelTypeTabs' => 'PhabricatorDashboardPanelType',
-    'PhabricatorDashboardPanelTypeText' => 'PhabricatorDashboardPanelType',
     'PhabricatorDashboardPanelViewController' => 'PhabricatorDashboardController',
     'PhabricatorDashboardQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorDashboardQueryPanelType' => 'PhabricatorDashboardPanelType',
     'PhabricatorDashboardRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'PhabricatorDashboardRemovePanelController' => 'PhabricatorDashboardController',
     'PhabricatorDashboardRenderingEngine' => 'Phobject',
     'PhabricatorDashboardSchemaSpec' => 'PhabricatorConfigSchemaSpec',
     'PhabricatorDashboardSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhabricatorDashboardTabsPanelType' => 'PhabricatorDashboardPanelType',
+    'PhabricatorDashboardTextPanelType' => 'PhabricatorDashboardPanelType',
     'PhabricatorDashboardTransaction' => 'PhabricatorApplicationTransaction',
     'PhabricatorDashboardTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
     'PhabricatorDashboardTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeQuery.php b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
similarity index 98%
rename from src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeQuery.php
rename to src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
index 3bd0cd5cb5..1914ece0b9 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeQuery.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorDashboardPanelTypeQuery
+final class PhabricatorDashboardQueryPanelType
   extends PhabricatorDashboardPanelType {
 
   public function getPanelTypeKey() {
@@ -63,7 +63,6 @@ final class PhabricatorDashboardPanelTypeQuery
     }
   }
 
-
   public function renderPanelContent(
     PhabricatorUser $viewer,
     PhabricatorDashboardPanel $panel,
@@ -108,7 +107,6 @@ final class PhabricatorDashboardPanelTypeQuery
     return $engine->renderResults($results, $saved);
   }
 
-
   public function adjustPanelHeader(
     PhabricatorUser $viewer,
     PhabricatorDashboardPanel $panel,
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeTabs.php b/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
similarity index 96%
rename from src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeTabs.php
rename to src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
index 3a2318841a..4a0dae02f1 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeTabs.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardTabsPanelType.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorDashboardPanelTypeTabs
+final class PhabricatorDashboardTabsPanelType
   extends PhabricatorDashboardPanelType {
 
   public function getPanelTypeKey() {
@@ -12,8 +12,7 @@ final class PhabricatorDashboardPanelTypeTabs
   }
 
   public function getPanelTypeDescription() {
-    return pht(
-      'Use tabs to switch between several other panels.');
+    return pht('Use tabs to switch between several other panels.');
   }
 
   public function getFieldSpecifications() {
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeText.php b/src/applications/dashboard/paneltype/PhabricatorDashboardTextPanelType.php
similarity index 96%
rename from src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeText.php
rename to src/applications/dashboard/paneltype/PhabricatorDashboardTextPanelType.php
index 11e0e7e5d1..e9716f0868 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeText.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardTextPanelType.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorDashboardPanelTypeText
+final class PhabricatorDashboardTextPanelType
   extends PhabricatorDashboardPanelType {
 
   public function getPanelTypeKey() {