diff --git a/src/applications/almanac/phid/AlmanacBindingPHIDType.php b/src/applications/almanac/phid/AlmanacBindingPHIDType.php
index d8fcb510fb..db469690cd 100644
--- a/src/applications/almanac/phid/AlmanacBindingPHIDType.php
+++ b/src/applications/almanac/phid/AlmanacBindingPHIDType.php
@@ -12,6 +12,10 @@ final class AlmanacBindingPHIDType extends PhabricatorPHIDType {
     return new AlmanacBinding();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/almanac/phid/AlmanacDevicePHIDType.php b/src/applications/almanac/phid/AlmanacDevicePHIDType.php
index 8a1bb36a90..26c88a7a86 100644
--- a/src/applications/almanac/phid/AlmanacDevicePHIDType.php
+++ b/src/applications/almanac/phid/AlmanacDevicePHIDType.php
@@ -12,6 +12,10 @@ final class AlmanacDevicePHIDType extends PhabricatorPHIDType {
     return new AlmanacDevice();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/almanac/phid/AlmanacInterfacePHIDType.php b/src/applications/almanac/phid/AlmanacInterfacePHIDType.php
index 67f9b1664a..581e86e3be 100644
--- a/src/applications/almanac/phid/AlmanacInterfacePHIDType.php
+++ b/src/applications/almanac/phid/AlmanacInterfacePHIDType.php
@@ -12,6 +12,10 @@ final class AlmanacInterfacePHIDType extends PhabricatorPHIDType {
     return new AlmanacInterface();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/almanac/phid/AlmanacNetworkPHIDType.php b/src/applications/almanac/phid/AlmanacNetworkPHIDType.php
index e27efa5cd8..2264ce0e5f 100644
--- a/src/applications/almanac/phid/AlmanacNetworkPHIDType.php
+++ b/src/applications/almanac/phid/AlmanacNetworkPHIDType.php
@@ -12,6 +12,10 @@ final class AlmanacNetworkPHIDType extends PhabricatorPHIDType {
     return new AlmanacNetwork();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/almanac/phid/AlmanacServicePHIDType.php b/src/applications/almanac/phid/AlmanacServicePHIDType.php
index c64e089ce6..a64a229e94 100644
--- a/src/applications/almanac/phid/AlmanacServicePHIDType.php
+++ b/src/applications/almanac/phid/AlmanacServicePHIDType.php
@@ -12,6 +12,10 @@ final class AlmanacServicePHIDType extends PhabricatorPHIDType {
     return new AlmanacService();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php b/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
index ca21397fb6..2819c84572 100644
--- a/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
+++ b/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorAuthAuthFactorPHIDType extends PhabricatorPHIDType {
     return new PhabricatorAuthFactorConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php b/src/applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php
index b271183f5c..e91b66e647 100644
--- a/src/applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php
+++ b/src/applications/auth/phid/PhabricatorAuthAuthProviderPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorAuthAuthProviderPHIDType extends PhabricatorPHIDType {
     return new PhabricatorAuthProviderConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/auth/phid/PhabricatorAuthInvitePHIDType.php b/src/applications/auth/phid/PhabricatorAuthInvitePHIDType.php
index 0f1b205763..b633e10eab 100644
--- a/src/applications/auth/phid/PhabricatorAuthInvitePHIDType.php
+++ b/src/applications/auth/phid/PhabricatorAuthInvitePHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorAuthInvitePHIDType extends PhabricatorPHIDType {
     return new PhabricatorAuthInvite();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
index 7acc968f21..d37be2ef32 100644
--- a/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
+++ b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
@@ -8,14 +8,14 @@ final class PhabricatorCalendarEventPHIDType extends PhabricatorPHIDType {
     return pht('Event');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorCalendarApplication';
-  }
-
   public function newObject() {
     return new PhabricatorCalendarEvent();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorCalendarApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php b/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
index 161b1e42f4..95c543427f 100644
--- a/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
+++ b/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorConfigConfigPHIDType extends PhabricatorPHIDType {
     return new PhabricatorConfigEntry();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorConfigApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php b/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
index 852c5889ed..573d89c843 100644
--- a/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
+++ b/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorCountdownCountdownPHIDType extends PhabricatorPHIDType {
     return new PhabricatorCountdown();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorCountdownApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php b/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
index e097dc161d..1450e2aa68 100644
--- a/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
+++ b/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorDashboardDashboardPHIDType extends PhabricatorPHIDType {
     return new PhabricatorDashboard();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDashboardApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php b/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
index c4aec82b8e..49a5091412 100644
--- a/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
+++ b/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorDashboardPanelPHIDType extends PhabricatorPHIDType {
     return new PhabricatorDashboardPanel();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDashboardApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/differential/phid/DifferentialDiffPHIDType.php b/src/applications/differential/phid/DifferentialDiffPHIDType.php
index 887397d57f..746da368c7 100644
--- a/src/applications/differential/phid/DifferentialDiffPHIDType.php
+++ b/src/applications/differential/phid/DifferentialDiffPHIDType.php
@@ -12,6 +12,10 @@ final class DifferentialDiffPHIDType extends PhabricatorPHIDType {
     return new DifferentialDiff();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/differential/phid/DifferentialRevisionPHIDType.php b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
index a46dc71c65..b22c8b05cb 100644
--- a/src/applications/differential/phid/DifferentialRevisionPHIDType.php
+++ b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
@@ -8,14 +8,14 @@ final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {
     return pht('Differential Revision');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDifferentialApplication';
-  }
-
   public function newObject() {
     return new DifferentialRevision();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/drydock/phid/DrydockAuthorizationPHIDType.php b/src/applications/drydock/phid/DrydockAuthorizationPHIDType.php
index e518149945..058ccff6a9 100644
--- a/src/applications/drydock/phid/DrydockAuthorizationPHIDType.php
+++ b/src/applications/drydock/phid/DrydockAuthorizationPHIDType.php
@@ -12,6 +12,10 @@ final class DrydockAuthorizationPHIDType extends PhabricatorPHIDType {
     return new DrydockAuthorization();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/drydock/phid/DrydockBlueprintPHIDType.php b/src/applications/drydock/phid/DrydockBlueprintPHIDType.php
index e63f1294a7..ef286cf5f1 100644
--- a/src/applications/drydock/phid/DrydockBlueprintPHIDType.php
+++ b/src/applications/drydock/phid/DrydockBlueprintPHIDType.php
@@ -8,10 +8,6 @@ final class DrydockBlueprintPHIDType extends PhabricatorPHIDType {
     return pht('Blueprint');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-map-o';
   }
@@ -20,6 +16,10 @@ final class DrydockBlueprintPHIDType extends PhabricatorPHIDType {
     return new DrydockBlueprint();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/drydock/phid/DrydockLeasePHIDType.php b/src/applications/drydock/phid/DrydockLeasePHIDType.php
index fc921cee3a..faa751b0f1 100644
--- a/src/applications/drydock/phid/DrydockLeasePHIDType.php
+++ b/src/applications/drydock/phid/DrydockLeasePHIDType.php
@@ -8,10 +8,6 @@ final class DrydockLeasePHIDType extends PhabricatorPHIDType {
     return pht('Drydock Lease');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-link';
   }
@@ -20,6 +16,10 @@ final class DrydockLeasePHIDType extends PhabricatorPHIDType {
     return new DrydockLease();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php b/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
index d21efd8a86..0926f92388 100644
--- a/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
+++ b/src/applications/drydock/phid/DrydockRepositoryOperationPHIDType.php
@@ -12,6 +12,10 @@ final class DrydockRepositoryOperationPHIDType extends PhabricatorPHIDType {
     return new DrydockRepositoryOperation();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/drydock/phid/DrydockResourcePHIDType.php b/src/applications/drydock/phid/DrydockResourcePHIDType.php
index 966cf35abe..a36647964d 100644
--- a/src/applications/drydock/phid/DrydockResourcePHIDType.php
+++ b/src/applications/drydock/phid/DrydockResourcePHIDType.php
@@ -8,10 +8,6 @@ final class DrydockResourcePHIDType extends PhabricatorPHIDType {
     return pht('Drydock Resource');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-map';
   }
@@ -20,6 +16,10 @@ final class DrydockResourcePHIDType extends PhabricatorPHIDType {
     return new DrydockResource();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/files/phid/PhabricatorFileFilePHIDType.php b/src/applications/files/phid/PhabricatorFileFilePHIDType.php
index 7b74065535..c847c7f1a5 100644
--- a/src/applications/files/phid/PhabricatorFileFilePHIDType.php
+++ b/src/applications/files/phid/PhabricatorFileFilePHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorFileFilePHIDType extends PhabricatorPHIDType {
     return new PhabricatorFile();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorFilesApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/fund/phid/FundBackerPHIDType.php b/src/applications/fund/phid/FundBackerPHIDType.php
index f5f1258334..3feff6364a 100644
--- a/src/applications/fund/phid/FundBackerPHIDType.php
+++ b/src/applications/fund/phid/FundBackerPHIDType.php
@@ -12,6 +12,10 @@ final class FundBackerPHIDType extends PhabricatorPHIDType {
     return new FundInitiative();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorFundApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php
index 5c3eb992f7..29256afd96 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildArtifactPHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildArtifactPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildArtifact();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
index 5e2705a40a..c0fba81c43 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildLogPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildLog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
index 5669df4ee9..27551f13a8 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuild();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
index d2a733630a..86aacfb8d3 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
@@ -16,6 +16,10 @@ final class HarbormasterBuildPlanPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildPlan();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
index c3427fe46f..63e9bc6a12 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildStepPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildStep();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
index e16db13ccb..b20d6dc0a4 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildTargetPHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildTarget();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php b/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
index 8c854efdf6..c6ccabf515 100644
--- a/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
+++ b/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
@@ -12,6 +12,10 @@ final class HarbormasterBuildablePHIDType extends PhabricatorPHIDType {
     return new HarbormasterBuildable();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/herald/phid/HeraldRulePHIDType.php b/src/applications/herald/phid/HeraldRulePHIDType.php
index 4820eee62b..f8d5c25db4 100644
--- a/src/applications/herald/phid/HeraldRulePHIDType.php
+++ b/src/applications/herald/phid/HeraldRulePHIDType.php
@@ -12,6 +12,10 @@ final class HeraldRulePHIDType extends PhabricatorPHIDType {
     return new HeraldRule();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php b/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
index 5b1a4a9833..39c744f271 100644
--- a/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
+++ b/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
@@ -16,6 +16,10 @@ final class PhabricatorLegalpadDocumentPHIDType extends PhabricatorPHIDType {
     return new LegalpadDocument();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorLegalpadApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/maniphest/phid/ManiphestTaskPHIDType.php b/src/applications/maniphest/phid/ManiphestTaskPHIDType.php
index 719b4a8446..3b3c4a203f 100644
--- a/src/applications/maniphest/phid/ManiphestTaskPHIDType.php
+++ b/src/applications/maniphest/phid/ManiphestTaskPHIDType.php
@@ -8,14 +8,14 @@ final class ManiphestTaskPHIDType extends PhabricatorPHIDType {
     return pht('Maniphest Task');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorManiphestApplication';
-  }
-
   public function newObject() {
     return new ManiphestTask();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorManiphestApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php b/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
index aa2b21b967..d0b1f763a4 100644
--- a/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
+++ b/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
@@ -17,6 +17,10 @@ final class PhabricatorApplicationApplicationPHIDType
     return null;
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorApplicationsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php b/src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php
index 7117b50f8e..1436038fae 100644
--- a/src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php
+++ b/src/applications/metamta/phid/PhabricatorMetaMTAMailPHIDType.php
@@ -8,14 +8,14 @@ final class PhabricatorMetaMTAMailPHIDType extends PhabricatorPHIDType {
     return pht('MetaMTA Mail');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorMetaMTAApplication';
-  }
-
   public function newObject() {
     return new PhabricatorMetaMTAMail();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorMetaMTAApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/nuance/phid/NuanceItemPHIDType.php b/src/applications/nuance/phid/NuanceItemPHIDType.php
index e1068cc50d..f401c63594 100644
--- a/src/applications/nuance/phid/NuanceItemPHIDType.php
+++ b/src/applications/nuance/phid/NuanceItemPHIDType.php
@@ -12,6 +12,10 @@ final class NuanceItemPHIDType extends PhabricatorPHIDType {
     return new NuanceItem();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/nuance/phid/NuanceQueuePHIDType.php b/src/applications/nuance/phid/NuanceQueuePHIDType.php
index 13bcfa5d20..b51812320d 100644
--- a/src/applications/nuance/phid/NuanceQueuePHIDType.php
+++ b/src/applications/nuance/phid/NuanceQueuePHIDType.php
@@ -12,6 +12,10 @@ final class NuanceQueuePHIDType extends PhabricatorPHIDType {
     return new NuanceQueue();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/nuance/phid/NuanceRequestorPHIDType.php b/src/applications/nuance/phid/NuanceRequestorPHIDType.php
index 2cf06bbb10..a2442d3b48 100644
--- a/src/applications/nuance/phid/NuanceRequestorPHIDType.php
+++ b/src/applications/nuance/phid/NuanceRequestorPHIDType.php
@@ -12,6 +12,10 @@ final class NuanceRequestorPHIDType extends PhabricatorPHIDType {
     return new NuanceRequestor();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/nuance/phid/NuanceSourcePHIDType.php b/src/applications/nuance/phid/NuanceSourcePHIDType.php
index d259fe48a9..774939bf29 100644
--- a/src/applications/nuance/phid/NuanceSourcePHIDType.php
+++ b/src/applications/nuance/phid/NuanceSourcePHIDType.php
@@ -12,6 +12,10 @@ final class NuanceSourcePHIDType extends PhabricatorPHIDType {
     return new NuanceSource();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
index e3ff50a6f7..b2fc1554fd 100644
--- a/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
+++ b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
@@ -13,6 +13,10 @@ final class PhabricatorOAuthServerClientAuthorizationPHIDType
     return new PhabricatorOAuthClientAuthorization();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOAuthServerApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
index 81b8fdacde..a4d8834b96 100644
--- a/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
+++ b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorOAuthServerClientPHIDType extends PhabricatorPHIDType {
     return new PhabricatorOAuthServerClient();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOAuthServerApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
index b2492b0bef..fa667d4dcb 100644
--- a/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
+++ b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
@@ -16,6 +16,10 @@ final class PhabricatorOwnersPackagePHIDType extends PhabricatorPHIDType {
     return new PhabricatorOwnersPackage();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOwnersApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/paste/phid/PhabricatorPastePastePHIDType.php b/src/applications/paste/phid/PhabricatorPastePastePHIDType.php
index c07f902316..d08d52e2e1 100644
--- a/src/applications/paste/phid/PhabricatorPastePastePHIDType.php
+++ b/src/applications/paste/phid/PhabricatorPastePastePHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorPastePastePHIDType extends PhabricatorPHIDType {
     return new PhabricatorPaste();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPasteApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php b/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
index 9fd565700c..4be4cc5359 100644
--- a/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
+++ b/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorPeopleExternalPHIDType extends PhabricatorPHIDType {
     return new PhabricatorExternalAccount();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
index f09c75087e..0304173f90 100644
--- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
@@ -8,10 +8,6 @@ final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {
     return pht('User');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPeopleApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-user bluegrey';
   }
@@ -20,6 +16,10 @@ final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {
     return new PhabricatorUser();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php b/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
index 458da16c4d..18ea30aea8 100644
--- a/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
+++ b/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorPhameBlogPHIDType extends PhabricatorPHIDType {
     return new PhameBlog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhameApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php b/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
index e5eeef3715..5573f2db9f 100644
--- a/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
+++ b/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorPhamePostPHIDType extends PhabricatorPHIDType {
     return new PhamePost();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhameApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php b/src/applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php
index 1069b35793..93d8a47de7 100644
--- a/src/applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php
+++ b/src/applications/phid/PhabricatorMetaMTAApplicationEmailPHIDType.php
@@ -9,10 +9,6 @@ final class PhabricatorMetaMTAApplicationEmailPHIDType
     return pht('Application Email');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorMetaMTAApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-email bluegrey';
   }
@@ -21,6 +17,10 @@ final class PhabricatorMetaMTAApplicationEmailPHIDType
     return new PhabricatorMetaMTAApplicationEmail();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorMetaMTAApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phid/type/PhabricatorPHIDType.php b/src/applications/phid/type/PhabricatorPHIDType.php
index a8502b12f7..e39ff5f562 100644
--- a/src/applications/phid/type/PhabricatorPHIDType.php
+++ b/src/applications/phid/type/PhabricatorPHIDType.php
@@ -20,10 +20,6 @@ abstract class PhabricatorPHIDType extends Phobject {
 
   abstract public function getTypeName();
 
-  public function newObject() {
-    return null;
-  }
-
   public function getTypeIcon() {
     // Default to the application icon if the type doesn't specify one.
     $application_class = $this->getPHIDTypeApplicationClass();
@@ -35,6 +31,10 @@ abstract class PhabricatorPHIDType extends Phobject {
     return null;
   }
 
+  public function newObject() {
+    return null;
+  }
+
 
   /**
    * Get the class name for the application this type belongs to.
@@ -42,12 +42,7 @@ abstract class PhabricatorPHIDType extends Phobject {
    * @return string|null Class name of the corresponding application, or null
    *   if the type is not bound to an application.
    */
-  public function getPHIDTypeApplicationClass() {
-    // TODO: Some day this should probably be abstract, but for now it only
-    // affects global search and there's no real burning need to go classify
-    // every PHID type.
-    return null;
-  }
+  abstract public function getPHIDTypeApplicationClass();
 
   /**
    * Build a @{class:PhabricatorPolicyAwareQuery} to load objects of this type
diff --git a/src/applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php b/src/applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php
index e7707095ad..ec2d932047 100644
--- a/src/applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php
+++ b/src/applications/phid/type/__tests__/PhabricatorPHIDTypeTestCase.php
@@ -7,4 +7,16 @@ final class PhabricatorPHIDTypeTestCase extends PhutilTestCase {
     $this->assertTrue(true);
   }
 
+  public function testGetPHIDTypeApplicationClass() {
+    $types = PhabricatorPHIDType::getAllTypes();
+
+    foreach ($types as $type) {
+      $application_class = $type->getPHIDTypeApplicationClass();
+
+      if ($application_class !== null) {
+        $this->assertTrue(class_exists($application_class));
+      }
+    }
+  }
+
 }
diff --git a/src/applications/phlux/phid/PhluxVariablePHIDType.php b/src/applications/phlux/phid/PhluxVariablePHIDType.php
index 643025fd9c..97525c4052 100644
--- a/src/applications/phlux/phid/PhluxVariablePHIDType.php
+++ b/src/applications/phlux/phid/PhluxVariablePHIDType.php
@@ -12,6 +12,10 @@ final class PhluxVariablePHIDType extends PhabricatorPHIDType {
     return new PhluxVariable();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhluxApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/pholio/phid/PholioImagePHIDType.php b/src/applications/pholio/phid/PholioImagePHIDType.php
index 9278977b77..b28dbd64d5 100644
--- a/src/applications/pholio/phid/PholioImagePHIDType.php
+++ b/src/applications/pholio/phid/PholioImagePHIDType.php
@@ -12,6 +12,10 @@ final class PholioImagePHIDType extends PhabricatorPHIDType {
     return new PholioImage();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPholioApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/pholio/phid/PholioMockPHIDType.php b/src/applications/pholio/phid/PholioMockPHIDType.php
index e41f326e94..13ee4cb81f 100644
--- a/src/applications/pholio/phid/PholioMockPHIDType.php
+++ b/src/applications/pholio/phid/PholioMockPHIDType.php
@@ -8,14 +8,14 @@ final class PholioMockPHIDType extends PhabricatorPHIDType {
     return pht('Pholio Mock');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPholioApplication';
-  }
-
   public function newObject() {
     return new PholioMock();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPholioApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneAccountPHIDType.php b/src/applications/phortune/phid/PhortuneAccountPHIDType.php
index b9d1bee1a6..cf5f5d06f2 100644
--- a/src/applications/phortune/phid/PhortuneAccountPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneAccountPHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneAccountPHIDType extends PhabricatorPHIDType {
     return new PhortuneAccount();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneCartPHIDType.php b/src/applications/phortune/phid/PhortuneCartPHIDType.php
index f42e563cee..c805a4a921 100644
--- a/src/applications/phortune/phid/PhortuneCartPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneCartPHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneCartPHIDType extends PhabricatorPHIDType {
     return new PhortuneCart();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneChargePHIDType.php b/src/applications/phortune/phid/PhortuneChargePHIDType.php
index b88a605d0c..013db6ab1c 100644
--- a/src/applications/phortune/phid/PhortuneChargePHIDType.php
+++ b/src/applications/phortune/phid/PhortuneChargePHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneChargePHIDType extends PhabricatorPHIDType {
     return new PhortuneCharge();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneMerchantPHIDType.php b/src/applications/phortune/phid/PhortuneMerchantPHIDType.php
index a1b8b73871..941f704ab8 100644
--- a/src/applications/phortune/phid/PhortuneMerchantPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneMerchantPHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneMerchantPHIDType extends PhabricatorPHIDType {
     return new PhortuneMerchant();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php b/src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php
index 2df0a0acd5..7906f87414 100644
--- a/src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php
+++ b/src/applications/phortune/phid/PhortunePaymentMethodPHIDType.php
@@ -12,6 +12,10 @@ final class PhortunePaymentMethodPHIDType extends PhabricatorPHIDType {
     return new PhortunePaymentMethod();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortunePaymentProviderPHIDType.php b/src/applications/phortune/phid/PhortunePaymentProviderPHIDType.php
index 7391e71108..dc96d08648 100644
--- a/src/applications/phortune/phid/PhortunePaymentProviderPHIDType.php
+++ b/src/applications/phortune/phid/PhortunePaymentProviderPHIDType.php
@@ -12,6 +12,10 @@ final class PhortunePaymentProviderPHIDType extends PhabricatorPHIDType {
     return new PhortunePaymentProviderConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneProductPHIDType.php b/src/applications/phortune/phid/PhortuneProductPHIDType.php
index 7acbafe9a3..409377186f 100644
--- a/src/applications/phortune/phid/PhortuneProductPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneProductPHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneProductPHIDType extends PhabricatorPHIDType {
     return new PhortuneProduct();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortunePurchasePHIDType.php b/src/applications/phortune/phid/PhortunePurchasePHIDType.php
index b00faa585c..08f88b1d33 100644
--- a/src/applications/phortune/phid/PhortunePurchasePHIDType.php
+++ b/src/applications/phortune/phid/PhortunePurchasePHIDType.php
@@ -12,6 +12,10 @@ final class PhortunePurchasePHIDType extends PhabricatorPHIDType {
     return new PhortunePurchase();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phortune/phid/PhortuneSubscriptionPHIDType.php b/src/applications/phortune/phid/PhortuneSubscriptionPHIDType.php
index 9eafc4ed83..6d7275c62b 100644
--- a/src/applications/phortune/phid/PhortuneSubscriptionPHIDType.php
+++ b/src/applications/phortune/phid/PhortuneSubscriptionPHIDType.php
@@ -12,6 +12,10 @@ final class PhortuneSubscriptionPHIDType extends PhabricatorPHIDType {
     return new PhortuneSubscription();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phragment/phid/PhragmentFragmentPHIDType.php b/src/applications/phragment/phid/PhragmentFragmentPHIDType.php
index 3722b2fd69..2947bca98e 100644
--- a/src/applications/phragment/phid/PhragmentFragmentPHIDType.php
+++ b/src/applications/phragment/phid/PhragmentFragmentPHIDType.php
@@ -12,6 +12,10 @@ final class PhragmentFragmentPHIDType extends PhabricatorPHIDType {
     return new PhragmentFragment();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php b/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
index 2ab0240b5c..2fa00b15ce 100644
--- a/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
+++ b/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
@@ -12,6 +12,10 @@ final class PhragmentFragmentVersionPHIDType extends PhabricatorPHIDType {
     return new PhragmentFragmentVersion();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php b/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
index 060b37963c..d97026a601 100644
--- a/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
+++ b/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
@@ -12,6 +12,10 @@ final class PhragmentSnapshotPHIDType extends PhabricatorPHIDType {
     return new PhragmentSnapshot();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phriction/phid/PhrictionDocumentPHIDType.php b/src/applications/phriction/phid/PhrictionDocumentPHIDType.php
index 934dc73b30..57afdb84d6 100644
--- a/src/applications/phriction/phid/PhrictionDocumentPHIDType.php
+++ b/src/applications/phriction/phid/PhrictionDocumentPHIDType.php
@@ -8,14 +8,14 @@ final class PhrictionDocumentPHIDType extends PhabricatorPHIDType {
     return pht('Phriction Wiki Document');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPhrictionApplication';
-  }
-
   public function newObject() {
     return new PhrictionDocument();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhrictionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/phurl/phid/PhabricatorPhurlURLPHIDType.php b/src/applications/phurl/phid/PhabricatorPhurlURLPHIDType.php
index f273732b82..979b25c791 100644
--- a/src/applications/phurl/phid/PhabricatorPhurlURLPHIDType.php
+++ b/src/applications/phurl/phid/PhabricatorPhurlURLPHIDType.php
@@ -8,14 +8,14 @@ final class PhabricatorPhurlURLPHIDType extends PhabricatorPHIDType {
     return pht('URL');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPhurlApplication';
-  }
-
   public function newObject() {
     return new PhabricatorPhurlURL();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhurlApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php b/src/applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php
index 225aa22ac1..ed75561327 100644
--- a/src/applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php
+++ b/src/applications/policy/phid/PhabricatorPolicyPHIDTypePolicy.php
@@ -12,6 +12,10 @@ final class PhabricatorPolicyPHIDTypePolicy extends PhabricatorPHIDType {
     return new PhabricatorPolicy();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPolicyApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/ponder/phid/PonderQuestionPHIDType.php b/src/applications/ponder/phid/PonderQuestionPHIDType.php
index db1d5acff2..9bdd80aae6 100644
--- a/src/applications/ponder/phid/PonderQuestionPHIDType.php
+++ b/src/applications/ponder/phid/PonderQuestionPHIDType.php
@@ -8,14 +8,14 @@ final class PonderQuestionPHIDType extends PhabricatorPHIDType {
     return pht('Ponder Question');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPonderApplication';
-  }
-
   public function newObject() {
     return new PonderQuestion();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPonderApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php b/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
index 4ac0399cf7..07c7f7a0ee 100644
--- a/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
+++ b/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
@@ -8,12 +8,16 @@ final class PhabricatorProjectColumnPHIDType extends PhabricatorPHIDType {
     return pht('Project Column');
   }
 
+  public function getTypeIcon() {
+    return 'fa-columns bluegrey';
+  }
+
   public function newObject() {
     return new PhabricatorProjectColumn();
   }
 
-  public function getTypeIcon() {
-    return 'fa-columns bluegrey';
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorProjectApplication';
   }
 
   protected function buildQueryForObjects(
diff --git a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
index 5689be49ce..c3d9bdd3fb 100644
--- a/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
+++ b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
@@ -8,10 +8,6 @@ final class PhabricatorProjectProjectPHIDType extends PhabricatorPHIDType {
     return pht('Project');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorProjectApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-briefcase bluegrey';
   }
@@ -20,6 +16,10 @@ final class PhabricatorProjectProjectPHIDType extends PhabricatorPHIDType {
     return new PhabricatorProject();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorProjectApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/releeph/phid/ReleephBranchPHIDType.php b/src/applications/releeph/phid/ReleephBranchPHIDType.php
index 487f5eebb0..d3a545d0df 100644
--- a/src/applications/releeph/phid/ReleephBranchPHIDType.php
+++ b/src/applications/releeph/phid/ReleephBranchPHIDType.php
@@ -12,6 +12,10 @@ final class ReleephBranchPHIDType extends PhabricatorPHIDType {
     return new ReleephBranch();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/releeph/phid/ReleephProductPHIDType.php b/src/applications/releeph/phid/ReleephProductPHIDType.php
index 7e8079b309..c7979cfba3 100644
--- a/src/applications/releeph/phid/ReleephProductPHIDType.php
+++ b/src/applications/releeph/phid/ReleephProductPHIDType.php
@@ -12,6 +12,10 @@ final class ReleephProductPHIDType extends PhabricatorPHIDType {
     return new ReleephProject();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/releeph/phid/ReleephRequestPHIDType.php b/src/applications/releeph/phid/ReleephRequestPHIDType.php
index 202b146fe8..7bd853f984 100644
--- a/src/applications/releeph/phid/ReleephRequestPHIDType.php
+++ b/src/applications/releeph/phid/ReleephRequestPHIDType.php
@@ -12,6 +12,10 @@ final class ReleephRequestPHIDType extends PhabricatorPHIDType {
     return new ReleephRequest();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
index a176c5b7dd..0f62d523d2 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
@@ -8,14 +8,14 @@ final class PhabricatorRepositoryCommitPHIDType extends PhabricatorPHIDType {
     return pht('Diffusion Commit');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDiffusionApplication';
-  }
-
   public function newObject() {
     return new PhabricatorRepositoryCommit();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
index f10af8ac58..42737c7281 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorRepositoryMirrorPHIDType extends PhabricatorPHIDType {
     return new PhabricatorRepositoryMirror();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
index db02bd8c1f..364ce62e5d 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorRepositoryPushEventPHIDType extends PhabricatorPHIDType {
     return new PhabricatorRepositoryPushEvent();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
index 4a315ac004..6af117db19 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorRepositoryPushLogPHIDType extends PhabricatorPHIDType {
     return new PhabricatorRepositoryPushLog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
index d46a69dd33..5a3bca339d 100644
--- a/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
@@ -17,6 +17,10 @@ final class PhabricatorRepositoryRepositoryPHIDType
     return new PhabricatorRepository();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php b/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
index 927e6a3942..42ced85b22 100644
--- a/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
+++ b/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorSlowvotePollPHIDType extends PhabricatorPHIDType {
     return new PhabricatorSlowvotePoll();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorSlowvoteApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php b/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
index 6645c7edbd..86371d6420 100644
--- a/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
+++ b/src/applications/spaces/phid/PhabricatorSpacesNamespacePHIDType.php
@@ -9,14 +9,14 @@ final class PhabricatorSpacesNamespacePHIDType
     return pht('Space');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorSpacesApplication';
-  }
-
   public function newObject() {
     return new PhabricatorSpacesNamespace();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorSpacesApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php b/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
index 1791cc88c7..93ff9500ac 100644
--- a/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
+++ b/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorTokenTokenPHIDType extends PhabricatorPHIDType {
     return new PhabricatorToken();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorTokensApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php b/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
index ccb5d271ab..e6184b1ae4 100644
--- a/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
+++ b/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
@@ -16,6 +16,10 @@ final class PhabricatorApplicationTransactionTransactionPHIDType
     return null;
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorTransactionsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $object_query,
     array $phids) {
diff --git a/src/infrastructure/daemon/workers/phid/PhabricatorWorkerBulkJobPHIDType.php b/src/infrastructure/daemon/workers/phid/PhabricatorWorkerBulkJobPHIDType.php
index 7550d1cf02..b94f7eab27 100644
--- a/src/infrastructure/daemon/workers/phid/PhabricatorWorkerBulkJobPHIDType.php
+++ b/src/infrastructure/daemon/workers/phid/PhabricatorWorkerBulkJobPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorWorkerBulkJobPHIDType extends PhabricatorPHIDType {
     return new PhabricatorWorkerBulkJob();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDaemonsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
diff --git a/src/infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php b/src/infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php
index 02112c91b5..b1dadb568e 100644
--- a/src/infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php
+++ b/src/infrastructure/daemon/workers/phid/PhabricatorWorkerTriggerPHIDType.php
@@ -12,6 +12,10 @@ final class PhabricatorWorkerTriggerPHIDType extends PhabricatorPHIDType {
     return new PhabricatorWorkerTrigger();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDaemonsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {