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
@@ -1,38 +1,42 @@
 <?php
 
 final class AlmanacBindingPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ABND';
 
   public function getTypeName() {
     return pht('Almanac Binding');
   }
 
   public function newObject() {
     return new AlmanacBinding();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new AlmanacBindingQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $binding = $objects[$phid];
 
       $id = $binding->getID();
 
       $handle->setObjectName(pht('Binding %d', $id));
       $handle->setName(pht('Binding %d', $id));
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class AlmanacDevicePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ADEV';
 
   public function getTypeName() {
     return pht('Almanac Device');
   }
 
   public function newObject() {
     return new AlmanacDevice();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new AlmanacDeviceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $device = $objects[$phid];
 
       $id = $device->getID();
       $name = $device->getName();
 
       $handle->setObjectName(pht('Device %d', $id));
       $handle->setName($name);
       $handle->setURI($device->getURI());
     }
   }
 
 }
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
@@ -1,50 +1,54 @@
 <?php
 
 final class AlmanacInterfacePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'AINT';
 
   public function getTypeName() {
     return pht('Almanac Interface');
   }
 
   public function newObject() {
     return new AlmanacInterface();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new AlmanacInterfaceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $interface = $objects[$phid];
 
       $id = $interface->getID();
 
       $device_name = $interface->getDevice()->getName();
       $address = $interface->getAddress();
       $port = $interface->getPort();
       $network = $interface->getNetwork()->getName();
 
       $name = pht(
         '%s:%s (%s on %s)',
         $device_name,
         $port,
         $address,
         $network);
 
       $handle->setObjectName(pht('Interface %d', $id));
       $handle->setName($name);
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class AlmanacNetworkPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ANET';
 
   public function getTypeName() {
     return pht('Almanac Network');
   }
 
   public function newObject() {
     return new AlmanacNetwork();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new AlmanacNetworkQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $network = $objects[$phid];
 
       $id = $network->getID();
       $name = $network->getName();
 
       $handle->setObjectName(pht('Network %d', $id));
       $handle->setName($name);
       $handle->setURI($network->getURI());
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class AlmanacServicePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ASRV';
 
   public function getTypeName() {
     return pht('Almanac Service');
   }
 
   public function newObject() {
     return new AlmanacService();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAlmanacApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new AlmanacServiceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $service = $objects[$phid];
 
       $id = $service->getID();
       $name = $service->getName();
 
       $handle->setObjectName(pht('Service %d', $id));
       $handle->setName($name);
       $handle->setURI($service->getURI());
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorAuthAuthFactorPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'AFTR';
 
   public function getTypeName() {
     return pht('Auth Factor');
   }
 
   public function newObject() {
     return new PhabricatorAuthFactorConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     // TODO: Maybe we need this eventually?
     throw new PhutilMethodNotImplementedException();
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $factor = $objects[$phid];
 
       $handle->setName($factor->getFactorName());
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorAuthAuthProviderPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'AUTH';
 
   public function getTypeName() {
     return pht('Auth Provider');
   }
 
   public function newObject() {
     return new PhabricatorAuthProviderConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorAuthProviderConfigQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $provider = $objects[$phid];
 
       $handle->setName($provider->getProviderName());
     }
   }
 
 }
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
@@ -1,31 +1,35 @@
 <?php
 
 final class PhabricatorAuthInvitePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'AINV';
 
   public function getTypeName() {
     return pht('Auth Invite');
   }
 
   public function newObject() {
     return new PhabricatorAuthInvite();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorAuthApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
     throw new PhutilMethodNotImplementedException();
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $invite = $objects[$phid];
     }
   }
 
 }
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
@@ -1,78 +1,78 @@
 <?php
 
 final class PhabricatorCalendarEventPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CEVT';
 
   public function getTypeName() {
     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) {
 
     return id(new PhabricatorCalendarEventQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $event = $objects[$phid];
 
       $id = $event->getID();
       $name = $event->getName();
       $is_cancelled = $event->getIsCancelled();
 
       $handle
         ->setName($name)
         ->setFullName(pht('E%d: %s', $id, $name))
         ->setURI('/E'.$id);
 
       if ($is_cancelled) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^E[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorCalendarEventQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhabricatorConfigConfigPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CONF';
 
   public function getTypeName() {
     return pht('Config');
   }
 
   public function newObject() {
     return new PhabricatorConfigEntry();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorConfigApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorConfigEntryQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $entry = $objects[$phid];
 
       $key = $entry->getConfigKey();
 
       $handle->setName($key);
       $handle->setURI("/config/edit/{$key}/");
     }
   }
 
 }
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
@@ -1,69 +1,73 @@
 <?php
 
 final class PhabricatorCountdownCountdownPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CDWN';
 
   public function getTypeName() {
     return pht('Countdown');
   }
 
   public function newObject() {
     return new PhabricatorCountdown();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorCountdownApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorCountdownQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $countdown = $objects[$phid];
 
       $name = $countdown->getTitle();
       $id = $countdown->getID();
 
       $handle->setName("C{$id}");
       $handle->setFullName("C{$id}: {$name}");
       $handle->setURI("/countdown/{$id}/");
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^C\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorCountdownQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhabricatorDashboardDashboardPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DSHB';
 
   public function getTypeName() {
     return pht('Dashboard');
   }
 
   public function newObject() {
     return new PhabricatorDashboard();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDashboardApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorDashboardQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $dashboard = $objects[$phid];
 
       $id = $dashboard->getID();
 
       $handle->setName($dashboard->getName());
       $handle->setURI("/dashboard/view/{$id}/");
     }
   }
 
 }
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
@@ -1,73 +1,77 @@
 <?php
 
 final class PhabricatorDashboardPanelPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DSHP';
 
   public function getTypeName() {
     return pht('Panel');
   }
 
   public function newObject() {
     return new PhabricatorDashboardPanel();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDashboardApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorDashboardPanelQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $panel = $objects[$phid];
 
       $name = $panel->getName();
       $monogram = $panel->getMonogram();
 
       $handle->setName($panel->getMonogram());
       $handle->setFullName("{$monogram} {$name}");
       $handle->setURI("/{$monogram}");
 
       if ($panel->getIsArchived()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^W\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorDashboardPanelQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class DifferentialDiffPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DIFF';
 
   public function getTypeName() {
     return pht('Differential Diff');
   }
 
   public function newObject() {
     return new DifferentialDiff();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDifferentialApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DifferentialDiffQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $diff = $objects[$phid];
 
       $id = $diff->getID();
 
       $handle->setName(pht('Diff %d', $id));
       $handle->setURI("/differential/diff/{$id}/");
     }
   }
 
 }
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
@@ -1,78 +1,78 @@
 <?php
 
 final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DREV';
 
   public function getTypeName() {
     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) {
 
     return id(new DifferentialRevisionQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $revision = $objects[$phid];
 
       $title = $revision->getTitle();
       $id = $revision->getID();
       $status = $revision->getStatus();
 
       $handle->setName("D{$id}");
       $handle->setURI("/D{$id}");
       $handle->setFullName("D{$id}: {$title}");
 
       if ($revision->isClosed()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^D[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new DifferentialRevisionQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class DrydockAuthorizationPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYA';
 
   public function getTypeName() {
     return pht('Drydock Authorization');
   }
 
   public function newObject() {
     return new DrydockAuthorization();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DrydockAuthorizationQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $authorization = $objects[$phid];
       $id = $authorization->getID();
 
       $handle->setName(pht('Drydock Authorization %d', $id));
       $handle->setURI("/drydock/authorization/{$id}/");
     }
   }
 
 }
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
@@ -1,48 +1,48 @@
 <?php
 
 final class DrydockBlueprintPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYB';
 
   public function getTypeName() {
     return pht('Blueprint');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-map-o';
   }
 
   public function newObject() {
     return new DrydockBlueprint();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DrydockBlueprintQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $blueprint = $objects[$phid];
       $id = $blueprint->getID();
       $name = $blueprint->getBlueprintName();
 
       $handle
         ->setName($name)
         ->setFullName(pht('Blueprint %d: %s', $id, $name))
         ->setURI("/drydock/blueprint/{$id}/");
     }
   }
 
 }
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
@@ -1,47 +1,47 @@
 <?php
 
 final class DrydockLeasePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYL';
 
   public function getTypeName() {
     return pht('Drydock Lease');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-link';
   }
 
   public function newObject() {
     return new DrydockLease();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DrydockLeaseQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $lease = $objects[$phid];
       $id = $lease->getID();
 
       $handle->setName(pht(
         'Lease %d',
         $id));
       $handle->setURI("/drydock/lease/{$id}/");
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class DrydockRepositoryOperationPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYO';
 
   public function getTypeName() {
     return pht('Drydock Repository Operation');
   }
 
   public function newObject() {
     return new DrydockRepositoryOperation();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DrydockRepositoryOperationQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $operation = $objects[$phid];
       $id = $operation->getID();
 
       $handle->setName(pht('Drydock Repository Operation %d', $id));
       $handle->setURI("/drydock/operation/{$id}/");
     }
   }
 
 }
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
@@ -1,50 +1,50 @@
 <?php
 
 final class DrydockResourcePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'DRYR';
 
   public function getTypeName() {
     return pht('Drydock Resource');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorDrydockApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-map';
   }
 
   public function newObject() {
     return new DrydockResource();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDrydockApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new DrydockResourceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $resource = $objects[$phid];
       $id = $resource->getID();
 
       $handle->setName(
         pht(
           'Resource %d: %s',
           $id,
           $resource->getResourceName()));
 
       $handle->setURI("/drydock/resource/{$id}/");
     }
   }
 
 }
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
@@ -1,70 +1,74 @@
 <?php
 
 final class PhabricatorFileFilePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'FILE';
 
   public function getTypeName() {
     return pht('File');
   }
 
   public function newObject() {
     return new PhabricatorFile();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorFilesApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorFileQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $file = $objects[$phid];
 
       $id = $file->getID();
       $name = $file->getName();
       $uri = $file->getInfoURI();
 
       $handle->setName("F{$id}");
       $handle->setFullName("F{$id}: {$name}");
       $handle->setURI($uri);
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^F\d*[1-9]\d*$/', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorFileQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,41 +1,45 @@
 <?php
 
 final class FundBackerPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'FBAK';
 
   public function getTypeName() {
     return pht('Variable');
   }
 
   public function newObject() {
     return new FundInitiative();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorFundApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new FundInitiativeQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $initiative = $objects[$phid];
 
       $id = $initiative->getID();
       $monogram = $initiative->getMonogram();
       $name = $initiative->getName();
 
       $handle->setName($name);
       $handle->setFullName("{$monogram} {$name}");
       $handle->setURI("/fund/view/{$id}/");
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class HarbormasterBuildArtifactPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBA';
 
   public function getTypeName() {
     return pht('Build Artifact');
   }
 
   public function newObject() {
     return new HarbormasterBuildArtifact();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildArtifactQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $artifact = $objects[$phid];
       $artifact_id = $artifact->getID();
       $handle->setName(pht('Build Artifact %d', $artifact_id));
     }
   }
 
 }
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
@@ -1,33 +1,37 @@
 <?php
 
 final class HarbormasterBuildLogPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCL';
 
   public function getTypeName() {
     return pht('Build Log');
   }
 
   public function newObject() {
     return new HarbormasterBuildLog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildLogQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $build_log = $objects[$phid];
     }
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class HarbormasterBuildPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBD';
 
   public function getTypeName() {
     return pht('Build');
   }
 
   public function newObject() {
     return new HarbormasterBuild();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $build = $objects[$phid];
       $build_id = $build->getID();
       $name = $build->getName();
 
       $handle->setName(pht('Build %d: %s', $build_id, $name));
       $handle->setURI("/harbormaster/build/{$build_id}/");
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class HarbormasterBuildPlanPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCP';
 
   public function getTypeName() {
     return pht('Build Plan');
   }
 
   public function getTypeIcon() {
     return 'fa-cubes';
   }
 
   public function newObject() {
     return new HarbormasterBuildPlan();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildPlanQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $build_plan = $objects[$phid];
       $id = $build_plan->getID();
       $handles[$phid]->setName(pht('Plan %d %s', $id, $build_plan->getName()));
       $handles[$phid]->setURI('/harbormaster/plan/'.$id.'/');
     }
   }
 
 }
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
@@ -1,41 +1,45 @@
 <?php
 
 final class HarbormasterBuildStepPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMCS';
 
   public function getTypeName() {
     return pht('Build Step');
   }
 
   public function newObject() {
     return new HarbormasterBuildStep();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildStepQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $build_step = $objects[$phid];
 
       $id = $build_step->getID();
       $name = $build_step->getName();
 
       $handle
         ->setName($name)
         ->setFullName(pht('Build Step %d: %s', $id, $name))
         ->setURI("/harbormaster/step/view/{$id}/");
     }
   }
 
 }
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
@@ -1,43 +1,47 @@
 <?php
 
 final class HarbormasterBuildTargetPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBT';
 
   public function getTypeName() {
     return pht('Build Target');
   }
 
   public function newObject() {
     return new HarbormasterBuildTarget();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildTargetQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $target = $objects[$phid];
       $target_id = $target->getID();
 
       // Build target don't currently have their own page, so just point
       // the user at the build until we have one.
       $build = $target->getBuild();
       $build_id = $build->getID();
       $uri = "/harbormaster/build/{$build_id}/";
 
       $handle->setName(pht('Build Target %d', $target_id));
       $handle->setURI($uri);
     }
   }
 
 }
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
@@ -1,70 +1,74 @@
 <?php
 
 final class HarbormasterBuildablePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HMBB';
 
   public function getTypeName() {
     return pht('Buildable');
   }
 
   public function newObject() {
     return new HarbormasterBuildable();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHarbormasterApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HarbormasterBuildableQuery())
       ->withPHIDs($phids)
       ->needBuildableHandles(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $buildable = $objects[$phid];
 
       $id = $buildable->getID();
       $target = $buildable->getBuildableHandle()->getFullName();
 
       $handle->setURI("/B{$id}");
       $handle->setName("B{$id}");
       $handle->setFullName("B{$id}: ".$target);
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^B\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new HarbormasterBuildableQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,69 +1,73 @@
 <?php
 
 final class HeraldRulePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'HRUL';
 
   public function getTypeName() {
     return pht('Herald Rule');
   }
 
   public function newObject() {
     return new HeraldRule();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorHeraldApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new HeraldRuleQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $rule = $objects[$phid];
 
       $id = $rule->getID();
       $name = $rule->getName();
 
       $handle->setName("H{$id}");
       $handle->setFullName("H{$id} {$name}");
       $handle->setURI("/herald/rule/{$id}/");
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^H\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new HeraldRuleQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,70 +1,74 @@
 <?php
 
 final class PhabricatorLegalpadDocumentPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'LEGD';
 
   public function getTypeName() {
     return pht('Legalpad Document');
   }
 
   public function getTypeIcon() {
     return 'fa-file-text-o';
   }
 
   public function newObject() {
     return new LegalpadDocument();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorLegalpadApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new LegalpadDocumentQuery())
       ->withPHIDs($phids)
       ->needDocumentBodies(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $document = $objects[$phid];
       $name = $document->getDocumentBody()->getTitle();
       $handle->setName($document->getMonogram().' '.$name);
       $handle->setURI('/'.$document->getMonogram());
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^L\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new LegalpadDocumentQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,76 +1,76 @@
 <?php
 
 final class ManiphestTaskPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'TASK';
 
   public function getTypeName() {
     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) {
 
     return id(new ManiphestTaskQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $task = $objects[$phid];
       $id = $task->getID();
       $title = $task->getTitle();
 
       $handle->setName("T{$id}");
       $handle->setFullName("T{$id}: {$title}");
       $handle->setURI("/T{$id}");
 
       if ($task->isClosed()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^T\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new ManiphestTaskQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,41 +1,45 @@
 <?php
 
 final class PhabricatorApplicationApplicationPHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'APPS';
 
   public function getTypeName() {
     return pht('Application');
   }
 
   public function getTypeIcon() {
     return 'fa-globe';
   }
 
   public function newObject() {
     return null;
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorApplicationsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorApplicationQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $application = $objects[$phid];
 
       $handle->setName($application->getName());
       $handle->setURI($application->getApplicationURI());
     }
   }
 
 }
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
@@ -1,43 +1,43 @@
 <?php
 
 final class PhabricatorMetaMTAMailPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'MTAM';
 
   public function getTypeName() {
     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) {
 
     return id(new PhabricatorMetaMTAMailQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $mail = $objects[$phid];
 
       $id = $mail->getID();
       $name = pht('Mail %d', $id);
 
       $handle
         ->setName($name)
         ->setURI('/mail/detail/'.$id.'/');
     }
   }
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class NuanceItemPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'NUAI';
 
   public function getTypeName() {
     return pht('Item');
   }
 
   public function newObject() {
     return new NuanceItem();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new NuanceItemQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $item = $objects[$phid];
 
       $handle->setName($item->getLabel($viewer));
       $handle->setURI($item->getURI());
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class NuanceQueuePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'NUAQ';
 
   public function getTypeName() {
     return pht('Queue');
   }
 
   public function newObject() {
     return new NuanceQueue();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new NuanceQueueQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $queue = $objects[$phid];
 
       $handle->setName($queue->getName());
       $handle->setURI($queue->getURI());
     }
   }
 
 }
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
@@ -1,39 +1,43 @@
 <?php
 
 final class NuanceRequestorPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'NUAR';
 
   public function getTypeName() {
     return pht('Requestor');
   }
 
   public function newObject() {
     return new NuanceRequestor();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new NuanceRequestorQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $requestor = $objects[$phid];
 
       // TODO: This is currently useless and should be far more informative.
       $handle->setName(pht('Requestor %d', $requestor->getID()));
 
       $handle->setURI($requestor->getURI());
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class NuanceSourcePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'NUAS';
 
   public function getTypeName() {
     return pht('Source');
   }
 
   public function newObject() {
     return new NuanceSource();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorNuanceApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new NuanceSourceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $source = $objects[$phid];
 
       $handle->setName($source->getName());
       $handle->setURI($source->getURI());
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorOAuthServerClientAuthorizationPHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'OASA';
 
   public function getTypeName() {
     return pht('OAuth Authorization');
   }
 
   public function newObject() {
     return new PhabricatorOAuthClientAuthorization();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOAuthServerApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorOAuthClientAuthorizationQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $authorization = $objects[$phid];
       $handle->setName(pht('Authorization %d', $authorization->getID()));
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorOAuthServerClientPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'OASC';
 
   public function getTypeName() {
     return pht('OAuth Application');
   }
 
   public function newObject() {
     return new PhabricatorOAuthServerClient();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOAuthServerApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorOAuthServerClientQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $client = $objects[$phid];
 
       $handle->setName($client->getName());
     }
   }
 
 }
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
@@ -1,43 +1,47 @@
 <?php
 
 final class PhabricatorOwnersPackagePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'OPKG';
 
   public function getTypeName() {
     return pht('Owners Package');
   }
 
   public function getTypeIcon() {
     return 'fa-list-alt';
   }
 
   public function newObject() {
     return new PhabricatorOwnersPackage();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorOwnersApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorOwnersPackageQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $package = $objects[$phid];
 
       $name = $package->getName();
       $id = $package->getID();
 
       $handle->setName($name);
       $handle->setURI("/owners/package/{$id}/");
     }
   }
 
 }
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
@@ -1,69 +1,73 @@
 <?php
 
 final class PhabricatorPastePastePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PSTE';
 
   public function getTypeName() {
     return pht('Paste');
   }
 
   public function newObject() {
     return new PhabricatorPaste();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPasteApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorPasteQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $paste = $objects[$phid];
 
       $id = $paste->getID();
       $name = $paste->getFullName();
 
       $handle->setName("P{$id}");
       $handle->setFullName($name);
       $handle->setURI("/P{$id}");
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^P\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorPasteQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,36 +1,40 @@
 <?php
 
 final class PhabricatorPeopleExternalPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'XUSR';
 
   public function getTypeName() {
     return pht('External Account');
   }
 
   public function newObject() {
     return new PhabricatorExternalAccount();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorExternalAccountQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $account = $objects[$phid];
 
       $display_name = $account->getDisplayName();
       $handle->setName($display_name);
     }
   }
 
 }
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
@@ -1,99 +1,99 @@
 <?php
 
 final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'USER';
 
   public function getTypeName() {
     return pht('User');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorPeopleApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-user bluegrey';
   }
 
   public function newObject() {
     return new PhabricatorUser();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPeopleApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorPeopleQuery())
       ->withPHIDs($phids)
       ->needProfileImage(true)
       ->needAvailability(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $user = $objects[$phid];
       $realname = $user->getRealName();
 
       $handle->setName($user->getUsername());
       $handle->setURI('/p/'.$user->getUsername().'/');
       $handle->setFullName($user->getFullName());
       $handle->setImageURI($user->getProfileImageURI());
 
       if ($user->getIsMailingList()) {
         $handle->setIcon('fa-envelope-o');
       }
 
       $availability = null;
       if (!$user->isUserActivated()) {
         $availability = PhabricatorObjectHandle::AVAILABILITY_DISABLED;
       } else {
         $until = $user->getAwayUntil();
         if ($until) {
           $availability = PhabricatorObjectHandle::AVAILABILITY_NONE;
         }
       }
 
       if ($availability) {
         $handle->setAvailability($availability);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^@.+/', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = substr($name, 1);
       $id = phutil_utf8_strtolower($id);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorPeopleQuery())
       ->setViewer($query->getViewer())
       ->withUsernames(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       $user_key = $object->getUsername();
       $user_key = phutil_utf8_strtolower($user_key);
       foreach (idx($id_map, $user_key, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,36 +1,40 @@
 <?php
 
 final class PhabricatorPhameBlogPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'BLOG';
 
   public function getTypeName() {
     return pht('Phame Blog');
   }
 
   public function newObject() {
     return new PhameBlog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhameApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhameBlogQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $blog = $objects[$phid];
       $handle->setName($blog->getName());
       $handle->setFullName($blog->getName());
       $handle->setURI('/phame/blog/view/'.$blog->getID().'/');
     }
   }
 
 }
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
@@ -1,36 +1,40 @@
 <?php
 
 final class PhabricatorPhamePostPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'POST';
 
   public function getTypeName() {
     return pht('Phame Post');
   }
 
   public function newObject() {
     return new PhamePost();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhameApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhamePostQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $post = $objects[$phid];
       $handle->setName($post->getTitle());
       $handle->setFullName($post->getTitle());
       $handle->setURI('/phame/post/view/'.$post->getID().'/');
     }
   }
 
 }
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
@@ -1,44 +1,44 @@
 <?php
 
 final class PhabricatorMetaMTAApplicationEmailPHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'APPE';
 
   public function getTypeName() {
     return pht('Application Email');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorMetaMTAApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-email bluegrey';
   }
 
   public function newObject() {
     return new PhabricatorMetaMTAApplicationEmail();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorMetaMTAApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorMetaMTAApplicationEmailQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $email = $objects[$phid];
 
       $handle->setName($email->getAddress());
       $handle->setFullName($email->getAddress());
     }
   }
 }
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
@@ -1,202 +1,197 @@
 <?php
 
 abstract class PhabricatorPHIDType extends Phobject {
 
   final public function getTypeConstant() {
     $const = $this->getPhobjectClassConstant('TYPECONST');
 
     if (!is_string($const) || !preg_match('/^[A-Z]{4}$/', $const)) {
       throw new Exception(
         pht(
           '%s class "%s" has an invalid %s property. PHID '.
           'constants must be a four character uppercase string.',
           __CLASS__,
           get_class($this),
           'TYPECONST'));
     }
 
     return $const;
   }
 
   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();
     if ($application_class) {
       $application = newv($application_class, array());
       return $application->getFontIcon();
     }
 
     return null;
   }
 
+  public function newObject() {
+    return null;
+  }
+
 
   /**
    * Get the class name for the application this type belongs to.
    *
    * @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
    * by PHID.
    *
    * If you can not build a single query which satisfies this requirement, you
    * can provide a dummy implementation for this method and overload
    * @{method:loadObjects} instead.
    *
    * @param PhabricatorObjectQuery Query being executed.
    * @param list<phid> PHIDs to load.
    * @return PhabricatorPolicyAwareQuery Query object which loads the
    *   specified PHIDs when executed.
    */
   abstract protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids);
 
 
   /**
    * Load objects of this type, by PHID. For most PHID types, it is only
    * necessary to implement @{method:buildQueryForObjects} to get object
    * loading to work.
    *
    * @param PhabricatorObjectQuery Query being executed.
    * @param list<phid> PHIDs to load.
    * @return list<wild> Corresponding objects.
    */
   public function loadObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     $object_query = $this->buildQueryForObjects($query, $phids)
       ->setViewer($query->getViewer())
       ->setParentQuery($query);
 
     // If the user doesn't have permission to use the application at all,
     // just mark all the PHIDs as filtered. This primarily makes these
     // objects show up as "Restricted" instead of "Unknown" when loaded as
     // handles, which is technically true.
     if (!$object_query->canViewerUseQueryApplication()) {
       $object_query->addPolicyFilteredPHIDs(array_fuse($phids));
       return array();
     }
 
     return $object_query->execute();
   }
 
 
   /**
    * Populate provided handles with application-specific data, like titles and
    * URIs.
    *
    * NOTE: The `$handles` and `$objects` lists are guaranteed to be nonempty
    * and have the same keys: subclasses are expected to load information only
    * for handles with visible objects.
    *
    * Because of this guarantee, a safe implementation will typically look like*
    *
    *   foreach ($handles as $phid => $handle) {
    *     $object = $objects[$phid];
    *
    *     $handle->setStuff($object->getStuff());
    *     // ...
    *   }
    *
    * In general, an implementation should call `setName()` and `setURI()` on
    * each handle at a minimum. See @{class:PhabricatorObjectHandle} for other
    * handle properties.
    *
    * @param PhabricatorHandleQuery          Issuing query object.
    * @param list<PhabricatorObjectHandle>   Handles to populate with data.
    * @param list<Object>                    Objects for these PHIDs loaded by
    *                                        @{method:buildQueryForObjects()}.
    * @return void
    */
   abstract public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects);
 
   public function canLoadNamedObject($name) {
     return false;
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
     throw new PhutilMethodNotImplementedException();
   }
 
 
   /**
    * Get all known PHID types.
    *
    * To get PHID types a given user has access to, see
    * @{method:getAllInstalledTypes}.
    *
    * @return dict<string, PhabricatorPHIDType> Map of type constants to types.
    */
   final public static function getAllTypes() {
     return id(new PhutilClassMapQuery())
       ->setAncestorClass(__CLASS__)
       ->setUniqueMethod('getTypeConstant')
       ->execute();
   }
 
 
   /**
    * Get all PHID types of applications installed for a given viewer.
    *
    * @param PhabricatorUser Viewing user.
    * @return dict<string, PhabricatorPHIDType> Map of constants to installed
    *  types.
    */
   public static function getAllInstalledTypes(PhabricatorUser $viewer) {
     $all_types = self::getAllTypes();
 
     $installed_types = array();
 
     $app_classes = array();
     foreach ($all_types as $key => $type) {
       $app_class = $type->getPHIDTypeApplicationClass();
 
       if ($app_class === null) {
         // If the PHID type isn't bound to an application, include it as
         // installed.
         $installed_types[$key] = $type;
         continue;
       }
 
       // Otherwise, we need to check if this application is installed before
       // including the PHID type.
       $app_classes[$app_class][$key] = $type;
     }
 
     if ($app_classes) {
       $apps = id(new PhabricatorApplicationQuery())
         ->setViewer($viewer)
         ->withInstalled(true)
         ->withClasses(array_keys($app_classes))
         ->execute();
 
       foreach ($apps as $app_class => $app) {
         $installed_types += $app_classes[$app_class];
       }
     }
 
     return $installed_types;
   }
 
 }
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
@@ -1,10 +1,22 @@
 <?php
 
 final class PhabricatorPHIDTypeTestCase extends PhutilTestCase {
 
   public function testGetAllTypes() {
     PhabricatorPHIDType::getAllTypes();
     $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
@@ -1,39 +1,43 @@
 <?php
 
 final class PhluxVariablePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PVAR';
 
   public function getTypeName() {
     return pht('Variable');
   }
 
   public function newObject() {
     return new PhluxVariable();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhluxApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhluxVariableQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $variable = $objects[$phid];
 
       $key = $variable->getVariableKey();
 
       $handle->setName($key);
       $handle->setFullName(pht('Variable "%s"', $key));
       $handle->setURI("/phlux/view/{$key}/");
     }
   }
 
 }
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
@@ -1,41 +1,45 @@
 <?php
 
 final class PholioImagePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PIMG';
 
   public function getTypeName() {
     return pht('Image');
   }
 
   public function newObject() {
     return new PholioImage();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPholioApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PholioImageQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $image = $objects[$phid];
 
       $id = $image->getID();
       $mock_id = $image->getMockID();
       $name = $image->getName();
 
       $handle->setURI("/M{$mock_id}/{$id}/");
       $handle->setName($name);
       $handle->setFullName($name);
     }
   }
 
 }
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
@@ -1,77 +1,77 @@
 <?php
 
 final class PholioMockPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'MOCK';
 
   public function getTypeName() {
     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) {
 
     return id(new PholioMockQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $mock = $objects[$phid];
 
       $id = $mock->getID();
       $name = $mock->getName();
 
       $handle->setURI("/M{$id}");
       $handle->setName("M{$id}");
       $handle->setFullName("M{$id}: {$name}");
 
       if ($mock->isClosed()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^M\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PholioMockQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhortuneAccountPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'ACNT';
 
   public function getTypeName() {
     return pht('Phortune Account');
   }
 
   public function newObject() {
     return new PhortuneAccount();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneAccountQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $account = $objects[$phid];
 
       $id = $account->getID();
 
       $handle->setName($account->getName());
       $handle->setURI("/phortune/{$id}/");
     }
   }
 
 }
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
@@ -1,39 +1,43 @@
 <?php
 
 final class PhortuneCartPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CART';
 
   public function getTypeName() {
     return pht('Phortune Cart');
   }
 
   public function newObject() {
     return new PhortuneCart();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneCartQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $cart = $objects[$phid];
 
       $id = $cart->getID();
       $name = $cart->getName();
 
       $handle->setName($name);
       $handle->setURI("/phortune/cart/{$id}/");
     }
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhortuneChargePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CHRG';
 
   public function getTypeName() {
     return pht('Phortune Charge');
   }
 
   public function newObject() {
     return new PhortuneCharge();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneChargeQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $charge = $objects[$phid];
 
       $id = $charge->getID();
 
       $handle->setName(pht('Charge %d', $id));
       $handle->setURI("/phortune/charge/{$id}/");
     }
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhortuneMerchantPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PMRC';
 
   public function getTypeName() {
     return pht('Phortune Merchant');
   }
 
   public function newObject() {
     return new PhortuneMerchant();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneMerchantQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $merchant = $objects[$phid];
 
       $id = $merchant->getID();
 
       $handle->setName($merchant->getName());
       $handle->setURI("/phortune/merchant/{$id}/");
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhortunePaymentMethodPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PAYM';
 
   public function getTypeName() {
     return pht('Phortune Payment Method');
   }
 
   public function newObject() {
     return new PhortunePaymentMethod();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortunePaymentMethodQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $method = $objects[$phid];
 
       $id = $method->getID();
 
       $handle->setName($method->getFullDisplayName());
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhortunePaymentProviderPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHPR';
 
   public function getTypeName() {
     return pht('Phortune Payment Provider');
   }
 
   public function newObject() {
     return new PhortunePaymentProviderConfig();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortunePaymentProviderConfigQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $provider_config = $objects[$phid];
 
       $id = $provider_config->getID();
 
       $handle->setName($provider_config->buildProvider()->getName());
     }
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhortuneProductPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PDCT';
 
   public function getTypeName() {
     return pht('Phortune Product');
   }
 
   public function newObject() {
     return new PhortuneProduct();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneProductQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $product = $objects[$phid];
 
       $id = $product->getID();
 
       $handle->setName(pht('Product %d', $id));
       $handle->setURI("/phortune/product/{$id}/");
     }
   }
 
 }
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
@@ -1,38 +1,42 @@
 <?php
 
 final class PhortunePurchasePHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PRCH';
 
   public function getTypeName() {
     return pht('Phortune Purchase');
   }
 
   public function newObject() {
     return new PhortunePurchase();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortunePurchaseQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $purchase = $objects[$phid];
 
       $id = $purchase->getID();
 
       $handle->setName($purchase->getFullDisplayName());
       $handle->setURI($purchase->getURI());
     }
   }
 
 }
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
@@ -1,39 +1,43 @@
 <?php
 
 final class PhortuneSubscriptionPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PSUB';
 
   public function getTypeName() {
     return pht('Phortune Subscription');
   }
 
   public function newObject() {
     return new PhortuneSubscription();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhortuneApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhortuneSubscriptionQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $subscription = $objects[$phid];
 
       $id = $subscription->getID();
 
       $handle->setName($subscription->getSubscriptionName());
       $handle->setURI($subscription->getURI());
 
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class PhragmentFragmentPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRF';
 
   public function getTypeName() {
     return pht('Fragment');
   }
 
   public function newObject() {
     return new PhragmentFragment();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhragmentFragmentQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $fragment = $objects[$phid];
 
       $handle->setName(pht(
         'Fragment %s: %s',
         $fragment->getID(),
         $fragment->getName()));
       $handle->setURI($fragment->getURI());
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class PhragmentFragmentVersionPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRV';
 
   public function getTypeName() {
     return pht('Fragment Version');
   }
 
   public function newObject() {
     return new PhragmentFragmentVersion();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhragmentFragmentVersionQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $version = $objects[$phid];
 
       $handle->setName(pht(
         'Fragment Version %d: %s',
         $version->getSequence(),
         $version->getFragment()->getName()));
       $handle->setURI($version->getURI());
     }
   }
 
 }
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
@@ -1,39 +1,43 @@
 <?php
 
 final class PhragmentSnapshotPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRS';
 
   public function getTypeName() {
     return pht('Snapshot');
   }
 
   public function newObject() {
     return new PhragmentSnapshot();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPhragmentApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhragmentSnapshotQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     $viewer = $query->getViewer();
     foreach ($handles as $phid => $handle) {
       $snapshot = $objects[$phid];
 
       $handle->setName(pht(
         'Snapshot: %s',
         $snapshot->getName()));
       $handle->setURI($snapshot->getURI());
     }
   }
 
 }
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
@@ -1,50 +1,50 @@
 <?php
 
 final class PhrictionDocumentPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'WIKI';
 
   public function getTypeName() {
     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) {
 
     return id(new PhrictionDocumentQuery())
       ->withPHIDs($phids)
       ->needContent(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $document = $objects[$phid];
       $content = $document->getContent();
 
       $title = $content->getTitle();
       $slug = $document->getSlug();
       $status = $document->getStatus();
 
       $handle->setName($title);
       $handle->setURI(PhrictionDocument::getSlugURI($slug));
 
       if ($status != PhrictionDocumentStatus::STATUS_EXISTS) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
 }
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
@@ -1,74 +1,74 @@
 <?php
 
 final class PhabricatorPhurlURLPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PHRL';
 
   public function getTypeName() {
     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) {
 
     return id(new PhabricatorPhurlURLQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $url = $objects[$phid];
 
       $id = $url->getID();
       $name = $url->getName();
       $full_name = $url->getMonogram().' '.$name;
 
       $handle
         ->setName($name)
         ->setFullName($full_name)
         ->setURI($url->getURI());
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^U[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorPhurlURLQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 }
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
@@ -1,36 +1,40 @@
 <?php
 
 final class PhabricatorPolicyPHIDTypePolicy extends PhabricatorPHIDType {
 
   const TYPECONST = 'PLCY';
 
   public function getTypeName() {
     return pht('Policy');
   }
 
   public function newObject() {
     return new PhabricatorPolicy();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorPolicyApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorPolicyQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $policy = $objects[$phid];
 
       $handle->setName($policy->getName());
       $handle->setURI($policy->getHref());
     }
   }
 
 }
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
@@ -1,72 +1,72 @@
 <?php
 
 final class PonderQuestionPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'QUES';
 
   public function getTypeName() {
     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) {
 
     return id(new PonderQuestionQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $question = $objects[$phid];
 
       $id = $question->getID();
 
       $handle->setName("Q{$id}");
       $handle->setURI("/Q{$id}");
       $handle->setFullName($question->getFullTitle());
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^Q\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PonderQuestionQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,44 +1,48 @@
 <?php
 
 final class PhabricatorProjectColumnPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PCOL';
 
   public function getTypeName() {
     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(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorProjectColumnQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $column = $objects[$phid];
 
       $handle->setName($column->getDisplayName());
       $handle->setURI('/project/board/'.$column->getProject()->getID().'/');
 
       if ($column->isHidden()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
 }
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
@@ -1,110 +1,110 @@
 <?php
 
 final class PhabricatorProjectProjectPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PROJ';
 
   public function getTypeName() {
     return pht('Project');
   }
 
-  public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorProjectApplication';
-  }
-
   public function getTypeIcon() {
     return 'fa-briefcase bluegrey';
   }
 
   public function newObject() {
     return new PhabricatorProject();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorProjectApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorProjectQuery())
       ->withPHIDs($phids)
       ->needImages(true);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $project = $objects[$phid];
 
       $name = $project->getName();
       $id = $project->getID();
       $slug = $project->getPrimarySlug();
 
       $handle->setName($name);
       $handle->setObjectName('#'.$slug);
       $handle->setURI("/tag/{$slug}/");
       $handle->setImageURI($project->getProfileImageURI());
       $handle->setIcon($project->getIcon());
       $handle->setTagColor($project->getColor());
 
       if ($project->isArchived()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public static function getProjectMonogramPatternFragment() {
     // NOTE: See some discussion in ProjectRemarkupRule.
     return '[^\s,#]+';
   }
 
   public function canLoadNamedObject($name) {
     $fragment = self::getProjectMonogramPatternFragment();
     return preg_match('/^#'.$fragment.'$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     // If the user types "#YoloSwag", we still want to match "#yoloswag", so
     // we normalize, query, and then map back to the original inputs.
 
     $map = array();
     foreach ($names as $key => $slug) {
       $map[$this->normalizeSlug(substr($slug, 1))][] = $slug;
     }
 
     $projects = id(new PhabricatorProjectQuery())
       ->setViewer($query->getViewer())
       ->withSlugs(array_keys($map))
       ->needSlugs(true)
       ->execute();
 
     $result = array();
     foreach ($projects as $project) {
       $slugs = $project->getSlugs();
       $slug_strs = mpull($slugs, 'getSlug');
       foreach ($slug_strs as $slug) {
         $slug_map = idx($map, $slug, array());
         foreach ($slug_map as $original) {
           $result[$original] = $project;
         }
       }
     }
 
     return $result;
   }
 
   private function normalizeSlug($slug) {
     // NOTE: We're using phutil_utf8_strtolower() (and not PhabricatorSlug's
     // normalize() method) because this normalization should be only somewhat
     // liberal. We want "#YOLO" to match against "#yolo", but "#\\yo!!lo"
     // should not. normalize() strips out most punctuation and leads to
     // excessively aggressive matches.
 
     return phutil_utf8_strtolower($slug);
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class ReleephBranchPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'REBR';
 
   public function getTypeName() {
     return pht('Releeph Branch');
   }
 
   public function newObject() {
     return new ReleephBranch();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new ReleephBranchQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $branch = $objects[$phid];
 
       $handle->setURI($branch->getURI());
       $handle->setName($branch->getBasename());
       $handle->setFullName($branch->getName());
     }
   }
 
 }
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
@@ -1,36 +1,40 @@
 <?php
 
 final class ReleephProductPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'REPR';
 
   public function getTypeName() {
     return pht('Releeph Product');
   }
 
   public function newObject() {
     return new ReleephProject();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new ReleephProductQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $product = $objects[$phid];
 
       $handle->setName($product->getName());
       $handle->setURI($product->getURI());
     }
   }
 
 }
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
@@ -1,40 +1,44 @@
 <?php
 
 final class ReleephRequestPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'RERQ';
 
   public function getTypeName() {
     return pht('Releeph Request');
   }
 
   public function newObject() {
     return new ReleephRequest();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorReleephApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new ReleephRequestQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $request = $objects[$phid];
 
       $id = $request->getID();
       $title = $request->getSummaryForDisplay();
 
       $handle->setURI("/RQ{$id}");
       $handle->setName($title);
       $handle->setFullName("RQ{$id}: {$title}");
     }
   }
 
 }
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
@@ -1,82 +1,82 @@
 <?php
 
 final class PhabricatorRepositoryCommitPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'CMIT';
 
   public function getTypeName() {
     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) {
 
     return id(new DiffusionCommitQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $commit = $objects[$phid];
       $repository = $commit->getRepository();
       $commit_identifier = $commit->getCommitIdentifier();
 
       $name = $repository->formatCommitName($commit_identifier);
       $summary = $commit->getSummary();
       if (strlen($summary)) {
         $full_name = $name.': '.$summary;
       } else {
         $full_name = $name;
       }
 
       $handle->setName($name);
       $handle->setFullName($full_name);
       $handle->setURI($commit->getURI());
       $handle->setTimestamp($commit->getEpoch());
     }
   }
 
   public static function getCommitObjectNamePattern() {
     $min_unqualified = PhabricatorRepository::MINIMUM_UNQUALIFIED_HASH;
     $min_qualified   = PhabricatorRepository::MINIMUM_QUALIFIED_HASH;
 
     return
       '(?:r[A-Z]+:?|R[0-9]+:)[1-9]\d*'.
       '|'.
       '(?:r[A-Z]+:?|R[0-9]+:)[a-f0-9]{'.$min_qualified.',40}'.
       '|'.
       '[a-f0-9]{'.$min_unqualified.',40}';
   }
 
   public function canLoadNamedObject($name) {
     $pattern = self::getCommitObjectNamePattern();
     return preg_match('(^'.$pattern.'$)', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($query->getViewer())
       ->withIdentifiers($names);
 
     $query->execute();
 
     return $query->getIdentifierMap();
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhabricatorRepositoryMirrorPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'RMIR';
 
   public function getTypeName() {
     return pht('Repository Mirror');
   }
 
   public function newObject() {
     return new PhabricatorRepositoryMirror();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryMirrorQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $mirror = $objects[$phid];
 
       $handle->setName(
         pht('Mirror %d %s', $mirror->getID(), $mirror->getRemoteURI()));
       $handle->setURI('/diffusion/mirror/'.$mirror->getID().'/');
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorRepositoryPushEventPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PSHE';
 
   public function getTypeName() {
     return pht('Push Event');
   }
 
   public function newObject() {
     return new PhabricatorRepositoryPushEvent();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryPushEventQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $event = $objects[$phid];
 
       $handle->setName(pht('Push Event %d', $event->getID()));
     }
   }
 
 }
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
@@ -1,35 +1,39 @@
 <?php
 
 final class PhabricatorRepositoryPushLogPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'PSHL';
 
   public function getTypeName() {
     return pht('Push Log');
   }
 
   public function newObject() {
     return new PhabricatorRepositoryPushLog();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryPushLogQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $log = $objects[$phid];
 
       $handle->setName(pht('Push Log %d', $log->getID()));
     }
   }
 
 }
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
@@ -1,79 +1,83 @@
 <?php
 
 final class PhabricatorRepositoryRepositoryPHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'REPO';
 
   public function getTypeName() {
     return pht('Repository');
   }
 
   public function getTypeIcon() {
     return 'fa-database';
   }
 
   public function newObject() {
     return new PhabricatorRepository();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDiffusionApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorRepositoryQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $repository = $objects[$phid];
 
       $monogram = $repository->getMonogram();
       $callsign = $repository->getCallsign();
       $name = $repository->getName();
 
       $handle->setName($monogram);
       $handle->setFullName("{$monogram} {$name}");
       $handle->setURI("/diffusion/{$callsign}/");
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^r[A-Z]+|R[0-9]+$/', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $results = array();
     $id_map = array();
     foreach ($names as $key => $name) {
       $id = substr($name, 1);
       $id_map[$id][] = $name;
       $names[$key] = substr($name, 1);
     }
 
     $query = id(new PhabricatorRepositoryQuery())
       ->setViewer($query->getViewer())
       ->withIdentifiers($names);
 
     if ($query->execute()) {
       $objects = $query->getIdentifierMap();
       foreach ($objects as $key => $object) {
         foreach (idx($id_map, $key, array()) as $name) {
           $results[$name] = $object;
         }
       }
       return $results;
     } else {
       return array();
     }
   }
 
 }
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
@@ -1,66 +1,70 @@
 <?php
 
 final class PhabricatorSlowvotePollPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'POLL';
 
   public function getTypeName() {
     return pht('Slowvote Poll');
   }
 
   public function newObject() {
     return new PhabricatorSlowvotePoll();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorSlowvoteApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorSlowvoteQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $poll = $objects[$phid];
 
       $handle->setName('V'.$poll->getID());
       $handle->setFullName('V'.$poll->getID().': '.$poll->getQuestion());
       $handle->setURI('/V'.$poll->getID());
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^V\d*[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorSlowvoteQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,78 +1,78 @@
 <?php
 
 final class PhabricatorSpacesNamespacePHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'SPCE';
 
   public function getTypeName() {
     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) {
 
     return id(new PhabricatorSpacesNamespaceQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $namespace = $objects[$phid];
 
       $monogram = $namespace->getMonogram();
       $name = $namespace->getNamespaceName();
 
       $handle->setName($name);
       $handle->setFullName(pht('%s %s', $monogram, $name));
       $handle->setURI('/'.$monogram);
 
       if ($namespace->getIsArchived()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
     }
   }
 
   public function canLoadNamedObject($name) {
     return preg_match('/^S[1-9]\d*$/i', $name);
   }
 
   public function loadNamedObjects(
     PhabricatorObjectQuery $query,
     array $names) {
 
     $id_map = array();
     foreach ($names as $name) {
       $id = (int)substr($name, 1);
       $id_map[$id][] = $name;
     }
 
     $objects = id(new PhabricatorSpacesNamespaceQuery())
       ->setViewer($query->getViewer())
       ->withIDs(array_keys($id_map))
       ->execute();
 
     $results = array();
     foreach ($objects as $id => $object) {
       foreach (idx($id_map, $id, array()) as $name) {
         $results[$name] = $object;
       }
     }
 
     return $results;
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhabricatorTokenTokenPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'TOKN';
 
   public function getTypeName() {
     return pht('Token');
   }
 
   public function newObject() {
     return new PhabricatorToken();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorTokensApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorTokenQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $token = $objects[$phid];
 
       $name = $token->getName();
 
       $handle->setName(pht('%s Token', $name));
     }
   }
 
 }
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
@@ -1,88 +1,92 @@
 <?php
 
 final class PhabricatorApplicationTransactionTransactionPHIDType
   extends PhabricatorPHIDType {
 
   const TYPECONST = 'XACT';
 
   public function getTypeName() {
     return pht('Transaction');
   }
 
   public function newObject() {
     // NOTE: We could produce an object here, but we'd need to take a PHID type
     // and subtype to do so. Currently, we never write edges to transactions,
     // so leave this unimplemented for the moment.
     return null;
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorTransactionsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $object_query,
     array $phids) {
     throw new Exception();
   }
 
   public function loadObjects(
     PhabricatorObjectQuery $object_query,
     array $phids) {
 
     static $queries;
     if ($queries === null) {
       $objects = id(new PhutilClassMapQuery())
         ->setAncestorClass('PhabricatorApplicationTransactionQuery')
         ->execute();
 
       $queries = array();
       foreach ($objects as $object) {
         $type = $object
           ->getTemplateApplicationTransaction()
           ->getApplicationTransactionType();
 
         $queries[$type] = $object;
       }
     }
 
     $phid_subtypes = array();
     foreach ($phids as $phid) {
       $subtype = phid_get_subtype($phid);
       if ($subtype) {
         $phid_subtypes[$subtype][] = $phid;
       }
     }
 
     $results = array();
     foreach ($phid_subtypes as $subtype => $subtype_phids) {
       $query = idx($queries, $subtype);
       if (!$query) {
         continue;
       }
 
       $xaction_query = id(clone $query)
         ->setViewer($object_query->getViewer())
         ->setParentQuery($object_query)
         ->withPHIDs($subtype_phids);
 
       if (!$xaction_query->canViewerUseQueryApplication()) {
         $object_query->addPolicyFilteredPHIDs(array_fuse($subtype_phids));
         continue;
       }
 
       $xactions = $xaction_query->execute();
 
       $results += mpull($xactions, null, 'getPHID');
     }
 
     return $results;
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     // NOTE: We don't produce meaningful handles here because they're
     // impractical to produce and no application uses them.
 
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhabricatorWorkerBulkJobPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'BULK';
 
   public function getTypeName() {
     return pht('Bulk Job');
   }
 
   public function newObject() {
     return new PhabricatorWorkerBulkJob();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDaemonsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorWorkerBulkJobQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $job = $objects[$phid];
 
       $id = $job->getID();
 
       $handle->setName(pht('Bulk Job %d', $id));
     }
   }
 
 }
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
@@ -1,37 +1,41 @@
 <?php
 
 final class PhabricatorWorkerTriggerPHIDType extends PhabricatorPHIDType {
 
   const TYPECONST = 'TRIG';
 
   public function getTypeName() {
     return pht('Trigger');
   }
 
   public function newObject() {
     return new PhabricatorWorkerTrigger();
   }
 
+  public function getPHIDTypeApplicationClass() {
+    return 'PhabricatorDaemonsApplication';
+  }
+
   protected function buildQueryForObjects(
     PhabricatorObjectQuery $query,
     array $phids) {
 
     return id(new PhabricatorWorkerTriggerQuery())
       ->withPHIDs($phids);
   }
 
   public function loadHandles(
     PhabricatorHandleQuery $query,
     array $handles,
     array $objects) {
 
     foreach ($handles as $phid => $handle) {
       $trigger = $objects[$phid];
 
       $id = $trigger->getID();
 
       $handle->setName(pht('Trigger %d', $id));
     }
   }
 
 }