diff --git a/resources/sql/autopatches/20140720.appname.php b/resources/sql/autopatches/20140720.appname.php
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20140720.appname.php
@@ -0,0 +1,138 @@
+<?php
+
+$applications = array(
+  'Audit',
+  'Auth',
+  'Calendar',
+  'ChatLog',
+  'Conduit',
+  'Config',
+  'Conpherence',
+  'Countdown',
+  'Daemons',
+  'Dashboard',
+  'Differential',
+  'Diffusion',
+  'Diviner',
+  'Doorkeeper',
+  'Drydock',
+  'Fact',
+  'Feed',
+  'Files',
+  'Flags',
+  'Harbormaster',
+  'Help',
+  'Herald',
+  'Home',
+  'Legalpad',
+  'Macro',
+  'MailingLists',
+  'Maniphest',
+  'Applications',
+  'MetaMTA',
+  'Notifications',
+  'Nuance',
+  'OAuthServer',
+  'Owners',
+  'Passphrase',
+  'Paste',
+  'People',
+  'Phame',
+  'Phlux',
+  'Pholio',
+  'Phortune',
+  'PHPAST',
+  'Phragment',
+  'Phrequent',
+  'Phriction',
+  'Policy',
+  'Ponder',
+  'Project',
+  'Releeph',
+  'Repositories',
+  'Search',
+  'Settings',
+  'Slowvote',
+  'Subscriptions',
+  'Support',
+  'System',
+  'Test',
+  'Tokens',
+  'Transactions',
+  'Typeahead',
+  'UIExamples',
+  'XHProf',
+);
+$map = array();
+
+foreach ($applications as $application) {
+  $old_name = 'PhabricatorApplication'.$application;
+  $new_name = 'Phabricator'.$application.'Application';
+  $map[$old_name] = $new_name;
+}
+
+
+/* -(  User preferences  )--------------------------------------------------- */
+
+echo "Migrating user preferences...\n";
+$pref_pinned = PhabricatorUserPreferences::PREFERENCE_APP_PINNED;
+
+foreach (new LiskMigrationIterator(new PhabricatorUser()) as $user) {
+  $user_preferences = $user->loadPreferences();
+
+  $old_pinned_apps = $user_preferences->getPreference($pref_pinned);
+  $new_pinned_apps = array();
+
+  if (!$old_pinned_apps) {
+    continue;
+  }
+
+  foreach ($old_pinned_apps as $pinned_app) {
+    $new_pinned_apps[] = idx($map, $pinned_app, $pinned_app);
+  }
+
+  $user_preferences
+    ->setPreference($pref_pinned, $new_pinned_apps)
+    ->save();
+}
+
+
+/* -(  Phabricator configuration  )------------------------------------------ */
+
+$config_key = 'phabricator.uninstalled-applications';
+echo "Migrating `{$config_key}` config...\n";
+
+$config = PhabricatorConfigEntry::loadConfigEntry($config_key);
+$old_config = $config->getValue();
+$new_config = array();
+
+if ($old_config) {
+  foreach ($old_config as $application => $uninstalled) {
+    $new_config[idx($map, $application, $application)] = $uninstalled;
+  }
+
+  $config
+    ->setValue($new_config)
+    ->save();
+}
+
+
+/* -(  phabricator.application-settings  )----------------------------------- */
+
+$config_key = 'phabricator.application-settings';
+echo "Migrating `{$config_key}` config...\n";
+
+$config = PhabricatorConfigEntry::loadConfigEntry($config_key);
+$old_config = $config->getValue();
+$new_config = array();
+
+if ($old_config) {
+  foreach ($old_config as $application => $settings) {
+    $application = preg_replace('/^PHID-APPS-/', '', $application);
+    $new_config['PHID-APPS-'.idx($map, $application, $application)] = $settings;
+  }
+
+  $config
+    ->setValue($new_config)
+    ->save();
+}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1139,75 +1139,17 @@
     'PhabricatorAphrontViewTestCase' => 'view/__tests__/PhabricatorAphrontViewTestCase.php',
     'PhabricatorAppSearchEngine' => 'applications/meta/query/PhabricatorAppSearchEngine.php',
     'PhabricatorApplication' => 'applications/base/PhabricatorApplication.php',
-    'PhabricatorApplicationApplications' => 'applications/meta/application/PhabricatorApplicationApplications.php',
-    'PhabricatorApplicationAudit' => 'applications/audit/application/PhabricatorApplicationAudit.php',
-    'PhabricatorApplicationAuth' => 'applications/auth/application/PhabricatorApplicationAuth.php',
-    'PhabricatorApplicationCalendar' => 'applications/calendar/application/PhabricatorApplicationCalendar.php',
-    'PhabricatorApplicationChatLog' => 'applications/chatlog/applications/PhabricatorApplicationChatLog.php',
-    'PhabricatorApplicationConduit' => 'applications/conduit/application/PhabricatorApplicationConduit.php',
-    'PhabricatorApplicationConfig' => 'applications/config/application/PhabricatorApplicationConfig.php',
     'PhabricatorApplicationConfigOptions' => 'applications/config/option/PhabricatorApplicationConfigOptions.php',
-    'PhabricatorApplicationConpherence' => 'applications/conpherence/application/PhabricatorApplicationConpherence.php',
-    'PhabricatorApplicationCountdown' => 'applications/countdown/application/PhabricatorApplicationCountdown.php',
-    'PhabricatorApplicationDaemons' => 'applications/daemon/application/PhabricatorApplicationDaemons.php',
-    'PhabricatorApplicationDashboard' => 'applications/dashboard/application/PhabricatorApplicationDashboard.php',
     'PhabricatorApplicationDatasource' => 'applications/meta/typeahead/PhabricatorApplicationDatasource.php',
     'PhabricatorApplicationDetailViewController' => 'applications/meta/controller/PhabricatorApplicationDetailViewController.php',
-    'PhabricatorApplicationDifferential' => 'applications/differential/application/PhabricatorApplicationDifferential.php',
-    'PhabricatorApplicationDiffusion' => 'applications/diffusion/application/PhabricatorApplicationDiffusion.php',
-    'PhabricatorApplicationDiviner' => 'applications/diviner/application/PhabricatorApplicationDiviner.php',
-    'PhabricatorApplicationDoorkeeper' => 'applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php',
-    'PhabricatorApplicationDrydock' => 'applications/drydock/application/PhabricatorApplicationDrydock.php',
     'PhabricatorApplicationEditController' => 'applications/meta/controller/PhabricatorApplicationEditController.php',
-    'PhabricatorApplicationFact' => 'applications/fact/application/PhabricatorApplicationFact.php',
-    'PhabricatorApplicationFeed' => 'applications/feed/application/PhabricatorApplicationFeed.php',
-    'PhabricatorApplicationFiles' => 'applications/files/application/PhabricatorApplicationFiles.php',
-    'PhabricatorApplicationFlags' => 'applications/flag/application/PhabricatorApplicationFlags.php',
-    'PhabricatorApplicationHarbormaster' => 'applications/harbormaster/application/PhabricatorApplicationHarbormaster.php',
-    'PhabricatorApplicationHelp' => 'applications/help/application/PhabricatorApplicationHelp.php',
-    'PhabricatorApplicationHerald' => 'applications/herald/application/PhabricatorApplicationHerald.php',
-    'PhabricatorApplicationHome' => 'applications/home/application/PhabricatorApplicationHome.php',
     'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php',
-    'PhabricatorApplicationLegalpad' => 'applications/legalpad/application/PhabricatorApplicationLegalpad.php',
-    'PhabricatorApplicationMacro' => 'applications/macro/application/PhabricatorApplicationMacro.php',
-    'PhabricatorApplicationMailingLists' => 'applications/mailinglists/application/PhabricatorApplicationMailingLists.php',
-    'PhabricatorApplicationManiphest' => 'applications/maniphest/application/PhabricatorApplicationManiphest.php',
-    'PhabricatorApplicationMetaMTA' => 'applications/metamta/application/PhabricatorApplicationMetaMTA.php',
-    'PhabricatorApplicationNotifications' => 'applications/notification/application/PhabricatorApplicationNotifications.php',
-    'PhabricatorApplicationNuance' => 'applications/nuance/application/PhabricatorApplicationNuance.php',
-    'PhabricatorApplicationOAuthServer' => 'applications/oauthserver/application/PhabricatorApplicationOAuthServer.php',
-    'PhabricatorApplicationOwners' => 'applications/owners/application/PhabricatorApplicationOwners.php',
     'PhabricatorApplicationPHIDTypeApplication' => 'applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php',
-    'PhabricatorApplicationPHPAST' => 'applications/phpast/application/PhabricatorApplicationPHPAST.php',
-    'PhabricatorApplicationPassphrase' => 'applications/passphrase/application/PhabricatorApplicationPassphrase.php',
-    'PhabricatorApplicationPaste' => 'applications/paste/application/PhabricatorApplicationPaste.php',
-    'PhabricatorApplicationPeople' => 'applications/people/application/PhabricatorApplicationPeople.php',
-    'PhabricatorApplicationPhame' => 'applications/phame/application/PhabricatorApplicationPhame.php',
-    'PhabricatorApplicationPhlux' => 'applications/phlux/application/PhabricatorApplicationPhlux.php',
-    'PhabricatorApplicationPholio' => 'applications/pholio/application/PhabricatorApplicationPholio.php',
-    'PhabricatorApplicationPhortune' => 'applications/phortune/application/PhabricatorApplicationPhortune.php',
-    'PhabricatorApplicationPhragment' => 'applications/phragment/application/PhabricatorApplicationPhragment.php',
-    'PhabricatorApplicationPhrequent' => 'applications/phrequent/application/PhabricatorApplicationPhrequent.php',
-    'PhabricatorApplicationPhriction' => 'applications/phriction/application/PhabricatorApplicationPhriction.php',
-    'PhabricatorApplicationPolicy' => 'applications/policy/application/PhabricatorApplicationPolicy.php',
-    'PhabricatorApplicationPonder' => 'applications/ponder/application/PhabricatorApplicationPonder.php',
-    'PhabricatorApplicationProject' => 'applications/project/application/PhabricatorApplicationProject.php',
     'PhabricatorApplicationQuery' => 'applications/meta/query/PhabricatorApplicationQuery.php',
-    'PhabricatorApplicationReleeph' => 'applications/releeph/application/PhabricatorApplicationReleeph.php',
-    'PhabricatorApplicationReleephConfigOptions' => 'applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php',
-    'PhabricatorApplicationRepositories' => 'applications/repository/application/PhabricatorApplicationRepositories.php',
-    'PhabricatorApplicationSearch' => 'applications/search/application/PhabricatorApplicationSearch.php',
     'PhabricatorApplicationSearchController' => 'applications/search/controller/PhabricatorApplicationSearchController.php',
     'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php',
     'PhabricatorApplicationSearchResultsControllerInterface' => 'applications/search/interface/PhabricatorApplicationSearchResultsControllerInterface.php',
-    'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php',
-    'PhabricatorApplicationSlowvote' => 'applications/slowvote/application/PhabricatorApplicationSlowvote.php',
     'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php',
-    'PhabricatorApplicationSubscriptions' => 'applications/subscriptions/application/PhabricatorApplicationSubscriptions.php',
-    'PhabricatorApplicationSupport' => 'applications/support/application/PhabricatorApplicationSupport.php',
-    'PhabricatorApplicationSystem' => 'applications/system/application/PhabricatorApplicationSystem.php',
-    'PhabricatorApplicationTest' => 'applications/base/controller/__tests__/PhabricatorApplicationTest.php',
-    'PhabricatorApplicationTokens' => 'applications/tokens/application/PhabricatorApplicationTokens.php',
     'PhabricatorApplicationTransaction' => 'applications/transactions/storage/PhabricatorApplicationTransaction.php',
     'PhabricatorApplicationTransactionComment' => 'applications/transactions/storage/PhabricatorApplicationTransactionComment.php',
     'PhabricatorApplicationTransactionCommentEditController' => 'applications/transactions/controller/PhabricatorApplicationTransactionCommentEditController.php',
@@ -1233,16 +1175,14 @@
     'PhabricatorApplicationTransactionValidationException' => 'applications/transactions/exception/PhabricatorApplicationTransactionValidationException.php',
     'PhabricatorApplicationTransactionValueController' => 'applications/transactions/controller/PhabricatorApplicationTransactionValueController.php',
     'PhabricatorApplicationTransactionView' => 'applications/transactions/view/PhabricatorApplicationTransactionView.php',
-    'PhabricatorApplicationTransactions' => 'applications/transactions/application/PhabricatorApplicationTransactions.php',
-    'PhabricatorApplicationTypeahead' => 'applications/typeahead/application/PhabricatorApplicationTypeahead.php',
-    'PhabricatorApplicationUIExamples' => 'applications/uiexample/application/PhabricatorApplicationUIExamples.php',
     'PhabricatorApplicationUninstallController' => 'applications/meta/controller/PhabricatorApplicationUninstallController.php',
-    'PhabricatorApplicationXHProf' => 'applications/xhprof/application/PhabricatorApplicationXHProf.php',
+    'PhabricatorApplicationsApplication' => 'applications/meta/application/PhabricatorApplicationsApplication.php',
     'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php',
     'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php',
     'PhabricatorAsanaConfigOptions' => 'applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php',
     'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
     'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php',
+    'PhabricatorAuditApplication' => 'applications/audit/application/PhabricatorAuditApplication.php',
     'PhabricatorAuditComment' => 'applications/audit/storage/PhabricatorAuditComment.php',
     'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
     'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
@@ -1258,6 +1198,7 @@
     'PhabricatorAuditReplyHandler' => 'applications/audit/mail/PhabricatorAuditReplyHandler.php',
     'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
     'PhabricatorAuthAccountView' => 'applications/auth/view/PhabricatorAuthAccountView.php',
+    'PhabricatorAuthApplication' => 'applications/auth/application/PhabricatorAuthApplication.php',
     'PhabricatorAuthConfirmLinkController' => 'applications/auth/controller/PhabricatorAuthConfirmLinkController.php',
     'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
     'PhabricatorAuthDAO' => 'applications/auth/storage/PhabricatorAuthDAO.php',
@@ -1354,6 +1295,7 @@
     'PhabricatorCacheMarkupGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheMarkupGarbageCollector.php',
     'PhabricatorCacheTTLGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheTTLGarbageCollector.php',
     'PhabricatorCaches' => 'applications/cache/PhabricatorCaches.php',
+    'PhabricatorCalendarApplication' => 'applications/calendar/application/PhabricatorCalendarApplication.php',
     'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
     'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
     'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
@@ -1372,6 +1314,7 @@
     'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php',
     'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
     'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
+    'PhabricatorChatLogApplication' => 'applications/chatlog/application/PhabricatorChatLogApplication.php',
     'PhabricatorChatLogChannel' => 'applications/chatlog/storage/PhabricatorChatLogChannel.php',
     'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
     'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/PhabricatorChatLogChannelLogController.php',
@@ -1388,6 +1331,7 @@
     'PhabricatorCommitTagsField' => 'applications/repository/customfield/PhabricatorCommitTagsField.php',
     'PhabricatorCommonPasswords' => 'applications/auth/constants/PhabricatorCommonPasswords.php',
     'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php',
+    'PhabricatorConduitApplication' => 'applications/conduit/application/PhabricatorConduitApplication.php',
     'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
     'PhabricatorConduitConfigOptions' => 'applications/conduit/config/PhabricatorConduitConfigOptions.php',
     'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php',
@@ -1402,6 +1346,7 @@
     'PhabricatorConduitSearchEngine' => 'applications/conduit/query/PhabricatorConduitSearchEngine.php',
     'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php',
     'PhabricatorConfigAllController' => 'applications/config/controller/PhabricatorConfigAllController.php',
+    'PhabricatorConfigApplication' => 'applications/config/application/PhabricatorConfigApplication.php',
     'PhabricatorConfigController' => 'applications/config/controller/PhabricatorConfigController.php',
     'PhabricatorConfigDatabaseSource' => 'infrastructure/env/PhabricatorConfigDatabaseSource.php',
     'PhabricatorConfigDefaultSource' => 'infrastructure/env/PhabricatorConfigDefaultSource.php',
@@ -1436,6 +1381,7 @@
     'PhabricatorConfigTransactionQuery' => 'applications/config/query/PhabricatorConfigTransactionQuery.php',
     'PhabricatorConfigValidationException' => 'applications/config/exception/PhabricatorConfigValidationException.php',
     'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php',
+    'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php',
     'PhabricatorConpherencePHIDTypeThread' => 'applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php',
     'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
     'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
@@ -1443,6 +1389,7 @@
     'PhabricatorCookies' => 'applications/auth/constants/PhabricatorCookies.php',
     'PhabricatorCoreConfigOptions' => 'applications/config/option/PhabricatorCoreConfigOptions.php',
     'PhabricatorCountdown' => 'applications/countdown/storage/PhabricatorCountdown.php',
+    'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
     'PhabricatorCountdownCapabilityDefaultView' => 'applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php',
     'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
     'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
@@ -1499,8 +1446,10 @@
     'PhabricatorDaemonManagementWorkflow' => 'applications/daemon/management/PhabricatorDaemonManagementWorkflow.php',
     'PhabricatorDaemonReference' => 'infrastructure/daemon/control/PhabricatorDaemonReference.php',
     'PhabricatorDaemonTaskGarbageCollector' => 'applications/daemon/garbagecollector/PhabricatorDaemonTaskGarbageCollector.php',
+    'PhabricatorDaemonsApplication' => 'applications/daemon/application/PhabricatorDaemonsApplication.php',
     'PhabricatorDashboard' => 'applications/dashboard/storage/PhabricatorDashboard.php',
     'PhabricatorDashboardAddPanelController' => 'applications/dashboard/controller/PhabricatorDashboardAddPanelController.php',
+    'PhabricatorDashboardApplication' => 'applications/dashboard/application/PhabricatorDashboardApplication.php',
     'PhabricatorDashboardController' => 'applications/dashboard/controller/PhabricatorDashboardController.php',
     'PhabricatorDashboardCopyController' => 'applications/dashboard/controller/PhabricatorDashboardCopyController.php',
     'PhabricatorDashboardDAO' => 'applications/dashboard/storage/PhabricatorDashboardDAO.php',
@@ -1553,13 +1502,18 @@
     'PhabricatorDestructionEngine' => 'applications/system/engine/PhabricatorDestructionEngine.php',
     'PhabricatorDeveloperConfigOptions' => 'applications/config/option/PhabricatorDeveloperConfigOptions.php',
     'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php',
+    'PhabricatorDifferentialApplication' => 'applications/differential/application/PhabricatorDifferentialApplication.php',
     'PhabricatorDifferentialConfigOptions' => 'applications/differential/config/PhabricatorDifferentialConfigOptions.php',
     'PhabricatorDifferentialRevisionTestDataGenerator' => 'applications/differential/lipsum/PhabricatorDifferentialRevisionTestDataGenerator.php',
+    'PhabricatorDiffusionApplication' => 'applications/diffusion/application/PhabricatorDiffusionApplication.php',
     'PhabricatorDiffusionConfigOptions' => 'applications/diffusion/config/PhabricatorDiffusionConfigOptions.php',
     'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php',
     'PhabricatorDisqusConfigOptions' => 'applications/config/option/PhabricatorDisqusConfigOptions.php',
+    'PhabricatorDivinerApplication' => 'applications/diviner/application/PhabricatorDivinerApplication.php',
+    'PhabricatorDoorkeeperApplication' => 'applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php',
     'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
     'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
+    'PhabricatorDrydockApplication' => 'applications/drydock/application/PhabricatorDrydockApplication.php',
     'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
     'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
     'PhabricatorEdgeCycleException' => 'infrastructure/edges/exception/PhabricatorEdgeCycleException.php',
@@ -1585,6 +1539,7 @@
     'PhabricatorExternalAccount' => 'applications/people/storage/PhabricatorExternalAccount.php',
     'PhabricatorExternalAccountQuery' => 'applications/auth/query/PhabricatorExternalAccountQuery.php',
     'PhabricatorFactAggregate' => 'applications/fact/storage/PhabricatorFactAggregate.php',
+    'PhabricatorFactApplication' => 'applications/fact/application/PhabricatorFactApplication.php',
     'PhabricatorFactChartController' => 'applications/fact/controller/PhabricatorFactChartController.php',
     'PhabricatorFactController' => 'applications/fact/controller/PhabricatorFactController.php',
     'PhabricatorFactCountEngine' => 'applications/fact/engine/PhabricatorFactCountEngine.php',
@@ -1604,6 +1559,7 @@
     'PhabricatorFactSimpleSpec' => 'applications/fact/spec/PhabricatorFactSimpleSpec.php',
     'PhabricatorFactSpec' => 'applications/fact/spec/PhabricatorFactSpec.php',
     'PhabricatorFactUpdateIterator' => 'applications/fact/extract/PhabricatorFactUpdateIterator.php',
+    'PhabricatorFeedApplication' => 'applications/feed/application/PhabricatorFeedApplication.php',
     'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php',
     'PhabricatorFeedConfigOptions' => 'applications/feed/config/PhabricatorFeedConfigOptions.php',
     'PhabricatorFeedConstants' => 'applications/feed/constants/PhabricatorFeedConstants.php',
@@ -1663,6 +1619,7 @@
     'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php',
     'PhabricatorFileUploadDialogController' => 'applications/files/controller/PhabricatorFileUploadDialogController.php',
     'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
+    'PhabricatorFilesApplication' => 'applications/files/application/PhabricatorFilesApplication.php',
     'PhabricatorFilesConfigOptions' => 'applications/files/config/PhabricatorFilesConfigOptions.php',
     'PhabricatorFilesManagementEnginesWorkflow' => 'applications/files/management/PhabricatorFilesManagementEnginesWorkflow.php',
     'PhabricatorFilesManagementMigrateWorkflow' => 'applications/files/management/PhabricatorFilesManagementMigrateWorkflow.php',
@@ -1681,6 +1638,7 @@
     'PhabricatorFlagSearchEngine' => 'applications/flag/query/PhabricatorFlagSearchEngine.php',
     'PhabricatorFlagSelectControl' => 'applications/flag/view/PhabricatorFlagSelectControl.php',
     'PhabricatorFlaggableInterface' => 'applications/flag/interface/PhabricatorFlaggableInterface.php',
+    'PhabricatorFlagsApplication' => 'applications/flag/application/PhabricatorFlagsApplication.php',
     'PhabricatorFlagsUIEventListener' => 'applications/flag/events/PhabricatorFlagsUIEventListener.php',
     'PhabricatorFormExample' => 'applications/uiexample/examples/PhabricatorFormExample.php',
     'PhabricatorGarbageCollector' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollector.php',
@@ -1692,12 +1650,16 @@
     'PhabricatorGlobalUploadTargetView' => 'applications/files/view/PhabricatorGlobalUploadTargetView.php',
     'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php',
     'PhabricatorHandleQuery' => 'applications/phid/query/PhabricatorHandleQuery.php',
+    'PhabricatorHarbormasterApplication' => 'applications/harbormaster/application/PhabricatorHarbormasterApplication.php',
     'PhabricatorHarbormasterConfigOptions' => 'applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php',
     'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php',
     'PhabricatorHashTestCase' => 'infrastructure/util/__tests__/PhabricatorHashTestCase.php',
+    'PhabricatorHelpApplication' => 'applications/help/application/PhabricatorHelpApplication.php',
     'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php',
     'PhabricatorHelpEditorProtocolController' => 'applications/help/controller/PhabricatorHelpEditorProtocolController.php',
     'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
+    'PhabricatorHeraldApplication' => 'applications/herald/application/PhabricatorHeraldApplication.php',
+    'PhabricatorHomeApplication' => 'applications/home/application/PhabricatorHomeApplication.php',
     'PhabricatorHomeController' => 'applications/home/controller/PhabricatorHomeController.php',
     'PhabricatorHomeMainController' => 'applications/home/controller/PhabricatorHomeMainController.php',
     'PhabricatorHomeQuickCreateController' => 'applications/home/controller/PhabricatorHomeQuickCreateController.php',
@@ -1719,6 +1681,7 @@
     'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
     'PhabricatorKeyValueDatabaseCache' => 'applications/cache/PhabricatorKeyValueDatabaseCache.php',
     'PhabricatorLegacyEdgeType' => 'infrastructure/edges/type/PhabricatorLegacyEdgeType.php',
+    'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
     'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
     'PhabricatorLegalpadPHIDTypeDocument' => 'applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php',
     'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
@@ -1729,6 +1692,7 @@
     'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
     'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
     'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
+    'PhabricatorMacroApplication' => 'applications/macro/application/PhabricatorMacroApplication.php',
     'PhabricatorMacroAudioController' => 'applications/macro/controller/PhabricatorMacroAudioController.php',
     'PhabricatorMacroCapabilityManage' => 'applications/macro/capability/PhabricatorMacroCapabilityManage.php',
     'PhabricatorMacroCommentController' => 'applications/macro/controller/PhabricatorMacroCommentController.php',
@@ -1775,6 +1739,7 @@
     'PhabricatorMailingListPHIDTypeList' => 'applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php',
     'PhabricatorMailingListQuery' => 'applications/mailinglists/query/PhabricatorMailingListQuery.php',
     'PhabricatorMailingListSearchEngine' => 'applications/mailinglists/query/PhabricatorMailingListSearchEngine.php',
+    'PhabricatorMailingListsApplication' => 'applications/mailinglists/application/PhabricatorMailingListsApplication.php',
     'PhabricatorMailingListsController' => 'applications/mailinglists/controller/PhabricatorMailingListsController.php',
     'PhabricatorMailingListsEditController' => 'applications/mailinglists/controller/PhabricatorMailingListsEditController.php',
     'PhabricatorMailingListsListController' => 'applications/mailinglists/controller/PhabricatorMailingListsListController.php',
@@ -1783,6 +1748,7 @@
     'PhabricatorMainMenuSearchView' => 'view/page/menu/PhabricatorMainMenuSearchView.php',
     'PhabricatorMainMenuView' => 'view/page/menu/PhabricatorMainMenuView.php',
     'PhabricatorManagementWorkflow' => 'infrastructure/management/PhabricatorManagementWorkflow.php',
+    'PhabricatorManiphestApplication' => 'applications/maniphest/application/PhabricatorManiphestApplication.php',
     'PhabricatorManiphestConfigOptions' => 'applications/maniphest/config/PhabricatorManiphestConfigOptions.php',
     'PhabricatorManiphestTaskTestDataGenerator' => 'applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php',
     'PhabricatorMarkupCache' => 'applications/cache/storage/PhabricatorMarkupCache.php',
@@ -1793,6 +1759,7 @@
     'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php',
     'PhabricatorMetaMTAActor' => 'applications/metamta/query/PhabricatorMetaMTAActor.php',
     'PhabricatorMetaMTAActorQuery' => 'applications/metamta/query/PhabricatorMetaMTAActorQuery.php',
+    'PhabricatorMetaMTAApplication' => 'applications/metamta/application/PhabricatorMetaMTAApplication.php',
     'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php',
     'PhabricatorMetaMTAConfigOptions' => 'applications/config/option/PhabricatorMetaMTAConfigOptions.php',
     'PhabricatorMetaMTAController' => 'applications/metamta/controller/PhabricatorMetaMTAController.php',
@@ -1829,10 +1796,12 @@
     'PhabricatorNotificationIndividualController' => 'applications/notification/controller/PhabricatorNotificationIndividualController.php',
     'PhabricatorNotificationListController' => 'applications/notification/controller/PhabricatorNotificationListController.php',
     'PhabricatorNotificationPanelController' => 'applications/notification/controller/PhabricatorNotificationPanelController.php',
-    'PhabricatorNotificationQuery' => 'applications/notification/PhabricatorNotificationQuery.php',
+    'PhabricatorNotificationQuery' => 'applications/notification/query/PhabricatorNotificationQuery.php',
     'PhabricatorNotificationStatusController' => 'applications/notification/controller/PhabricatorNotificationStatusController.php',
     'PhabricatorNotificationStatusView' => 'applications/notification/view/PhabricatorNotificationStatusView.php',
     'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php',
+    'PhabricatorNotificationsApplication' => 'applications/notification/application/PhabricatorNotificationsApplication.php',
+    'PhabricatorNuanceApplication' => 'applications/nuance/application/PhabricatorNuanceApplication.php',
     'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
     'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
     'PhabricatorOAuthClientBaseController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php',
@@ -1843,6 +1812,7 @@
     'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
     'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
     'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php',
+    'PhabricatorOAuthServerApplication' => 'applications/oauthserver/application/PhabricatorOAuthServerApplication.php',
     'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
     'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
     'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php',
@@ -1869,6 +1839,7 @@
     'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
     'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
     'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
+    'PhabricatorOwnersApplication' => 'applications/owners/application/PhabricatorOwnersApplication.php',
     'PhabricatorOwnersConfigOptions' => 'applications/owners/config/PhabricatorOwnersConfigOptions.php',
     'PhabricatorOwnersController' => 'applications/owners/controller/PhabricatorOwnersController.php',
     'PhabricatorOwnersDAO' => 'applications/owners/storage/PhabricatorOwnersDAO.php',
@@ -1889,12 +1860,15 @@
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDType' => 'applications/phid/type/PhabricatorPHIDType.php',
+    'PhabricatorPHPASTApplication' => 'applications/phpast/application/PhabricatorPHPASTApplication.php',
     'PhabricatorPHPMailerConfigOptions' => 'applications/config/option/PhabricatorPHPMailerConfigOptions.php',
     'PhabricatorPagedFormExample' => 'applications/uiexample/examples/PhabricatorPagedFormExample.php',
+    'PhabricatorPassphraseApplication' => 'applications/passphrase/application/PhabricatorPassphraseApplication.php',
     'PhabricatorPasswordHasher' => 'infrastructure/util/password/PhabricatorPasswordHasher.php',
     'PhabricatorPasswordHasherTestCase' => 'infrastructure/util/password/__tests__/PhabricatorPasswordHasherTestCase.php',
     'PhabricatorPasswordHasherUnavailableException' => 'infrastructure/util/password/PhabricatorPasswordHasherUnavailableException.php',
     'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php',
+    'PhabricatorPasteApplication' => 'applications/paste/application/PhabricatorPasteApplication.php',
     'PhabricatorPasteCommentController' => 'applications/paste/controller/PhabricatorPasteCommentController.php',
     'PhabricatorPasteConfigOptions' => 'applications/paste/config/PhabricatorPasteConfigOptions.php',
     'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php',
@@ -1911,6 +1885,7 @@
     'PhabricatorPasteTransactionComment' => 'applications/paste/storage/PhabricatorPasteTransactionComment.php',
     'PhabricatorPasteTransactionQuery' => 'applications/paste/query/PhabricatorPasteTransactionQuery.php',
     'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php',
+    'PhabricatorPeopleApplication' => 'applications/people/application/PhabricatorPeopleApplication.php',
     'PhabricatorPeopleApproveController' => 'applications/people/controller/PhabricatorPeopleApproveController.php',
     'PhabricatorPeopleCalendarController' => 'applications/people/controller/PhabricatorPeopleCalendarController.php',
     'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php',
@@ -1936,16 +1911,24 @@
     'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
     'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
     'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php',
+    'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
     'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
     'PhabricatorPhamePHIDTypeBlog' => 'applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php',
     'PhabricatorPhamePHIDTypePost' => 'applications/phame/phid/PhabricatorPhamePHIDTypePost.php',
+    'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php',
+    'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php',
     'PhabricatorPholioConfigOptions' => 'applications/pholio/config/PhabricatorPholioConfigOptions.php',
     'PhabricatorPholioMockTestDataGenerator' => 'applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php',
+    'PhabricatorPhortuneApplication' => 'applications/phortune/application/PhabricatorPhortuneApplication.php',
     'PhabricatorPhortuneConfigOptions' => 'applications/phortune/option/PhabricatorPhortuneConfigOptions.php',
+    'PhabricatorPhragmentApplication' => 'applications/phragment/application/PhabricatorPhragmentApplication.php',
+    'PhabricatorPhrequentApplication' => 'applications/phrequent/application/PhabricatorPhrequentApplication.php',
     'PhabricatorPhrequentConfigOptions' => 'applications/phrequent/config/PhabricatorPhrequentConfigOptions.php',
+    'PhabricatorPhrictionApplication' => 'applications/phriction/application/PhabricatorPhrictionApplication.php',
     'PhabricatorPhrictionConfigOptions' => 'applications/phriction/config/PhabricatorPhrictionConfigOptions.php',
     'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php',
     'PhabricatorPolicy' => 'applications/policy/storage/PhabricatorPolicy.php',
+    'PhabricatorPolicyApplication' => 'applications/policy/application/PhabricatorPolicyApplication.php',
     'PhabricatorPolicyAwareQuery' => 'infrastructure/query/policy/PhabricatorPolicyAwareQuery.php',
     'PhabricatorPolicyAwareTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyAwareTestQuery.php',
     'PhabricatorPolicyCapability' => 'applications/policy/capability/PhabricatorPolicyCapability.php',
@@ -1976,7 +1959,9 @@
     'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
     'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
     'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
+    'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php',
     'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php',
+    'PhabricatorProjectApplication' => 'applications/project/application/PhabricatorProjectApplication.php',
     'PhabricatorProjectArchiveController' => 'applications/project/controller/PhabricatorProjectArchiveController.php',
     'PhabricatorProjectBoardController' => 'applications/project/controller/PhabricatorProjectBoardController.php',
     'PhabricatorProjectBoardDeleteController' => 'applications/project/controller/PhabricatorProjectBoardDeleteController.php',
@@ -2037,6 +2022,8 @@
     'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
     'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php',
     'PhabricatorRegistrationProfile' => 'applications/people/storage/PhabricatorRegistrationProfile.php',
+    'PhabricatorReleephApplication' => 'applications/releeph/application/PhabricatorReleephApplication.php',
+    'PhabricatorReleephApplicationConfigOptions' => 'applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php',
     'PhabricatorRemarkupBlockInterpreterCowsay' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterCowsay.php',
     'PhabricatorRemarkupBlockInterpreterFiglet' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterFiglet.php',
     'PhabricatorRemarkupBlockInterpreterGraphviz' => 'infrastructure/markup/interpreter/PhabricatorRemarkupBlockInterpreterGraphviz.php',
@@ -2051,6 +2038,7 @@
     'PhabricatorRemarkupRuleMention' => 'applications/people/remarkup/PhabricatorRemarkupRuleMention.php',
     'PhabricatorRemarkupRuleObject' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleObject.php',
     'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/rule/PhabricatorRemarkupRuleYoutube.php',
+    'PhabricatorRepositoriesApplication' => 'applications/repository/application/PhabricatorRepositoriesApplication.php',
     'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
     'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php',
     'PhabricatorRepositoryArcanistProjectDeleteController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectDeleteController.php',
@@ -2153,6 +2141,7 @@
     'PhabricatorSavedQueryQuery' => 'applications/search/query/PhabricatorSavedQueryQuery.php',
     'PhabricatorScopedEnv' => 'infrastructure/env/PhabricatorScopedEnv.php',
     'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
+    'PhabricatorSearchApplication' => 'applications/search/application/PhabricatorSearchApplication.php',
     'PhabricatorSearchApplicationSearchEngine' => 'applications/search/query/PhabricatorSearchApplicationSearchEngine.php',
     'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php',
     'PhabricatorSearchBaseController' => 'applications/search/controller/PhabricatorSearchBaseController.php',
@@ -2186,6 +2175,7 @@
     'PhabricatorSendGridConfigOptions' => 'applications/config/option/PhabricatorSendGridConfigOptions.php',
     'PhabricatorSettingsAddEmailAction' => 'applications/settings/action/PhabricatorSettingsAddEmailAction.php',
     'PhabricatorSettingsAdjustController' => 'applications/settings/controller/PhabricatorSettingsAdjustController.php',
+    'PhabricatorSettingsApplication' => 'applications/settings/application/PhabricatorSettingsApplication.php',
     'PhabricatorSettingsMainController' => 'applications/settings/controller/PhabricatorSettingsMainController.php',
     'PhabricatorSettingsPanel' => 'applications/settings/panel/PhabricatorSettingsPanel.php',
     'PhabricatorSettingsPanelAccount' => 'applications/settings/panel/PhabricatorSettingsPanelAccount.php',
@@ -2229,6 +2219,7 @@
     'PhabricatorSetupIssue' => 'applications/config/issue/PhabricatorSetupIssue.php',
     'PhabricatorSetupIssueExample' => 'applications/uiexample/examples/PhabricatorSetupIssueExample.php',
     'PhabricatorSetupIssueView' => 'applications/config/view/PhabricatorSetupIssueView.php',
+    'PhabricatorSlowvoteApplication' => 'applications/slowvote/application/PhabricatorSlowvoteApplication.php',
     'PhabricatorSlowvoteCapabilityDefaultView' => 'applications/slowvote/capability/PhabricatorSlowvoteCapabilityDefaultView.php',
     'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
     'PhabricatorSlowvoteCloseController' => 'applications/slowvote/controller/PhabricatorSlowvoteCloseController.php',
@@ -2279,11 +2270,13 @@
     'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php',
     'PhabricatorSubscribableInterface' => 'applications/subscriptions/interface/PhabricatorSubscribableInterface.php',
     'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php',
+    'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php',
     'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php',
     'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php',
     'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php',
     'PhabricatorSubscriptionsTransactionController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsTransactionController.php',
     'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php',
+    'PhabricatorSupportApplication' => 'applications/support/application/PhabricatorSupportApplication.php',
     'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
     'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
     'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php',
@@ -2292,6 +2285,7 @@
     'PhabricatorSystemActionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemActionGarbageCollector.php',
     'PhabricatorSystemActionLog' => 'applications/system/storage/PhabricatorSystemActionLog.php',
     'PhabricatorSystemActionRateLimitException' => 'applications/system/exception/PhabricatorSystemActionRateLimitException.php',
+    'PhabricatorSystemApplication' => 'applications/system/application/PhabricatorSystemApplication.php',
     'PhabricatorSystemDAO' => 'applications/system/storage/PhabricatorSystemDAO.php',
     'PhabricatorSystemDestructionGarbageCollector' => 'applications/system/garbagecollector/PhabricatorSystemDestructionGarbageCollector.php',
     'PhabricatorSystemDestructionLog' => 'applications/system/storage/PhabricatorSystemDestructionLog.php',
@@ -2301,6 +2295,7 @@
     'PhabricatorSystemSelectEncodingController' => 'applications/system/controller/PhabricatorSystemSelectEncodingController.php',
     'PhabricatorSystemSelectHighlightController' => 'applications/system/controller/PhabricatorSystemSelectHighlightController.php',
     'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
+    'PhabricatorTestApplication' => 'applications/base/controller/__tests__/PhabricatorTestApplication.php',
     'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
     'PhabricatorTestController' => 'applications/base/controller/__tests__/PhabricatorTestController.php',
     'PhabricatorTestDataGenerator' => 'applications/lipsum/generator/PhabricatorTestDataGenerator.php',
@@ -2326,13 +2321,16 @@
     'PhabricatorTokenReceiverInterface' => 'applications/tokens/interface/PhabricatorTokenReceiverInterface.php',
     'PhabricatorTokenReceiverQuery' => 'applications/tokens/query/PhabricatorTokenReceiverQuery.php',
     'PhabricatorTokenUIEventListener' => 'applications/tokens/event/PhabricatorTokenUIEventListener.php',
+    'PhabricatorTokensApplication' => 'applications/tokens/application/PhabricatorTokensApplication.php',
     'PhabricatorTransactionView' => 'view/layout/PhabricatorTransactionView.php',
     'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php',
+    'PhabricatorTransactionsApplication' => 'applications/transactions/application/PhabricatorTransactionsApplication.php',
     'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php',
     'PhabricatorTranslation' => 'infrastructure/internationalization/translation/PhabricatorTranslation.php',
     'PhabricatorTranslationsConfigOptions' => 'applications/config/option/PhabricatorTranslationsConfigOptions.php',
     'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php',
     'PhabricatorTwoColumnExample' => 'applications/uiexample/examples/PhabricatorTwoColumnExample.php',
+    'PhabricatorTypeaheadApplication' => 'applications/typeahead/application/PhabricatorTypeaheadApplication.php',
     'PhabricatorTypeaheadCompositeDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadCompositeDatasource.php',
     'PhabricatorTypeaheadDatasource' => 'applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php',
     'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php',
@@ -2345,6 +2343,7 @@
     'PhabricatorUIConfigOptions' => 'applications/config/option/PhabricatorUIConfigOptions.php',
     'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
     'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
+    'PhabricatorUIExamplesApplication' => 'applications/uiexample/application/PhabricatorUIExamplesApplication.php',
     'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/PhabricatorUIListFilterExample.php',
     'PhabricatorUINotificationExample' => 'applications/uiexample/examples/PhabricatorUINotificationExample.php',
     'PhabricatorUIPagerExample' => 'applications/uiexample/examples/PhabricatorUIPagerExample.php',
@@ -2404,6 +2403,7 @@
     'PhabricatorXHPASTViewRunController' => 'applications/phpast/controller/PhabricatorXHPASTViewRunController.php',
     'PhabricatorXHPASTViewStreamController' => 'applications/phpast/controller/PhabricatorXHPASTViewStreamController.php',
     'PhabricatorXHPASTViewTreeController' => 'applications/phpast/controller/PhabricatorXHPASTViewTreeController.php',
+    'PhabricatorXHProfApplication' => 'applications/xhprof/application/PhabricatorXHProfApplication.php',
     'PhabricatorXHProfController' => 'applications/xhprof/controller/PhabricatorXHProfController.php',
     'PhabricatorXHProfDAO' => 'applications/xhprof/storage/PhabricatorXHProfDAO.php',
     'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/PhabricatorXHProfProfileController.php',
@@ -3917,73 +3917,15 @@
     'PhabricatorAphrontViewTestCase' => 'PhabricatorTestCase',
     'PhabricatorAppSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorApplication' => 'PhabricatorPolicyInterface',
-    'PhabricatorApplicationApplications' => 'PhabricatorApplication',
-    'PhabricatorApplicationAudit' => 'PhabricatorApplication',
-    'PhabricatorApplicationAuth' => 'PhabricatorApplication',
-    'PhabricatorApplicationCalendar' => 'PhabricatorApplication',
-    'PhabricatorApplicationChatLog' => 'PhabricatorApplication',
-    'PhabricatorApplicationConduit' => 'PhabricatorApplication',
-    'PhabricatorApplicationConfig' => 'PhabricatorApplication',
     'PhabricatorApplicationConfigOptions' => 'Phobject',
-    'PhabricatorApplicationConpherence' => 'PhabricatorApplication',
-    'PhabricatorApplicationCountdown' => 'PhabricatorApplication',
-    'PhabricatorApplicationDaemons' => 'PhabricatorApplication',
-    'PhabricatorApplicationDashboard' => 'PhabricatorApplication',
     'PhabricatorApplicationDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorApplicationDetailViewController' => 'PhabricatorApplicationsController',
-    'PhabricatorApplicationDifferential' => 'PhabricatorApplication',
-    'PhabricatorApplicationDiffusion' => 'PhabricatorApplication',
-    'PhabricatorApplicationDiviner' => 'PhabricatorApplication',
-    'PhabricatorApplicationDoorkeeper' => 'PhabricatorApplication',
-    'PhabricatorApplicationDrydock' => 'PhabricatorApplication',
     'PhabricatorApplicationEditController' => 'PhabricatorApplicationsController',
-    'PhabricatorApplicationFact' => 'PhabricatorApplication',
-    'PhabricatorApplicationFeed' => 'PhabricatorApplication',
-    'PhabricatorApplicationFiles' => 'PhabricatorApplication',
-    'PhabricatorApplicationFlags' => 'PhabricatorApplication',
-    'PhabricatorApplicationHarbormaster' => 'PhabricatorApplication',
-    'PhabricatorApplicationHelp' => 'PhabricatorApplication',
-    'PhabricatorApplicationHerald' => 'PhabricatorApplication',
-    'PhabricatorApplicationHome' => 'PhabricatorApplication',
     'PhabricatorApplicationLaunchView' => 'AphrontTagView',
-    'PhabricatorApplicationLegalpad' => 'PhabricatorApplication',
-    'PhabricatorApplicationMacro' => 'PhabricatorApplication',
-    'PhabricatorApplicationMailingLists' => 'PhabricatorApplication',
-    'PhabricatorApplicationManiphest' => 'PhabricatorApplication',
-    'PhabricatorApplicationMetaMTA' => 'PhabricatorApplication',
-    'PhabricatorApplicationNotifications' => 'PhabricatorApplication',
-    'PhabricatorApplicationNuance' => 'PhabricatorApplication',
-    'PhabricatorApplicationOAuthServer' => 'PhabricatorApplication',
-    'PhabricatorApplicationOwners' => 'PhabricatorApplication',
     'PhabricatorApplicationPHIDTypeApplication' => 'PhabricatorPHIDType',
-    'PhabricatorApplicationPHPAST' => 'PhabricatorApplication',
-    'PhabricatorApplicationPassphrase' => 'PhabricatorApplication',
-    'PhabricatorApplicationPaste' => 'PhabricatorApplication',
-    'PhabricatorApplicationPeople' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhame' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhlux' => 'PhabricatorApplication',
-    'PhabricatorApplicationPholio' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhortune' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhragment' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhrequent' => 'PhabricatorApplication',
-    'PhabricatorApplicationPhriction' => 'PhabricatorApplication',
-    'PhabricatorApplicationPolicy' => 'PhabricatorApplication',
-    'PhabricatorApplicationPonder' => 'PhabricatorApplication',
-    'PhabricatorApplicationProject' => 'PhabricatorApplication',
     'PhabricatorApplicationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhabricatorApplicationReleeph' => 'PhabricatorApplication',
-    'PhabricatorApplicationReleephConfigOptions' => 'PhabricatorApplicationConfigOptions',
-    'PhabricatorApplicationRepositories' => 'PhabricatorApplication',
-    'PhabricatorApplicationSearch' => 'PhabricatorApplication',
     'PhabricatorApplicationSearchController' => 'PhabricatorSearchBaseController',
-    'PhabricatorApplicationSettings' => 'PhabricatorApplication',
-    'PhabricatorApplicationSlowvote' => 'PhabricatorApplication',
     'PhabricatorApplicationStatusView' => 'AphrontView',
-    'PhabricatorApplicationSubscriptions' => 'PhabricatorApplication',
-    'PhabricatorApplicationSupport' => 'PhabricatorApplication',
-    'PhabricatorApplicationSystem' => 'PhabricatorApplication',
-    'PhabricatorApplicationTest' => 'PhabricatorApplication',
-    'PhabricatorApplicationTokens' => 'PhabricatorApplication',
     'PhabricatorApplicationTransaction' => array(
       0 => 'PhabricatorLiskDAO',
       1 => 'PhabricatorPolicyInterface',
@@ -4017,15 +3959,13 @@
     'PhabricatorApplicationTransactionValidationException' => 'Exception',
     'PhabricatorApplicationTransactionValueController' => 'PhabricatorApplicationTransactionController',
     'PhabricatorApplicationTransactionView' => 'AphrontView',
-    'PhabricatorApplicationTransactions' => 'PhabricatorApplication',
-    'PhabricatorApplicationTypeahead' => 'PhabricatorApplication',
-    'PhabricatorApplicationUIExamples' => 'PhabricatorApplication',
     'PhabricatorApplicationUninstallController' => 'PhabricatorApplicationsController',
-    'PhabricatorApplicationXHProf' => 'PhabricatorApplication',
+    'PhabricatorApplicationsApplication' => 'PhabricatorApplication',
     'PhabricatorApplicationsController' => 'PhabricatorController',
     'PhabricatorApplicationsListController' => 'PhabricatorApplicationsController',
     'PhabricatorAsanaConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorAuditAddCommentController' => 'PhabricatorAuditController',
+    'PhabricatorAuditApplication' => 'PhabricatorApplication',
     'PhabricatorAuditComment' => array(
       0 => 'PhabricatorAuditDAO',
       1 => 'PhabricatorMarkupInterface',
@@ -4045,6 +3985,7 @@
     'PhabricatorAuditPreviewController' => 'PhabricatorAuditController',
     'PhabricatorAuditReplyHandler' => 'PhabricatorMailReplyHandler',
     'PhabricatorAuthAccountView' => 'AphrontView',
+    'PhabricatorAuthApplication' => 'PhabricatorApplication',
     'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController',
     'PhabricatorAuthController' => 'PhabricatorController',
     'PhabricatorAuthDAO' => 'PhabricatorLiskDAO',
@@ -4143,6 +4084,7 @@
     'PhabricatorCacheManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorCacheMarkupGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector',
+    'PhabricatorCalendarApplication' => 'PhabricatorApplication',
     'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
     'PhabricatorCalendarController' => 'PhabricatorController',
     'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
@@ -4164,6 +4106,7 @@
     'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter',
     'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
     'PhabricatorChangesetResponse' => 'AphrontProxyResponse',
+    'PhabricatorChatLogApplication' => 'PhabricatorApplication',
     'PhabricatorChatLogChannel' => array(
       0 => 'PhabricatorChatLogDAO',
       1 => 'PhabricatorPolicyInterface',
@@ -4185,6 +4128,7 @@
     'PhabricatorCommitTagsField' => 'PhabricatorCommitCustomField',
     'PhabricatorCommonPasswords' => 'Phobject',
     'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
+    'PhabricatorConduitApplication' => 'PhabricatorApplication',
     'PhabricatorConduitCertificateToken' => 'PhabricatorConduitDAO',
     'PhabricatorConduitConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
@@ -4202,6 +4146,7 @@
     'PhabricatorConduitSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
     'PhabricatorConfigAllController' => 'PhabricatorConfigController',
+    'PhabricatorConfigApplication' => 'PhabricatorApplication',
     'PhabricatorConfigController' => 'PhabricatorController',
     'PhabricatorConfigDatabaseSource' => 'PhabricatorConfigProxySource',
     'PhabricatorConfigDefaultSource' => 'PhabricatorConfigProxySource',
@@ -4239,6 +4184,7 @@
     'PhabricatorConfigTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorConfigValidationException' => 'Exception',
     'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController',
+    'PhabricatorConpherenceApplication' => 'PhabricatorApplication',
     'PhabricatorConpherencePHIDTypeThread' => 'PhabricatorPHIDType',
     'PhabricatorContentSourceView' => 'AphrontView',
     'PhabricatorController' => 'AphrontController',
@@ -4248,6 +4194,7 @@
       0 => 'PhabricatorCountdownDAO',
       1 => 'PhabricatorPolicyInterface',
     ),
+    'PhabricatorCountdownApplication' => 'PhabricatorApplication',
     'PhabricatorCountdownCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PhabricatorCountdownController' => 'PhabricatorController',
     'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
@@ -4303,11 +4250,13 @@
     'PhabricatorDaemonManagementStopWorkflow' => 'PhabricatorDaemonManagementWorkflow',
     'PhabricatorDaemonManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorDaemonTaskGarbageCollector' => 'PhabricatorGarbageCollector',
+    'PhabricatorDaemonsApplication' => 'PhabricatorApplication',
     'PhabricatorDashboard' => array(
       0 => 'PhabricatorDashboardDAO',
       1 => 'PhabricatorPolicyInterface',
     ),
     'PhabricatorDashboardAddPanelController' => 'PhabricatorDashboardController',
+    'PhabricatorDashboardApplication' => 'PhabricatorApplication',
     'PhabricatorDashboardController' => 'PhabricatorController',
     'PhabricatorDashboardCopyController' => 'PhabricatorDashboardController',
     'PhabricatorDashboardDAO' => 'PhabricatorLiskDAO',
@@ -4364,13 +4313,18 @@
     'PhabricatorDefaultSearchEngineSelector' => 'PhabricatorSearchEngineSelector',
     'PhabricatorDestructionEngine' => 'Phobject',
     'PhabricatorDeveloperConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorDifferentialApplication' => 'PhabricatorApplication',
     'PhabricatorDifferentialConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorDifferentialRevisionTestDataGenerator' => 'PhabricatorTestDataGenerator',
+    'PhabricatorDiffusionApplication' => 'PhabricatorApplication',
     'PhabricatorDiffusionConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorDisabledUserController' => 'PhabricatorAuthController',
     'PhabricatorDisqusConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorDivinerApplication' => 'PhabricatorApplication',
+    'PhabricatorDoorkeeperApplication' => 'PhabricatorApplication',
     'PhabricatorDraft' => 'PhabricatorDraftDAO',
     'PhabricatorDraftDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorDrydockApplication' => 'PhabricatorApplication',
     'PhabricatorEdgeConfig' => 'PhabricatorEdgeConstants',
     'PhabricatorEdgeCycleException' => 'Exception',
     'PhabricatorEdgeEditor' => 'Phobject',
@@ -4396,6 +4350,7 @@
     ),
     'PhabricatorExternalAccountQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorFactAggregate' => 'PhabricatorFactDAO',
+    'PhabricatorFactApplication' => 'PhabricatorApplication',
     'PhabricatorFactChartController' => 'PhabricatorFactController',
     'PhabricatorFactController' => 'PhabricatorController',
     'PhabricatorFactCountEngine' => 'PhabricatorFactEngine',
@@ -4413,6 +4368,7 @@
     'PhabricatorFactRaw' => 'PhabricatorFactDAO',
     'PhabricatorFactSimpleSpec' => 'PhabricatorFactSpec',
     'PhabricatorFactUpdateIterator' => 'PhutilBufferedIterator',
+    'PhabricatorFeedApplication' => 'PhabricatorApplication',
     'PhabricatorFeedConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorFeedController' => 'PhabricatorController',
     'PhabricatorFeedDAO' => 'PhabricatorLiskDAO',
@@ -4478,6 +4434,7 @@
     'PhabricatorFileUploadController' => 'PhabricatorFileController',
     'PhabricatorFileUploadDialogController' => 'PhabricatorFileController',
     'PhabricatorFileUploadException' => 'Exception',
+    'PhabricatorFilesApplication' => 'PhabricatorApplication',
     'PhabricatorFilesConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorFilesManagementEnginesWorkflow' => 'PhabricatorFilesManagementWorkflow',
     'PhabricatorFilesManagementMigrateWorkflow' => 'PhabricatorFilesManagementWorkflow',
@@ -4498,6 +4455,7 @@
     'PhabricatorFlagSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorFlagSelectControl' => 'AphrontFormControl',
     'PhabricatorFlaggableInterface' => 'PhabricatorPHIDInterface',
+    'PhabricatorFlagsApplication' => 'PhabricatorApplication',
     'PhabricatorFlagsUIEventListener' => 'PhabricatorEventListener',
     'PhabricatorFormExample' => 'PhabricatorUIExample',
     'PhabricatorGarbageCollector' => 'Phobject',
@@ -4508,11 +4466,15 @@
     'PhabricatorGlobalLock' => 'PhutilLock',
     'PhabricatorGlobalUploadTargetView' => 'AphrontView',
     'PhabricatorHandleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorHarbormasterApplication' => 'PhabricatorApplication',
     'PhabricatorHarbormasterConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorHashTestCase' => 'PhabricatorTestCase',
+    'PhabricatorHelpApplication' => 'PhabricatorApplication',
     'PhabricatorHelpController' => 'PhabricatorController',
     'PhabricatorHelpEditorProtocolController' => 'PhabricatorHelpController',
     'PhabricatorHelpKeyboardShortcutController' => 'PhabricatorHelpController',
+    'PhabricatorHeraldApplication' => 'PhabricatorApplication',
+    'PhabricatorHomeApplication' => 'PhabricatorApplication',
     'PhabricatorHomeController' => 'PhabricatorController',
     'PhabricatorHomeMainController' => 'PhabricatorHomeController',
     'PhabricatorHomeQuickCreateController' => 'PhabricatorHomeController',
@@ -4532,6 +4494,7 @@
     'PhabricatorJavelinLinter' => 'ArcanistLinter',
     'PhabricatorKeyValueDatabaseCache' => 'PhutilKeyValueCache',
     'PhabricatorLegacyEdgeType' => 'PhabricatorEdgeType',
+    'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
     'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorLegalpadPHIDTypeDocument' => 'PhabricatorPHIDType',
     'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
@@ -4541,6 +4504,7 @@
     'PhabricatorLocalDiskFileStorageEngine' => 'PhabricatorFileStorageEngine',
     'PhabricatorLocalTimeTestCase' => 'PhabricatorTestCase',
     'PhabricatorLogoutController' => 'PhabricatorAuthController',
+    'PhabricatorMacroApplication' => 'PhabricatorApplication',
     'PhabricatorMacroAudioController' => 'PhabricatorMacroController',
     'PhabricatorMacroCapabilityManage' => 'PhabricatorPolicyCapability',
     'PhabricatorMacroCommentController' => 'PhabricatorMacroController',
@@ -4582,6 +4546,7 @@
     'PhabricatorMailingListPHIDTypeList' => 'PhabricatorPHIDType',
     'PhabricatorMailingListQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorMailingListSearchEngine' => 'PhabricatorApplicationSearchEngine',
+    'PhabricatorMailingListsApplication' => 'PhabricatorApplication',
     'PhabricatorMailingListsController' => 'PhabricatorController',
     'PhabricatorMailingListsEditController' => 'PhabricatorMailingListsController',
     'PhabricatorMailingListsListController' => 'PhabricatorMailingListsController',
@@ -4590,6 +4555,7 @@
     'PhabricatorMainMenuSearchView' => 'AphrontView',
     'PhabricatorMainMenuView' => 'AphrontView',
     'PhabricatorManagementWorkflow' => 'PhutilArgumentWorkflow',
+    'PhabricatorManiphestApplication' => 'PhabricatorApplication',
     'PhabricatorManiphestConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorManiphestTaskTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorMarkupCache' => 'PhabricatorCacheDAO',
@@ -4597,6 +4563,7 @@
     'PhabricatorMarkupPreviewController' => 'PhabricatorController',
     'PhabricatorMercurialGraphStream' => 'PhabricatorRepositoryGraphStream',
     'PhabricatorMetaMTAActorQuery' => 'PhabricatorQuery',
+    'PhabricatorMetaMTAApplication' => 'PhabricatorApplication',
     'PhabricatorMetaMTAConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMetaMTAController' => 'PhabricatorController',
     'PhabricatorMetaMTADAO' => 'PhabricatorLiskDAO',
@@ -4610,6 +4577,7 @@
     'PhabricatorMetaMTAMailingList' => array(
       0 => 'PhabricatorMetaMTADAO',
       1 => 'PhabricatorPolicyInterface',
+      2 => 'PhabricatorDestructableInterface',
     ),
     'PhabricatorMetaMTAMemberQuery' => 'PhabricatorQuery',
     'PhabricatorMetaMTAPermanentFailureException' => 'Exception',
@@ -4638,6 +4606,8 @@
     'PhabricatorNotificationStatusController' => 'PhabricatorNotificationController',
     'PhabricatorNotificationStatusView' => 'AphrontTagView',
     'PhabricatorNotificationTestController' => 'PhabricatorNotificationController',
+    'PhabricatorNotificationsApplication' => 'PhabricatorApplication',
+    'PhabricatorNuanceApplication' => 'PhabricatorApplication',
     'PhabricatorOAuthClientAuthorization' => array(
       0 => 'PhabricatorOAuthServerDAO',
       1 => 'PhabricatorPolicyInterface',
@@ -4650,6 +4620,7 @@
     'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientBaseController',
     'PhabricatorOAuthResponse' => 'AphrontResponse',
     'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO',
+    'PhabricatorOAuthServerApplication' => 'PhabricatorApplication',
     'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
     'PhabricatorOAuthServerAuthorizationCode' => 'PhabricatorOAuthServerDAO',
     'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'PhabricatorSettingsPanel',
@@ -4674,6 +4645,7 @@
     'PhabricatorObjectMailReceiverTestCase' => 'PhabricatorTestCase',
     'PhabricatorObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorOffsetPagedQuery' => 'PhabricatorQuery',
+    'PhabricatorOwnersApplication' => 'PhabricatorApplication',
     'PhabricatorOwnersConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorOwnersController' => 'PhabricatorController',
     'PhabricatorOwnersDAO' => 'PhabricatorLiskDAO',
@@ -4692,8 +4664,10 @@
     'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase',
     'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
     'PhabricatorPHDConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorPHPASTApplication' => 'PhabricatorApplication',
     'PhabricatorPHPMailerConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPagedFormExample' => 'PhabricatorUIExample',
+    'PhabricatorPassphraseApplication' => 'PhabricatorApplication',
     'PhabricatorPasswordHasher' => 'Phobject',
     'PhabricatorPasswordHasherTestCase' => 'PhabricatorTestCase',
     'PhabricatorPasswordHasherUnavailableException' => 'Exception',
@@ -4705,6 +4679,7 @@
       4 => 'PhabricatorPolicyInterface',
       5 => 'PhabricatorProjectInterface',
     ),
+    'PhabricatorPasteApplication' => 'PhabricatorApplication',
     'PhabricatorPasteCommentController' => 'PhabricatorPasteController',
     'PhabricatorPasteConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPasteController' => 'PhabricatorController',
@@ -4721,6 +4696,7 @@
     'PhabricatorPasteTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'PhabricatorPasteTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
     'PhabricatorPasteViewController' => 'PhabricatorPasteController',
+    'PhabricatorPeopleApplication' => 'PhabricatorApplication',
     'PhabricatorPeopleApproveController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleCalendarController' => 'PhabricatorPeopleController',
     'PhabricatorPeopleController' => 'PhabricatorController',
@@ -4746,19 +4722,27 @@
     'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
     'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController',
+    'PhabricatorPhameApplication' => 'PhabricatorApplication',
     'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPhamePHIDTypeBlog' => 'PhabricatorPHIDType',
     'PhabricatorPhamePHIDTypePost' => 'PhabricatorPHIDType',
+    'PhabricatorPhluxApplication' => 'PhabricatorApplication',
+    'PhabricatorPholioApplication' => 'PhabricatorApplication',
     'PhabricatorPholioConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPholioMockTestDataGenerator' => 'PhabricatorTestDataGenerator',
+    'PhabricatorPhortuneApplication' => 'PhabricatorApplication',
     'PhabricatorPhortuneConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorPhragmentApplication' => 'PhabricatorApplication',
+    'PhabricatorPhrequentApplication' => 'PhabricatorApplication',
     'PhabricatorPhrequentConfigOptions' => 'PhabricatorApplicationConfigOptions',
+    'PhabricatorPhrictionApplication' => 'PhabricatorApplication',
     'PhabricatorPhrictionConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorPolicies' => 'PhabricatorPolicyConstants',
     'PhabricatorPolicy' => array(
       0 => 'PhabricatorPolicyDAO',
       1 => 'PhabricatorPolicyInterface',
     ),
+    'PhabricatorPolicyApplication' => 'PhabricatorApplication',
     'PhabricatorPolicyAwareQuery' => 'PhabricatorOffsetPagedQuery',
     'PhabricatorPolicyAwareTestQuery' => 'PhabricatorPolicyAwareQuery',
     'PhabricatorPolicyCapability' => 'Phobject',
@@ -4786,6 +4770,7 @@
     'PhabricatorPolicyTestCase' => 'PhabricatorTestCase',
     'PhabricatorPolicyTestObject' => 'PhabricatorPolicyInterface',
     'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
+    'PhabricatorPonderApplication' => 'PhabricatorApplication',
     'PhabricatorProject' => array(
       0 => 'PhabricatorProjectDAO',
       1 => 'PhabricatorFlaggableInterface',
@@ -4794,6 +4779,7 @@
       4 => 'PhabricatorCustomFieldInterface',
       5 => 'PhabricatorDestructableInterface',
     ),
+    'PhabricatorProjectApplication' => 'PhabricatorApplication',
     'PhabricatorProjectArchiveController' => 'PhabricatorProjectController',
     'PhabricatorProjectBoardController' => 'PhabricatorProjectController',
     'PhabricatorProjectBoardDeleteController' => 'PhabricatorProjectBoardController',
@@ -4860,6 +4846,8 @@
     'PhabricatorRedirectController' => 'PhabricatorController',
     'PhabricatorRefreshCSRFController' => 'PhabricatorAuthController',
     'PhabricatorRegistrationProfile' => 'Phobject',
+    'PhabricatorReleephApplication' => 'PhabricatorApplication',
+    'PhabricatorReleephApplicationConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorRemarkupBlockInterpreterCowsay' => 'PhutilRemarkupBlockInterpreter',
     'PhabricatorRemarkupBlockInterpreterFiglet' => 'PhutilRemarkupBlockInterpreter',
     'PhabricatorRemarkupBlockInterpreterGraphviz' => 'PhutilRemarkupBlockInterpreter',
@@ -4874,6 +4862,7 @@
     'PhabricatorRemarkupRuleMention' => 'PhutilRemarkupRule',
     'PhabricatorRemarkupRuleObject' => 'PhutilRemarkupRule',
     'PhabricatorRemarkupRuleYoutube' => 'PhutilRemarkupRule',
+    'PhabricatorRepositoriesApplication' => 'PhabricatorApplication',
     'PhabricatorRepository' => array(
       0 => 'PhabricatorRepositoryDAO',
       1 => 'PhabricatorPolicyInterface',
@@ -5004,6 +4993,7 @@
       1 => 'PhabricatorPolicyInterface',
     ),
     'PhabricatorSavedQueryQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+    'PhabricatorSearchApplication' => 'PhabricatorApplication',
     'PhabricatorSearchApplicationSearchEngine' => 'PhabricatorApplicationSearchEngine',
     'PhabricatorSearchAttachController' => 'PhabricatorSearchBaseController',
     'PhabricatorSearchBaseController' => 'PhabricatorController',
@@ -5031,6 +5021,7 @@
     'PhabricatorSendGridConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorSettingsAddEmailAction' => 'PhabricatorSystemAction',
     'PhabricatorSettingsAdjustController' => 'PhabricatorController',
+    'PhabricatorSettingsApplication' => 'PhabricatorApplication',
     'PhabricatorSettingsMainController' => 'PhabricatorController',
     'PhabricatorSettingsPanelAccount' => 'PhabricatorSettingsPanel',
     'PhabricatorSettingsPanelActivity' => 'PhabricatorSettingsPanel',
@@ -5071,6 +5062,7 @@
     'PhabricatorSetupCheckTimezone' => 'PhabricatorSetupCheck',
     'PhabricatorSetupIssueExample' => 'PhabricatorUIExample',
     'PhabricatorSetupIssueView' => 'AphrontView',
+    'PhabricatorSlowvoteApplication' => 'PhabricatorApplication',
     'PhabricatorSlowvoteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
     'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO',
     'PhabricatorSlowvoteCloseController' => 'PhabricatorSlowvoteController',
@@ -5122,17 +5114,20 @@
     'PhabricatorStorageManagementUpgradeWorkflow' => 'PhabricatorStorageManagementWorkflow',
     'PhabricatorStorageManagementWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorSubscribersQuery' => 'PhabricatorQuery',
+    'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication',
     'PhabricatorSubscriptionsEditController' => 'PhabricatorController',
     'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor',
     'PhabricatorSubscriptionsListController' => 'PhabricatorController',
     'PhabricatorSubscriptionsTransactionController' => 'PhabricatorController',
     'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener',
+    'PhabricatorSupportApplication' => 'PhabricatorApplication',
     'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook',
     'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorSystemActionEngine' => 'Phobject',
     'PhabricatorSystemActionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorSystemActionLog' => 'PhabricatorSystemDAO',
     'PhabricatorSystemActionRateLimitException' => 'Exception',
+    'PhabricatorSystemApplication' => 'PhabricatorApplication',
     'PhabricatorSystemDAO' => 'PhabricatorLiskDAO',
     'PhabricatorSystemDestructionGarbageCollector' => 'PhabricatorGarbageCollector',
     'PhabricatorSystemDestructionLog' => 'PhabricatorSystemDAO',
@@ -5142,6 +5137,7 @@
     'PhabricatorSystemSelectEncodingController' => 'PhabricatorController',
     'PhabricatorSystemSelectHighlightController' => 'PhabricatorController',
     'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
+    'PhabricatorTestApplication' => 'PhabricatorApplication',
     'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
     'PhabricatorTestController' => 'PhabricatorController',
     'PhabricatorTestStorageEngine' => 'PhabricatorFileStorageEngine',
@@ -5169,11 +5165,14 @@
     'PhabricatorTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorTokenReceiverQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener',
+    'PhabricatorTokensApplication' => 'PhabricatorApplication',
     'PhabricatorTransactionView' => 'AphrontView',
+    'PhabricatorTransactionsApplication' => 'PhabricatorApplication',
     'PhabricatorTransformedFile' => 'PhabricatorFileDAO',
     'PhabricatorTranslationsConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorTrivialTestCase' => 'PhabricatorTestCase',
     'PhabricatorTwoColumnExample' => 'PhabricatorUIExample',
+    'PhabricatorTypeaheadApplication' => 'PhabricatorApplication',
     'PhabricatorTypeaheadCompositeDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorTypeaheadDatasource' => 'Phobject',
     'PhabricatorTypeaheadDatasourceController' => 'PhabricatorController',
@@ -5184,6 +5183,7 @@
     'PhabricatorTypeaheadRuntimeCompositeDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'PhabricatorUIConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorUIExampleRenderController' => 'PhabricatorController',
+    'PhabricatorUIExamplesApplication' => 'PhabricatorApplication',
     'PhabricatorUIListFilterExample' => 'PhabricatorUIExample',
     'PhabricatorUINotificationExample' => 'PhabricatorUIExample',
     'PhabricatorUIPagerExample' => 'PhabricatorUIExample',
@@ -5254,6 +5254,7 @@
     'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
     'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
     'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
+    'PhabricatorXHProfApplication' => 'PhabricatorApplication',
     'PhabricatorXHProfController' => 'PhabricatorController',
     'PhabricatorXHProfDAO' => 'PhabricatorLiskDAO',
     'PhabricatorXHProfProfileController' => 'PhabricatorXHProfController',
@@ -5483,6 +5484,7 @@
       2 => 'PhabricatorSubscribableInterface',
       3 => 'PhabricatorFlaggableInterface',
       4 => 'PhabricatorTokenReceiverInterface',
+      5 => 'PhabricatorDestructableInterface',
     ),
     'PhrictionDocumentController' => 'PhrictionController',
     'PhrictionDocumentEditor' => 'PhabricatorEditor',
diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
--- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
@@ -8,9 +8,7 @@
 class AphrontDefaultApplicationConfiguration
   extends AphrontApplicationConfiguration {
 
-  public function __construct() {
-
-  }
+  public function __construct() {}
 
   public function getApplicationName() {
     return 'aphront-default';
@@ -172,7 +170,6 @@
     }
 
     if ($ex instanceof PhabricatorPolicyException) {
-
       if (!$user->isLoggedIn()) {
         // If the user isn't logged in, just give them a login form. This is
         // probably a generally more useful response than a policy dialog that
@@ -182,7 +179,7 @@
         // the thing you are trying to look at".
         $login_controller = new PhabricatorAuthStartController($request);
 
-        $auth_app_class = 'PhabricatorApplicationAuth';
+        $auth_app_class = 'PhabricatorAuthApplication';
         $auth_app = PhabricatorApplication::getByClass($auth_app_class);
         $login_controller->setCurrentApplication($auth_app);
 
@@ -247,7 +244,6 @@
       return $response;
     }
 
-
     // Always log the unhandled exception.
     phlog($ex);
 
diff --git a/src/applications/audit/application/PhabricatorApplicationAudit.php b/src/applications/audit/application/PhabricatorAuditApplication.php
rename from src/applications/audit/application/PhabricatorApplicationAudit.php
rename to src/applications/audit/application/PhabricatorAuditApplication.php
--- a/src/applications/audit/application/PhabricatorApplicationAudit.php
+++ b/src/applications/audit/application/PhabricatorAuditApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationAudit extends PhabricatorApplication {
+final class PhabricatorAuditApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/audit/';
@@ -24,7 +24,7 @@
 
   public function getEventListeners() {
     return array(
-      new AuditActionMenuEventListener()
+      new AuditActionMenuEventListener(),
     );
   }
 
diff --git a/src/applications/audit/conduit/ConduitAPI_audit_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
--- a/src/applications/audit/conduit/ConduitAPI_audit_Method.php
+++ b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
@@ -3,7 +3,7 @@
 abstract class ConduitAPI_audit_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass('PhabricatorApplicationAudit');
+    return PhabricatorApplication::getByClass('PhabricatorAuditApplication');
   }
 
 }
diff --git a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
--- a/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
+++ b/src/applications/audit/mail/PhabricatorAuditMailReceiver.php
@@ -3,7 +3,7 @@
 final class PhabricatorAuditMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationAudit';
+    $app_class = 'PhabricatorAuditApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorAuthApplication.php
rename from src/applications/auth/application/PhabricatorApplicationAuth.php
rename to src/applications/auth/application/PhabricatorAuthApplication.php
--- a/src/applications/auth/application/PhabricatorApplicationAuth.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationAuth extends PhabricatorApplication {
+final class PhabricatorAuthApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
@@ -83,11 +83,11 @@
           'new/' => 'PhabricatorAuthNewController',
           'new/(?P<className>[^/]+)/' => 'PhabricatorAuthEditController',
           'edit/(?P<id>\d+)/' => 'PhabricatorAuthEditController',
-          '(?P<action>enable|disable)/(?P<id>\d+)/' =>
-            'PhabricatorAuthDisableController',
+          '(?P<action>enable|disable)/(?P<id>\d+)/'
+            => 'PhabricatorAuthDisableController',
         ),
-        'login/(?P<pkey>[^/]+)/(?:(?P<extra>[^/]+)/)?' =>
-          'PhabricatorAuthLoginController',
+        'login/(?P<pkey>[^/]+)/(?:(?P<extra>[^/]+)/)?'
+          => 'PhabricatorAuthLoginController',
         'register/(?:(?P<akey>[^/]+)/)?' => 'PhabricatorAuthRegisterController',
         'start/' => 'PhabricatorAuthStartController',
         'validate/' => 'PhabricatorAuthValidateController',
@@ -120,8 +120,8 @@
         'mustverify/' => 'PhabricatorMustVerifyEmailController',
       ),
 
-      '/emailverify/(?P<code>[^/]+)/' =>
-        'PhabricatorEmailVerificationController',
+      '/emailverify/(?P<code>[^/]+)/'
+        => 'PhabricatorEmailVerificationController',
 
       '/logout/' => 'PhabricatorLogoutController',
     );
diff --git a/src/applications/auth/provider/PhabricatorAuthProvider.php b/src/applications/auth/provider/PhabricatorAuthProvider.php
--- a/src/applications/auth/provider/PhabricatorAuthProvider.php
+++ b/src/applications/auth/provider/PhabricatorAuthProvider.php
@@ -93,8 +93,7 @@
           throw new Exception(
             pht(
               "Two authentication providers use the same provider key ".
-              "('%s'). Each provider must be identified by a unique ".
-              "key.",
+              "('%s'). Each provider must be identified by a unique key.",
               $key));
         }
         $providers[$key] = $object;
@@ -147,24 +146,22 @@
   }
 
   /**
-   * Should we allow the adapter to be marked as "trusted"
-   * This is true for all adapters except those that allow the user to type in
-   * emails (@see PhabricatorAuthProviderPassword)
+   * Should we allow the adapter to be marked as "trusted". This is true for
+   * all adapters except those that allow the user to type in emails (see
+   * @{class:PhabricatorAuthProviderPassword}).
    */
   public function shouldAllowEmailTrustConfiguration() {
     return true;
   }
 
-  public function buildLoginForm(
-    PhabricatorAuthStartController $controller) {
+  public function buildLoginForm(PhabricatorAuthStartController $controller) {
     return $this->renderLoginForm($controller->getRequest(), $mode = 'start');
   }
 
   abstract public function processLoginRequest(
     PhabricatorAuthLoginController $controller);
 
-  public function buildLinkForm(
-    PhabricatorAuthLinkController $controller) {
+  public function buildLinkForm(PhabricatorAuthLinkController $controller) {
     return $this->renderLoginForm($controller->getRequest(), $mode = 'link');
   }
 
@@ -177,9 +174,7 @@
     return $this->renderLoginForm($controller->getRequest(), $mode = 'refresh');
   }
 
-  protected function renderLoginForm(
-    AphrontRequest $request,
-    $mode) {
+  protected function renderLoginForm(AphrontRequest $request, $mode) {
     throw new Exception('Not implemented!');
   }
 
@@ -197,8 +192,7 @@
 
   protected function loadOrCreateAccount($account_id) {
     if (!strlen($account_id)) {
-      throw new Exception(
-        'loadOrCreateAccount(...): empty account ID!');
+      throw new Exception('loadOrCreateAccount(...): empty account ID!');
     }
 
     $adapter = $this->getAdapter();
@@ -265,14 +259,14 @@
     $this->willSaveAccount($account);
 
     $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
-      $account->save();
+    $account->save();
     unset($unguarded);
 
     return $account;
   }
 
   public function getLoginURI() {
-    $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
+    $app = PhabricatorApplication::getByClass('PhabricatorAuthApplication');
     return $app->getApplicationURI('/login/'.$this->getProviderKey().'/');
   }
 
@@ -281,7 +275,7 @@
   }
 
   public function getStartURI() {
-    $app = PhabricatorApplication::getByClass('PhabricatorApplicationAuth');
+    $app = PhabricatorApplication::getByClass('PhabricatorAuthApplication');
     $uri = $app->getApplicationURI('/start/');
     return $uri;
   }
@@ -339,6 +333,7 @@
     AphrontFormView $form,
     array $values,
     array $issues) {
+
     return;
   }
 
@@ -360,7 +355,6 @@
         $account_view));
   }
 
-
   /**
    * Return true to use a two-step configuration (setup, configure) instead of
    * the default single-step configuration. In practice, this means that
@@ -373,7 +367,6 @@
     return false;
   }
 
-
   /**
    * Render a standard login/register button element.
    *
diff --git a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
--- a/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthProviderConfigQuery.php
@@ -97,7 +97,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationAuth';
+    return 'PhabricatorAuthApplication';
   }
 
 }
diff --git a/src/applications/auth/query/PhabricatorAuthSessionQuery.php b/src/applications/auth/query/PhabricatorAuthSessionQuery.php
--- a/src/applications/auth/query/PhabricatorAuthSessionQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthSessionQuery.php
@@ -106,7 +106,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationAuth';
+    return 'PhabricatorAuthApplication';
   }
 
 }
diff --git a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
--- a/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
+++ b/src/applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php
@@ -100,7 +100,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationAuth';
+    return 'PhabricatorAuthApplication';
   }
 
 }
diff --git a/src/applications/auth/query/PhabricatorExternalAccountQuery.php b/src/applications/auth/query/PhabricatorExternalAccountQuery.php
--- a/src/applications/auth/query/PhabricatorExternalAccountQuery.php
+++ b/src/applications/auth/query/PhabricatorExternalAccountQuery.php
@@ -1,9 +1,9 @@
 <?php
 
 /**
- * NOTE: When loading ExternalAccounts for use in an authetication context (that
- * is, you're going to act as the account or link identities or anything like
- * that) you should require CAN_EDIT capability even if you aren't actually
+ * NOTE: When loading ExternalAccounts for use in an authentication context
+ * (that is, you're going to act as the account or link identities or anything
+ * like that) you should require CAN_EDIT capability even if you aren't actually
  * editing the ExternalAccount.
  *
  * ExternalAccounts have a permissive CAN_VIEW policy (like users) because they
@@ -174,7 +174,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
   /**
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -28,7 +28,18 @@
 
 
   public function getName() {
-    return substr(get_class($this), strlen('PhabricatorApplication'));
+
+    // TODO: This is sort of gross.
+
+    $match = null;
+    $regex = '/^Phabricator([A-Z][a-z]*)Application$/';
+
+    if (preg_match($regex, get_class($this), $match)) {
+      return $match[1];
+    } else {
+      throw new Exception(
+        'Unable to determine application name automagically.');
+    }
   }
 
   public function getShortDescription() {
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -159,7 +159,7 @@
       return $this->delegateToController($checker_controller);
     }
 
-    $auth_class = 'PhabricatorApplicationAuth';
+    $auth_class = 'PhabricatorAuthApplication';
     $auth_application = PhabricatorApplication::getByClass($auth_class);
 
     // Require partial sessions to finish login before doing anything.
@@ -231,7 +231,6 @@
     if ($this->shouldRequireAdmin() && !$user->getIsAdmin()) {
       return new Aphront403Response();
     }
-
   }
 
   public function buildStandardPageView() {
@@ -319,7 +318,6 @@
 
     $seen = array();
     while ($response instanceof AphrontProxyResponse) {
-
       $hash = spl_object_hash($response);
       if (isset($seen[$hash])) {
         $seen[] = get_class($response);
@@ -403,7 +401,6 @@
       ->execute();
   }
 
-
   /**
    * Render a list of links to handles, identified by PHIDs. The handles must
    * already be loaded.
@@ -433,7 +430,6 @@
   }
 
   protected function buildApplicationCrumbs() {
-
     $crumbs = array();
 
     $application = $this->getCurrentApplication();
@@ -516,7 +512,6 @@
     return 'phabricator';
   }
 
-
   /**
    * Create a new @{class:AphrontDialogView} with defaults filled in.
    *
diff --git a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
--- a/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
+++ b/src/applications/base/controller/__tests__/PhabricatorAccessControlTestCase.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorAccessControlTestCase
-  extends PhabricatorTestCase {
+final class PhabricatorAccessControlTestCase extends PhabricatorTestCase {
 
   protected function getPhabricatorTestCaseConfiguration() {
     return array(
@@ -201,7 +200,7 @@
     $env->overrideEnvConfig('policy.allow-public', false);
 
 
-    $app = PhabricatorApplication::getByClass('PhabricatorApplicationTest');
+    $app = PhabricatorApplication::getByClass('PhabricatorTestApplication');
     $app->reset();
     $app->setPolicy(
       PhabricatorPolicyCapability::CAN_VIEW,
diff --git a/src/applications/base/controller/__tests__/PhabricatorApplicationTest.php b/src/applications/base/controller/__tests__/PhabricatorTestApplication.php
rename from src/applications/base/controller/__tests__/PhabricatorApplicationTest.php
rename to src/applications/base/controller/__tests__/PhabricatorTestApplication.php
--- a/src/applications/base/controller/__tests__/PhabricatorApplicationTest.php
+++ b/src/applications/base/controller/__tests__/PhabricatorTestApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationTest extends PhabricatorApplication {
+final class PhabricatorTestApplication extends PhabricatorApplication {
 
   private $policies = array();
 
@@ -30,8 +30,7 @@
   }
 
   public function getRoutes() {
-    return array(
-    );
+    return array();
   }
 
 }
diff --git a/src/applications/calendar/application/PhabricatorApplicationCalendar.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
rename from src/applications/calendar/application/PhabricatorApplicationCalendar.php
rename to src/applications/calendar/application/PhabricatorCalendarApplication.php
--- a/src/applications/calendar/application/PhabricatorApplicationCalendar.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationCalendar extends PhabricatorApplication {
+final class PhabricatorCalendarApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Upcoming Events');
@@ -34,16 +34,16 @@
         '' => 'PhabricatorCalendarViewController',
         'all/' => 'PhabricatorCalendarBrowseController',
         'event/' => array(
-          '(?:query/(?P<queryKey>[^/]+)/)?' =>
-            'PhabricatorCalendarEventListController',
-          'create/' =>
-            'PhabricatorCalendarEventEditController',
-          'edit/(?P<id>[1-9]\d*)/' =>
-            'PhabricatorCalendarEventEditController',
-          'delete/(?P<id>[1-9]\d*)/' =>
-            'PhabricatorCalendarEventDeleteController',
-          'view/(?P<id>[1-9]\d*)/' =>
-            'PhabricatorCalendarEventViewController',
+          '(?:query/(?P<queryKey>[^/]+)/)?'
+            => 'PhabricatorCalendarEventListController',
+          'create/'
+            => 'PhabricatorCalendarEventEditController',
+          'edit/(?P<id>[1-9]\d*)/'
+            => 'PhabricatorCalendarEventEditController',
+          'delete/(?P<id>[1-9]\d*)/'
+            => 'PhabricatorCalendarEventDeleteController',
+          'view/(?P<id>[1-9]\d*)/'
+            => 'PhabricatorCalendarEventViewController',
         ),
       ),
     );
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventQuery.php
@@ -105,7 +105,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationCalendar';
+    return 'PhabricatorCalendarApplication';
   }
 
 }
diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationCalendar';
+    return 'PhabricatorCalendarApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -137,7 +137,6 @@
             1,
             pht('Show only upcoming events.'),
             $upcoming));
-
   }
 
   protected function getURI($path) {
@@ -147,14 +146,13 @@
   public function getBuiltinQueryNames() {
     $names = array(
       'upcoming' => pht('Upcoming Events'),
-      'all' => pht('All Events'),
+      'all'      => pht('All Events'),
     );
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
rename from src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
rename to src/applications/chatlog/application/PhabricatorChatLogApplication.php
--- a/src/applications/chatlog/applications/PhabricatorApplicationChatLog.php
+++ b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationChatLog extends PhabricatorApplication {
+final class PhabricatorChatLogApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/chatlog/';
@@ -29,11 +29,10 @@
  public function getRoutes() {
     return array(
       '/chatlog/' => array(
-       ''         => 'PhabricatorChatLogChannelListController',
-       'channel/(?P<channelID>[^/]+)/' =>
-          'PhabricatorChatLogChannelLogController',
+       '' => 'PhabricatorChatLogChannelListController',
+       'channel/(?P<channelID>[^/]+)/'
+          => 'PhabricatorChatLogChannelLogController',
        ),
-
     );
   }
 
diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
+++ b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
@@ -3,7 +3,7 @@
 abstract class ConduitAPI_chatlog_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass('PhabricatorApplicationChatLog');
+    return PhabricatorApplication::getByClass('PhabricatorChatLogApplication');
   }
 
 }
diff --git a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php
--- a/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php
+++ b/src/applications/chatlog/query/PhabricatorChatLogChannelQuery.php
@@ -57,7 +57,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationChatLog';
+    return 'PhabricatorChatLogApplication';
   }
 
 }
diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/query/PhabricatorChatLogQuery.php
--- a/src/applications/chatlog/query/PhabricatorChatLogQuery.php
+++ b/src/applications/chatlog/query/PhabricatorChatLogQuery.php
@@ -78,7 +78,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationChatLog';
+    return 'PhabricatorChatLogApplication';
   }
 
 }
diff --git a/src/applications/conduit/application/PhabricatorApplicationConduit.php b/src/applications/conduit/application/PhabricatorConduitApplication.php
rename from src/applications/conduit/application/PhabricatorApplicationConduit.php
rename to src/applications/conduit/application/PhabricatorConduitApplication.php
--- a/src/applications/conduit/application/PhabricatorApplicationConduit.php
+++ b/src/applications/conduit/application/PhabricatorConduitApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationConduit extends PhabricatorApplication {
+final class PhabricatorConduitApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/conduit/';
diff --git a/src/applications/conduit/query/PhabricatorConduitLogQuery.php b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
--- a/src/applications/conduit/query/PhabricatorConduitLogQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitLogQuery.php
@@ -10,7 +10,6 @@
     return $this;
   }
 
-
   public function loadPage() {
     $table = new PhabricatorConduitMethodCallLog();
     $conn_r = $table->establishConnection('r');
@@ -41,7 +40,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationConduit';
+    return 'PhabricatorConduitApplication';
   }
 
 }
diff --git a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
--- a/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
+++ b/src/applications/conduit/query/PhabricatorConduitMethodQuery.php
@@ -42,9 +42,7 @@
 
   public function loadPage() {
     $methods = $this->getAllMethods();
-
     $methods = $this->filterMethods($methods);
-
     return $methods;
   }
 
@@ -71,9 +69,9 @@
     }
 
     $status = array(
-      ConduitAPIMethod::METHOD_STATUS_STABLE => $this->isStable,
+      ConduitAPIMethod::METHOD_STATUS_STABLE     => $this->isStable,
       ConduitAPIMethod::METHOD_STATUS_DEPRECATED => $this->isDeprecated,
-      ConduitAPIMethod::METHOD_STATUS_UNSTABLE => $this->isUnstable,
+      ConduitAPIMethod::METHOD_STATUS_UNSTABLE   => $this->isUnstable,
     );
 
     // Only apply status filters if any of them are set.
@@ -122,7 +120,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationConduit';
+    return 'PhabricatorConduitApplication';
   }
 
 }
diff --git a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
--- a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
+++ b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationConduit';
+    return 'PhabricatorConduitApplication';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
@@ -106,8 +106,6 @@
                 'Show old methods which will be deleted in a future '.
                 'version of Phabricator.')),
             $is_deprecated));
-
-
   }
 
   protected function getURI($path) {
@@ -115,16 +113,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'modern' => pht('Modern Methods'),
       'all'    => pht('All Methods'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/config/application/PhabricatorApplicationConfig.php b/src/applications/config/application/PhabricatorConfigApplication.php
rename from src/applications/config/application/PhabricatorApplicationConfig.php
rename to src/applications/config/application/PhabricatorConfigApplication.php
--- a/src/applications/config/application/PhabricatorApplicationConfig.php
+++ b/src/applications/config/application/PhabricatorConfigApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationConfig extends PhabricatorApplication {
+final class PhabricatorConfigApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/config/';
@@ -33,10 +33,10 @@
   public function getRoutes() {
     return array(
       '/config/' => array(
-        ''                          => 'PhabricatorConfigListController',
-        'all/'                      => 'PhabricatorConfigAllController',
-        'edit/(?P<key>[\w\.\-]+)/'  => 'PhabricatorConfigEditController',
-        'group/(?P<key>[^/]+)/'     => 'PhabricatorConfigGroupController',
+        '' => 'PhabricatorConfigListController',
+        'all/' => 'PhabricatorConfigAllController',
+        'edit/(?P<key>[\w\.\-]+)/' => 'PhabricatorConfigEditController',
+        'group/(?P<key>[^/]+)/' => 'PhabricatorConfigGroupController',
         'welcome/' => 'PhabricatorConfigWelcomeController',
         '(?P<verb>ignore|unignore)/(?P<key>[^/]+)/'
           => 'PhabricatorConfigIgnoreController',
diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
@@ -157,8 +157,8 @@
     $dashboard_href = PhabricatorEnv::getURI('/dashboard/');
     $have_dashboard = (bool)PhabricatorDashboardInstall::getDashboard(
       $viewer,
-      PhabricatorApplicationHome::DASHBOARD_DEFAULT,
-      'PhabricatorApplicationHome');
+      PhabricatorHomeApplication::DASHBOARD_DEFAULT,
+      'PhabricatorHomeApplication');
     if ($have_dashboard) {
       $content = pht(
         "You've installed a default dashboard to replace this welcome screen ".
diff --git a/src/applications/config/query/PhabricatorConfigEntryQuery.php b/src/applications/config/query/PhabricatorConfigEntryQuery.php
--- a/src/applications/config/query/PhabricatorConfigEntryQuery.php
+++ b/src/applications/config/query/PhabricatorConfigEntryQuery.php
@@ -54,7 +54,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationConfig';
+    return 'PhabricatorConfigApplication';
   }
 
 }
diff --git a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
rename from src/applications/conpherence/application/PhabricatorApplicationConpherence.php
rename to src/applications/conpherence/application/PhabricatorConpherenceApplication.php
--- a/src/applications/conpherence/application/PhabricatorApplicationConpherence.php
+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationConpherence extends PhabricatorApplication {
+final class PhabricatorConpherenceApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/conpherence/';
@@ -52,5 +52,4 @@
     return $items;
   }
 
-
 }
diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php b/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
+++ b/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationConpherence');
+      'PhabricatorConpherenceApplication');
   }
 
   final protected function getConpherenceURI(ConpherenceThread $conpherence) {
diff --git a/src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php b/src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php
--- a/src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php
+++ b/src/applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php
@@ -4,7 +4,7 @@
   extends PhabricatorMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationConpherence';
+    $app_class = 'PhabricatorConpherenceApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php b/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
--- a/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
+++ b/src/applications/conpherence/mail/ConpherenceThreadMailReceiver.php
@@ -4,7 +4,7 @@
   extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationConpherence';
+    $app_class = 'PhabricatorConpherenceApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -288,7 +288,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationConpherence';
+    return 'PhabricatorConpherenceApplication';
   }
 
 }
diff --git a/src/applications/countdown/application/PhabricatorApplicationCountdown.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
rename from src/applications/countdown/application/PhabricatorApplicationCountdown.php
rename to src/applications/countdown/application/PhabricatorCountdownApplication.php
--- a/src/applications/countdown/application/PhabricatorApplicationCountdown.php
+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationCountdown extends PhabricatorApplication {
+final class PhabricatorCountdownApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/countdown/';
@@ -37,12 +37,9 @@
       '/countdown/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorCountdownListController',
-        '(?P<id>[1-9]\d*)/'
-          => 'PhabricatorCountdownViewController',
-        'edit/(?:(?P<id>[1-9]\d*)/)?'
-          => 'PhabricatorCountdownEditController',
-        'delete/(?P<id>[1-9]\d*)/'
-          => 'PhabricatorCountdownDeleteController'
+        '(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownViewController',
+        'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorCountdownEditController',
+        'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController'
       ),
     );
   }
diff --git a/src/applications/countdown/query/PhabricatorCountdownQuery.php b/src/applications/countdown/query/PhabricatorCountdownQuery.php
--- a/src/applications/countdown/query/PhabricatorCountdownQuery.php
+++ b/src/applications/countdown/query/PhabricatorCountdownQuery.php
@@ -82,7 +82,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationCountdown';
+    return 'PhabricatorCountdownApplication';
   }
 
 }
diff --git a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
--- a/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
+++ b/src/applications/countdown/query/PhabricatorCountdownSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationCountdown';
+    return 'PhabricatorCountdownApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -62,7 +62,6 @@
             1,
             pht('Show only countdowns that are still counting down.'),
             $upcoming));
-
   }
 
   protected function getURI($path) {
@@ -83,7 +82,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -101,10 +99,10 @@
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-
   protected function getRequiredHandlePHIDsForResultList(
     array $countdowns,
     PhabricatorSavedQuery $query) {
+
     return mpull($countdowns, 'getAuthorPHID');
   }
 
@@ -112,6 +110,7 @@
     array $countdowns,
     PhabricatorSavedQuery $query,
     array $handles) {
+
     assert_instances_of($countdowns, 'PhabricatorCountdown');
 
     $viewer = $this->requireViewer();
@@ -147,4 +146,5 @@
 
     return $list;
   }
+
 }
diff --git a/src/applications/countdown/storage/PhabricatorCountdown.php b/src/applications/countdown/storage/PhabricatorCountdown.php
--- a/src/applications/countdown/storage/PhabricatorCountdown.php
+++ b/src/applications/countdown/storage/PhabricatorCountdown.php
@@ -12,7 +12,7 @@
   public static function initializeNewCountdown(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationCountdown'))
+      ->withClasses(array('PhabricatorCountdownApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
diff --git a/src/applications/daemon/application/PhabricatorApplicationDaemons.php b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
rename from src/applications/daemon/application/PhabricatorApplicationDaemons.php
rename to src/applications/daemon/application/PhabricatorDaemonsApplication.php
--- a/src/applications/daemon/application/PhabricatorApplicationDaemons.php
+++ b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDaemons extends PhabricatorApplication {
+final class PhabricatorDaemonsApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Daemons');
diff --git a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php
--- a/src/applications/daemon/query/PhabricatorDaemonLogQuery.php
+++ b/src/applications/daemon/query/PhabricatorDaemonLogQuery.php
@@ -167,7 +167,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDaemons';
+    return 'PhabricatorDaemonsApplication';
   }
 
 }
diff --git a/src/applications/dashboard/application/PhabricatorApplicationDashboard.php b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
rename from src/applications/dashboard/application/PhabricatorApplicationDashboard.php
rename to src/applications/dashboard/application/PhabricatorDashboardApplication.php
--- a/src/applications/dashboard/application/PhabricatorApplicationDashboard.php
+++ b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDashboard extends PhabricatorApplication {
+final class PhabricatorDashboardApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Dashboards');
@@ -42,8 +42,8 @@
           'create/' => 'PhabricatorDashboardPanelEditController',
           'edit/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardPanelEditController',
           'render/(?P<id>\d+)/' => 'PhabricatorDashboardPanelRenderController',
-          'archive/(?P<id>\d+)/' =>
-            'PhabricatorDashboardPanelArchiveController',
+          'archive/(?P<id>\d+)/'
+            => 'PhabricatorDashboardPanelArchiveController',
         ),
       ),
     );
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
--- a/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardInstallController.php
@@ -24,7 +24,7 @@
 
     $object_phid = $request->getStr('objectPHID', $viewer->getPHID());
     switch ($object_phid) {
-      case PhabricatorApplicationHome::DASHBOARD_DEFAULT:
+      case PhabricatorHomeApplication::DASHBOARD_DEFAULT:
         if (!$viewer->getIsAdmin()) {
           return new Aphront404Response();
         }
@@ -48,7 +48,7 @@
     $installer_phid = $viewer->getPHID();
     $application_class = $request->getStr(
       'applicationClass',
-      'PhabricatorApplicationHome');
+      'PhabricatorHomeApplication');
 
     $handles = $this->loadHandles(array(
       $object_phid,
@@ -80,7 +80,7 @@
       ->addSubmitButton(pht('Install Dashboard'));
 
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         if ($viewer->getPHID() == $object_phid) {
           if ($viewer->getIsAdmin()) {
             $dialog->setWidth(AphrontDialogView::WIDTH_FORM);
@@ -92,9 +92,9 @@
               ->appendChild(
                 id(new AphrontFormRadioButtonControl())
                   ->setName('objectPHID')
-                  ->setValue(PhabricatorApplicationHome::DASHBOARD_DEFAULT)
+                  ->setValue(PhabricatorHomeApplication::DASHBOARD_DEFAULT)
                   ->addButton(
-                    PhabricatorApplicationHome::DASHBOARD_DEFAULT,
+                    PhabricatorHomeApplication::DASHBOARD_DEFAULT,
                     pht('Default Dashboard for All Users'),
                     pht(
                       'Install this dashboard as the global default dashboard '.
@@ -133,11 +133,10 @@
     return $dialog;
   }
 
-
   private function getCancelURI($application_class, $object_phid) {
     $uri = null;
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         $uri = '/dashboard/view/'.$this->id.'/';
         break;
     }
@@ -147,7 +146,7 @@
   private function getRedirectURI($application_class, $object_phid) {
     $uri = null;
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         $uri = '/';
         break;
     }
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
--- a/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardManageController.php
@@ -125,7 +125,7 @@
       ->loadOneWhere(
         'objectPHID = %s AND applicationClass = %s',
         $viewer->getPHID(),
-        'PhabricatorApplicationHome');
+        'PhabricatorHomeApplication');
     if ($installed_dashboard &&
         $installed_dashboard->getDashboardPHID() == $dashboard->getPHID()) {
       $title_install = pht('Uninstall Dashboard');
@@ -174,4 +174,5 @@
 
     return $properties;
   }
+
 }
diff --git a/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php b/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php
--- a/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardUninstallController.php
@@ -38,7 +38,7 @@
 
     $application_class = $request->getStr(
       'applicationClass',
-      'PhabricatorApplicationHome');
+      'PhabricatorHomeApplication');
 
     $dashboard_install = id(new PhabricatorDashboardInstall())
       ->loadOneWhere(
@@ -85,7 +85,7 @@
 
     $body = array();
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         if ($installer_phid == $object_phid) {
           $body[] = phutil_tag(
             'p',
@@ -116,7 +116,7 @@
   private function getCancelURI($application_class, $object_phid) {
     $uri = null;
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         $uri = '/dashboard/view/'.$this->id.'/';
         break;
     }
@@ -126,7 +126,7 @@
   private function getRedirectURI($application_class, $object_phid) {
     $uri = null;
     switch ($application_class) {
-      case 'PhabricatorApplicationHome':
+      case 'PhabricatorHomeApplication':
         $uri = '/';
         break;
     }
diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
--- a/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardPanelQuery.php
@@ -67,7 +67,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDashboard';
+    return 'PhabricatorDashboardApplication';
   }
 
 }
diff --git a/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php
--- a/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardPanelSearchEngine.php
@@ -8,14 +8,12 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDashboard';
+    return 'PhabricatorDashboardApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
     $saved = new PhabricatorSavedQuery();
-
     $saved->setParameter('status', $request->getStr('status'));
-
     return $saved;
   }
 
@@ -62,16 +60,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active Panels'),
-      'all' => pht('All Panels'),
+      'all'    => pht('All Panels'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/dashboard/query/PhabricatorDashboardQuery.php b/src/applications/dashboard/query/PhabricatorDashboardQuery.php
--- a/src/applications/dashboard/query/PhabricatorDashboardQuery.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardQuery.php
@@ -96,7 +96,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDashboard';
+    return 'PhabricatorDashboardApplication';
   }
 
 }
diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
--- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
+++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php
@@ -8,19 +8,15 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDashboard';
+    return 'PhabricatorDashboardApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    return $saved;
+    return new PhabricatorSavedQuery();
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new PhabricatorDashboardQuery());
-
-    return $query;
+    return id(new PhabricatorDashboardQuery());
   }
 
   public function buildSearchForm(
@@ -34,11 +30,9 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Dashboards'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
@@ -54,7 +48,6 @@
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-
   protected function renderResultList(
     array $dashboards,
     PhabricatorSavedQuery $query,
diff --git a/src/applications/differential/application/PhabricatorApplicationDifferential.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
rename from src/applications/differential/application/PhabricatorApplicationDifferential.php
rename to src/applications/differential/application/PhabricatorDifferentialApplication.php
--- a/src/applications/differential/application/PhabricatorApplicationDifferential.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDifferential extends PhabricatorApplication {
+final class PhabricatorDifferentialApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/differential/';
@@ -130,8 +130,7 @@
   protected function getCustomCapabilities() {
     return array(
       DifferentialCapabilityDefaultView::CAPABILITY => array(
-        'caption' => pht(
-          'Default view policy for newly created revisions.')
+        'caption' => pht('Default view policy for newly created revisions.'),
       ),
     );
   }
diff --git a/src/applications/differential/conduit/ConduitAPI_differential_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_Method.php
--- a/src/applications/differential/conduit/ConduitAPI_differential_Method.php
+++ b/src/applications/differential/conduit/ConduitAPI_differential_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationDifferential');
+      'PhabricatorDifferentialApplication');
   }
 
   protected function buildDiffInfoDictionary(DifferentialDiff $diff) {
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -179,7 +179,6 @@
           }
         }
       }
-
     } else {
       $warning = null;
       $visible_changesets = $changesets;
@@ -519,7 +518,7 @@
       ->setWorkflow(true)
       ->setDisabled(!$can_edit);
 
-    $maniphest = 'PhabricatorApplicationManiphest';
+    $maniphest = 'PhabricatorManiphestApplication';
     if (PhabricatorApplication::isClassInstalled($maniphest)) {
       $actions[] = id(new PhabricatorActionView())
         ->setIcon('fa-anchor')
@@ -539,7 +538,6 @@
   }
 
   private function getRevisionCommentActions(DifferentialRevision $revision) {
-
     $actions = array(
       DifferentialAction::ACTION_COMMENT => true,
     );
@@ -921,7 +919,6 @@
     unset($unguarded);
 
     return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
-
   }
 
   private function buildTransactions(
@@ -929,6 +926,7 @@
     DifferentialDiff $left_diff,
     DifferentialDiff $right_diff,
     array $changesets) {
+
     $viewer = $this->getRequest()->getUser();
 
     $xactions = id(new DifferentialTransactionQuery())
diff --git a/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php b/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php
--- a/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php
+++ b/src/applications/differential/customfield/DifferentialRequiredSignaturesField.php
@@ -28,7 +28,7 @@
   }
 
   public static function loadForRevision($revision) {
-    $app_legalpad = 'PhabricatorApplicationLegalpad';
+    $app_legalpad = 'PhabricatorLegalpadApplication';
     if (!PhabricatorApplication::isClassInstalled($app_legalpad)) {
       return array();
     }
@@ -142,5 +142,4 @@
     );
   }
 
-
 }
diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
@@ -167,7 +167,6 @@
     return parent::transactionHasEffect($object, $xaction);
   }
 
-
   protected function applyCustomInternalTransaction(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
@@ -350,7 +349,7 @@
         // "T123" or similar, automatically associate the commit with the
         // task that the branch names.
 
-        $maniphest = 'PhabricatorApplicationManiphest';
+        $maniphest = 'PhabricatorManiphestApplication';
         if (PhabricatorApplication::isClassInstalled($maniphest)) {
           $diff = $this->requireDiff($xaction->getNewValue());
           $branch = $diff->getBranch();
@@ -572,8 +571,6 @@
     return $result;
   }
 
-
-
   protected function applyFinalEffects(
     PhabricatorLiskDAO $object,
     array $xactions) {
@@ -693,7 +690,6 @@
     return $xactions;
   }
 
-
   protected function validateTransaction(
     PhabricatorLiskDAO $object,
     $type,
@@ -1205,8 +1201,7 @@
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
 
-    switch ($xaction->getTransactionType()) {
-    }
+    switch ($xaction->getTransactionType()) {}
 
     return parent::extractFilePHIDsFromCustomTransaction($object, $xaction);
   }
@@ -1217,7 +1212,6 @@
     $blocks,
     PhutilMarkupEngine $engine) {
 
-
     $flat_blocks = array_mergev($blocks);
     $huge_block = implode("\n\n", $flat_blocks);
 
@@ -1649,7 +1643,6 @@
     }
   }
 
-
   /**
    * Update the table connecting revisions to DVCS local hashes, so we can
    * identify revisions by commit/tree hashes.
diff --git a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php
--- a/src/applications/differential/mail/DifferentialRevisionMailReceiver.php
+++ b/src/applications/differential/mail/DifferentialRevisionMailReceiver.php
@@ -4,7 +4,7 @@
   extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationDifferential';
+    $app_class = 'PhabricatorDifferentialApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/differential/parser/DifferentialCommitMessageParser.php b/src/applications/differential/parser/DifferentialCommitMessageParser.php
--- a/src/applications/differential/parser/DifferentialCommitMessageParser.php
+++ b/src/applications/differential/parser/DifferentialCommitMessageParser.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Parses commit messages (containing relaively freeform text with textual
+ * Parses commit messages (containing relatively freeform text with textual
  * field labels) into a dictionary of fields.
  *
  *   $parser = id(new DifferentialCommitMessageParser())
diff --git a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php b/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
--- a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
+++ b/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
   public function newObject() {
diff --git a/src/applications/differential/query/DifferentialChangesetQuery.php b/src/applications/differential/query/DifferentialChangesetQuery.php
--- a/src/applications/differential/query/DifferentialChangesetQuery.php
+++ b/src/applications/differential/query/DifferentialChangesetQuery.php
@@ -57,7 +57,6 @@
   }
 
   public function willFilterPage(array $changesets) {
-
     // First, attach all the diffs we already have. We can just do this
     // directly without worrying about querying for them. When we don't have
     // a diff, record that we need to load it.
@@ -148,7 +147,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
   protected function getReversePaging() {
diff --git a/src/applications/differential/query/DifferentialDiffQuery.php b/src/applications/differential/query/DifferentialDiffQuery.php
--- a/src/applications/differential/query/DifferentialDiffQuery.php
+++ b/src/applications/differential/query/DifferentialDiffQuery.php
@@ -151,7 +151,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
 }
diff --git a/src/applications/differential/query/DifferentialHunkQuery.php b/src/applications/differential/query/DifferentialHunkQuery.php
--- a/src/applications/differential/query/DifferentialHunkQuery.php
+++ b/src/applications/differential/query/DifferentialHunkQuery.php
@@ -66,7 +66,6 @@
   }
 
   public function willFilterPage(array $hunks) {
-
     $changesets = mpull($this->changesets, null, 'getID');
     foreach ($hunks as $key => $hunk) {
       $changeset = idx($changesets, $hunk->getChangesetID());
@@ -110,7 +109,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
   protected function getReversePaging() {
diff --git a/src/applications/differential/query/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
--- a/src/applications/differential/query/DifferentialRevisionQuery.php
+++ b/src/applications/differential/query/DifferentialRevisionQuery.php
@@ -99,7 +99,7 @@
   }
 
   /**
-   * Filter results to revisions with comments authored bythe given PHIDs
+   * Filter results to revisions with comments authored by the given PHIDs.
    *
    * @param array List of PHIDs of authors
    * @return this
@@ -155,7 +155,7 @@
 
   /**
    * Filter results to revisions with a given status. Provide a class constant,
-   * such as ##DifferentialRevisionQuery::STATUS_OPEN##.
+   * such as `DifferentialRevisionQuery::STATUS_OPEN`.
    *
    * @param const Class STATUS constant, like STATUS_OPEN.
    * @return this
@@ -241,7 +241,7 @@
 
   /**
    * Set result ordering. Provide a class constant, such as
-   * ##DifferentialRevisionQuery::ORDER_CREATED##.
+   * `DifferentialRevisionQuery::ORDER_CREATED`.
    *
    * @task config
    */
@@ -749,7 +749,7 @@
           $conn_r,
           'r.status IN (%Ld)',
           array(
-               ArcanistDifferentialRevisionStatus::NEEDS_REVIEW,
+            ArcanistDifferentialRevisionStatus::NEEDS_REVIEW,
           ));
         break;
       case self::STATUS_NEEDS_REVISION:
@@ -757,7 +757,7 @@
           $conn_r,
           'r.status IN (%Ld)',
           array(
-               ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
+            ArcanistDifferentialRevisionStatus::NEEDS_REVISION,
           ));
         break;
       case self::STATUS_ACCEPTED:
@@ -1068,7 +1068,6 @@
 
       $revision->attachReviewerStatus($reviewers);
     }
-
   }
 
 
@@ -1164,7 +1163,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
 }
diff --git a/src/applications/differential/query/DifferentialRevisionSearchEngine.php b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
--- a/src/applications/differential/query/DifferentialRevisionSearchEngine.php
+++ b/src/applications/differential/query/DifferentialRevisionSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
@@ -194,7 +194,6 @@
           ->setName('order')
           ->setOptions($this->getOrderOptions())
           ->setValue($saved->getParameter('order')));
-
   }
 
   protected function getURI($path) {
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -53,7 +53,7 @@
   public static function initializeNewRevision(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationDifferential'))
+      ->withClasses(array('PhabricatorDifferentialApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
@@ -269,7 +269,6 @@
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
-
     // A revision's author (which effectively means "owner" after we added
     // commandeering) can always view and edit it.
     $author_phid = $this->getAuthorPHID();
diff --git a/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
rename from src/applications/diffusion/application/PhabricatorApplicationDiffusion.php
rename to src/applications/diffusion/application/PhabricatorDiffusionApplication.php
--- a/src/applications/diffusion/application/PhabricatorApplicationDiffusion.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDiffusion extends PhabricatorApplication {
+final class PhabricatorDiffusionApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Host and Browse Repositories');
@@ -103,9 +103,9 @@
         '(?P<callsign>[A-Z]+)(/|$).*' => 'DiffusionRepositoryDefaultController',
 
         'inline/' => array(
-          'edit/(?P<phid>[^/]+)/'    => 'DiffusionInlineCommentController',
-          'preview/(?P<phid>[^/]+)/' =>
-            'DiffusionInlineCommentPreviewController',
+          'edit/(?P<phid>[^/]+)/' => 'DiffusionInlineCommentController',
+          'preview/(?P<phid>[^/]+)/'
+            => 'DiffusionInlineCommentPreviewController',
         ),
         'services/' => array(
           'path/' => array(
@@ -126,13 +126,11 @@
 
   protected function getCustomCapabilities() {
     return array(
-      DiffusionCapabilityDefaultView::CAPABILITY => array(
-      ),
+      DiffusionCapabilityDefaultView::CAPABILITY => array(),
       DiffusionCapabilityDefaultEdit::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
-      DiffusionCapabilityDefaultPush::CAPABILITY => array(
-      ),
+      DiffusionCapabilityDefaultPush::CAPABILITY => array(),
       DiffusionCapabilityCreateRepositories::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
+++ b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationDiffusion');
+      'PhabricatorDiffusionApplication');
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -37,11 +37,9 @@
         break;
     }
 
-
     $filter = new AphrontListFilterView();
     $filter->appendChild($forms);
 
-
     if ($collapsed) {
       $filter->setCollapsed(
         pht('Show Search'),
@@ -112,7 +110,7 @@
     // TODO: Ideally, this should live in Owners and be event-triggered, but
     // there's no reasonable object for it to react to right now.
 
-    $owners = 'PhabricatorApplicationOwners';
+    $owners = 'PhabricatorOwnersApplication';
     if (PhabricatorApplication::isClassInstalled($owners)) {
       $owners_uri = id(new PhutilURI('/owners/view/search/'))
         ->setQueryParams(
@@ -220,7 +218,6 @@
     return id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Pending Differential Revisions'))
       ->appendChild($view);
-
   }
 
 }
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -999,7 +999,7 @@
     require_celerity_resource('phabricator-object-selector-css');
     require_celerity_resource('javelin-behavior-phabricator-object-selector');
 
-    $maniphest = 'PhabricatorApplicationManiphest';
+    $maniphest = 'PhabricatorManiphestApplication';
     if (PhabricatorApplication::isClassInstalled($maniphest)) {
       $action = id(new PhabricatorActionView())
         ->setName(pht('Edit Maniphest Tasks'))
@@ -1176,5 +1176,4 @@
     return $parser->processCorpus($corpus);
   }
 
-
 }
diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
--- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
@@ -21,7 +21,7 @@
   }
 
   public function getAdapterApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function getObject() {
@@ -56,8 +56,7 @@
   }
 
   public function explainValidTriggerObjects() {
-    return pht(
-      'This rule can trigger for **repositories** or **projects**.');
+    return pht('This rule can trigger for **repositories** or **projects**.');
   }
 
   public function getTriggerObjectPHIDs() {
diff --git a/src/applications/diffusion/query/DiffusionCommitQuery.php b/src/applications/diffusion/query/DiffusionCommitQuery.php
--- a/src/applications/diffusion/query/DiffusionCommitQuery.php
+++ b/src/applications/diffusion/query/DiffusionCommitQuery.php
@@ -16,6 +16,7 @@
   private $auditorPHIDs;
   private $auditAwaitingUser;
   private $auditStatus;
+
   const AUDIT_STATUS_ANY       = 'audit-status-any';
   const AUDIT_STATUS_OPEN      = 'audit-status-open';
   const AUDIT_STATUS_CONCERN   = 'audit-status-concern';
@@ -88,16 +89,15 @@
   }
 
   /**
-   * Retuns true if we should join the audit table, either because we're
-   * interested in the information if it's available or because matching
-   * rows must always have it.
+   * Returns true if we should join the audit table, either because we're
+   * interested in the information if it's available or because matching rows
+   * must always have it.
    */
   private function shouldJoinAudits() {
     return $this->auditStatus ||
            $this->rowsMustHaveAudits();
   }
 
-
   /**
    * Return true if we should `JOIN` (vs `LEFT JOIN`) the audit table, because
    * matching commits will always have audit rows.
@@ -194,7 +194,7 @@
             $result[$prefix.$suffix][] = $commit;
           }
         } else {
-          // This awkward contruction is so we can link the commits up in O(N)
+          // This awkward construction is so we can link the commits up in O(N)
           // time instead of O(N^2).
           for ($ii = $min_qualified; $ii <= strlen($suffix); $ii++) {
             $part = substr($suffix, 0, $ii);
@@ -225,7 +225,6 @@
   }
 
   protected function didFilterPage(array $commits) {
-
     if ($this->needCommitData) {
       $data = id(new PhabricatorRepositoryCommitData())->loadAllWhere(
         'commitID in (%Ld)',
@@ -508,7 +507,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
 }
diff --git a/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php b/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php
--- a/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php
+++ b/src/applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php b/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php
--- a/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php
+++ b/src/applications/diffusion/typeahead/DiffusionAuditorDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function getComponentDatasources() {
diff --git a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
--- a/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
+++ b/src/applications/diffusion/typeahead/DiffusionRepositoryDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php
--- a/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php
+++ b/src/applications/diffusion/typeahead/DiffusionSymbolDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/diffusion/view/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php
--- a/src/applications/diffusion/view/DiffusionHistoryTableView.php
+++ b/src/applications/diffusion/view/DiffusionHistoryTableView.php
@@ -95,7 +95,7 @@
     }
 
     $show_builds = PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationHarbormaster',
+      'PhabricatorHarbormasterApplication',
       $this->getUser());
 
     $rows = array();
@@ -254,13 +254,12 @@
    *  |o
    *  o
    *
-   * ...which form an ASCII representation of the graph we eventaully want to
+   * ...which form an ASCII representation of the graph we eventually want to
    * draw.
    *
    * NOTE: The actual implementation is black magic.
    */
   private function renderGraph() {
-
     // This keeps our accumulated information about each line of the
     // merge/branch graph.
     $graph = array();
diff --git a/src/applications/diviner/application/PhabricatorApplicationDiviner.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
rename from src/applications/diviner/application/PhabricatorApplicationDiviner.php
rename to src/applications/diviner/application/PhabricatorDivinerApplication.php
--- a/src/applications/diviner/application/PhabricatorApplicationDiviner.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDiviner extends PhabricatorApplication {
+final class PhabricatorDivinerApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/diviner/';
diff --git a/src/applications/diviner/query/DivinerAtomQuery.php b/src/applications/diviner/query/DivinerAtomQuery.php
--- a/src/applications/diviner/query/DivinerAtomQuery.php
+++ b/src/applications/diviner/query/DivinerAtomQuery.php
@@ -1,7 +1,6 @@
 <?php
 
-final class DivinerAtomQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+final class DivinerAtomQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
@@ -104,7 +103,6 @@
     return $this;
   }
 
-
   public function needExtends($need) {
     $this->needExtends = $need;
     return $this;
@@ -415,7 +413,7 @@
    * Attach child atoms to existing atoms. In recursive mode, also attach child
    * atoms to atoms that these atoms extend.
    *
-   * @param list<DivinerLiveSymbol> List of symbols to attach childeren to.
+   * @param list<DivinerLiveSymbol> List of symbols to attach children to.
    * @param map<string, DivinerLiveSymbol> Map of symbols, keyed by node hash.
    * @param bool True to attach children to extended atoms, as well.
    * @return void
@@ -443,7 +441,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiviner';
+    return 'PhabricatorDivinerApplication';
   }
 
 }
diff --git a/src/applications/diviner/query/DivinerAtomSearchEngine.php b/src/applications/diviner/query/DivinerAtomSearchEngine.php
--- a/src/applications/diviner/query/DivinerAtomSearchEngine.php
+++ b/src/applications/diviner/query/DivinerAtomSearchEngine.php
@@ -1,14 +1,13 @@
 <?php
 
-final class DivinerAtomSearchEngine
-  extends PhabricatorApplicationSearchEngine {
+final class DivinerAtomSearchEngine extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Documentation Atoms');
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDiviner';
+    return 'PhabricatorDivinerApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -68,7 +67,6 @@
           ->setName('name')
           ->setValue($saved->getParameter('name')))
       ->appendChild($type_control);
-
   }
 
   protected function getURI($path) {
@@ -76,15 +74,12 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/diviner/query/DivinerBookQuery.php b/src/applications/diviner/query/DivinerBookQuery.php
--- a/src/applications/diviner/query/DivinerBookQuery.php
+++ b/src/applications/diviner/query/DivinerBookQuery.php
@@ -1,7 +1,6 @@
 <?php
 
-final class DivinerBookQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+final class DivinerBookQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
@@ -66,9 +65,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiviner';
+    return 'PhabricatorDivinerApplication';
   }
 
 }
diff --git a/src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
rename from src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php
rename to src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
--- a/src/applications/doorkeeper/application/PhabricatorApplicationDoorkeeper.php
+++ b/src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDoorkeeper extends PhabricatorApplication {
+final class PhabricatorDoorkeeperApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
diff --git a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
--- a/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
+++ b/src/applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php
@@ -53,7 +53,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDoorkeeper';
+    return 'PhabricatorDoorkeeperApplication';
   }
 
 }
diff --git a/src/applications/drydock/application/PhabricatorApplicationDrydock.php b/src/applications/drydock/application/PhabricatorDrydockApplication.php
rename from src/applications/drydock/application/PhabricatorApplicationDrydock.php
rename to src/applications/drydock/application/PhabricatorDrydockApplication.php
--- a/src/applications/drydock/application/PhabricatorApplicationDrydock.php
+++ b/src/applications/drydock/application/PhabricatorDrydockApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationDrydock extends PhabricatorApplication {
+final class PhabricatorDrydockApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/drydock/';
@@ -63,8 +63,7 @@
 
   protected function getCustomCapabilities() {
     return array(
-      DrydockCapabilityDefaultView::CAPABILITY => array(
-      ),
+      DrydockCapabilityDefaultView::CAPABILITY => array(),
       DrydockCapabilityDefaultEdit::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
@@ -74,5 +73,4 @@
     );
   }
 
-
 }
diff --git a/src/applications/drydock/query/DrydockBlueprintSearchEngine.php b/src/applications/drydock/query/DrydockBlueprintSearchEngine.php
--- a/src/applications/drydock/query/DrydockBlueprintSearchEngine.php
+++ b/src/applications/drydock/query/DrydockBlueprintSearchEngine.php
@@ -8,19 +8,15 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDrydock';
+    return 'PhabricatorDrydockApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    return $saved;
+    return new PhabricatorSavedQuery();
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new DrydockBlueprintQuery());
-
-    return $query;
+    return new DrydockBlueprintQuery();
   }
 
   public function buildSearchForm(
@@ -34,11 +30,9 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Blueprints'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
diff --git a/src/applications/drydock/query/DrydockLeaseSearchEngine.php b/src/applications/drydock/query/DrydockLeaseSearchEngine.php
--- a/src/applications/drydock/query/DrydockLeaseSearchEngine.php
+++ b/src/applications/drydock/query/DrydockLeaseSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDrydock';
+    return 'PhabricatorDrydockApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -58,12 +58,10 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active Leases'),
       'all' => pht('All Leases'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
diff --git a/src/applications/drydock/query/DrydockLogSearchEngine.php b/src/applications/drydock/query/DrydockLogSearchEngine.php
--- a/src/applications/drydock/query/DrydockLogSearchEngine.php
+++ b/src/applications/drydock/query/DrydockLogSearchEngine.php
@@ -1,26 +1,21 @@
 <?php
 
-final class DrydockLogSearchEngine
-  extends PhabricatorApplicationSearchEngine {
+final class DrydockLogSearchEngine extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Drydock Logs');
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDrydock';
+    return 'PhabricatorDrydockApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
-    $saved = new PhabricatorSavedQuery();
-
-    return $saved;
+    return new PhabricatorSavedQuery();
   }
 
   public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
-    $query = id(new DrydockLogQuery());
-
-    return $query;
+    return new DrydockLogQuery();
   }
 
   public function buildSearchForm(
@@ -34,11 +29,9 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Logs'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
diff --git a/src/applications/drydock/query/DrydockQuery.php b/src/applications/drydock/query/DrydockQuery.php
--- a/src/applications/drydock/query/DrydockQuery.php
+++ b/src/applications/drydock/query/DrydockQuery.php
@@ -1,10 +1,9 @@
 <?php
 
-abstract class DrydockQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+abstract class DrydockQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDrydock';
+    return 'PhabricatorDrydockApplication';
   }
 
 }
diff --git a/src/applications/drydock/query/DrydockResourceSearchEngine.php b/src/applications/drydock/query/DrydockResourceSearchEngine.php
--- a/src/applications/drydock/query/DrydockResourceSearchEngine.php
+++ b/src/applications/drydock/query/DrydockResourceSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDrydock';
+    return 'PhabricatorDrydockApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -50,7 +50,6 @@
 
     $form
       ->appendChild($status_control);
-
   }
 
   protected function getURI($path) {
@@ -58,12 +57,10 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active Resources'),
       'all' => pht('All Resources'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
diff --git a/src/applications/drydock/storage/DrydockBlueprint.php b/src/applications/drydock/storage/DrydockBlueprint.php
--- a/src/applications/drydock/storage/DrydockBlueprint.php
+++ b/src/applications/drydock/storage/DrydockBlueprint.php
@@ -14,7 +14,7 @@
   public static function initializeNewBlueprint(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationDrydock'))
+      ->withClasses(array('PhabricatorDrydockApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
@@ -85,4 +85,5 @@
   public function describeAutomaticCapability($capability) {
     return null;
   }
+
 }
diff --git a/src/applications/fact/application/PhabricatorApplicationFact.php b/src/applications/fact/application/PhabricatorFactApplication.php
rename from src/applications/fact/application/PhabricatorApplicationFact.php
rename to src/applications/fact/application/PhabricatorFactApplication.php
--- a/src/applications/fact/application/PhabricatorApplicationFact.php
+++ b/src/applications/fact/application/PhabricatorFactApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationFact extends PhabricatorApplication {
+final class PhabricatorFactApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Chart and Analyze Data');
diff --git a/src/applications/feed/application/PhabricatorApplicationFeed.php b/src/applications/feed/application/PhabricatorFeedApplication.php
rename from src/applications/feed/application/PhabricatorApplicationFeed.php
rename to src/applications/feed/application/PhabricatorFeedApplication.php
--- a/src/applications/feed/application/PhabricatorApplicationFeed.php
+++ b/src/applications/feed/application/PhabricatorFeedApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationFeed extends PhabricatorApplication {
+final class PhabricatorFeedApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/feed/';
diff --git a/src/applications/feed/conduit/ConduitAPI_feed_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_Method.php
--- a/src/applications/feed/conduit/ConduitAPI_feed_Method.php
+++ b/src/applications/feed/conduit/ConduitAPI_feed_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_feed_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationFeed');
+    return PhabricatorApplication::getByClass('PhabricatorFeedApplication');
   }
 
 }
diff --git a/src/applications/feed/query/PhabricatorFeedQuery.php b/src/applications/feed/query/PhabricatorFeedQuery.php
--- a/src/applications/feed/query/PhabricatorFeedQuery.php
+++ b/src/applications/feed/query/PhabricatorFeedQuery.php
@@ -17,7 +17,6 @@
   }
 
   protected function loadPage() {
-
     $story_table = new PhabricatorFeedStoryData();
     $conn = $story_table->establishConnection('r');
 
@@ -104,9 +103,8 @@
     return $item['chronologicalKey'];
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationFeed';
+    return 'PhabricatorFeedApplication';
   }
 
 }
diff --git a/src/applications/files/application/PhabricatorApplicationFiles.php b/src/applications/files/application/PhabricatorFilesApplication.php
rename from src/applications/files/application/PhabricatorApplicationFiles.php
rename to src/applications/files/application/PhabricatorFilesApplication.php
--- a/src/applications/files/application/PhabricatorApplicationFiles.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationFiles extends PhabricatorApplication {
+final class PhabricatorFilesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/file/';
@@ -36,7 +36,6 @@
     );
   }
 
-
   public function getRoutes() {
     return array(
       '/F(?P<id>[1-9]\d*)' => 'PhabricatorFileShortcutController',
diff --git a/src/applications/files/conduit/ConduitAPI_file_Method.php b/src/applications/files/conduit/ConduitAPI_file_Method.php
--- a/src/applications/files/conduit/ConduitAPI_file_Method.php
+++ b/src/applications/files/conduit/ConduitAPI_file_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_file_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationFiles');
+    return PhabricatorApplication::getByClass('PhabricatorFilesApplication');
   }
 
 }
diff --git a/src/applications/files/mail/FileCreateMailReceiver.php b/src/applications/files/mail/FileCreateMailReceiver.php
--- a/src/applications/files/mail/FileCreateMailReceiver.php
+++ b/src/applications/files/mail/FileCreateMailReceiver.php
@@ -3,7 +3,7 @@
 final class FileCreateMailReceiver extends PhabricatorMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationFiles';
+    $app_class = 'PhabricatorFilesApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
@@ -38,9 +38,7 @@
 
     $attachment_count = count($attachment_phids);
     if ($attachment_count > 1) {
-      $subject = pht(
-        'You successfully uploaded %d files.',
-        $attachment_count);
+      $subject = pht('You successfully uploaded %d files.', $attachment_count);
     } else {
       $subject = pht('You successfully uploaded a file.');
     }
diff --git a/src/applications/files/mail/FileMailReceiver.php b/src/applications/files/mail/FileMailReceiver.php
--- a/src/applications/files/mail/FileMailReceiver.php
+++ b/src/applications/files/mail/FileMailReceiver.php
@@ -3,7 +3,7 @@
 final class FileMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationFiles';
+    $app_class = 'PhabricatorFilesApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/files/query/PhabricatorFileQuery.php b/src/applications/files/query/PhabricatorFileQuery.php
--- a/src/applications/files/query/PhabricatorFileQuery.php
+++ b/src/applications/files/query/PhabricatorFileQuery.php
@@ -245,9 +245,8 @@
     return 'f.id';
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationFiles';
+    return 'PhabricatorFilesApplication';
   }
 
 }
diff --git a/src/applications/files/query/PhabricatorFileSearchEngine.php b/src/applications/files/query/PhabricatorFileSearchEngine.php
--- a/src/applications/files/query/PhabricatorFileSearchEngine.php
+++ b/src/applications/files/query/PhabricatorFileSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationFiles';
+    return 'PhabricatorFilesApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -94,14 +94,13 @@
     }
 
     $names += array(
-      'all'     => pht('All'),
+      'all' => pht('All'),
     );
 
     return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/flag/application/PhabricatorApplicationFlags.php b/src/applications/flag/application/PhabricatorFlagsApplication.php
rename from src/applications/flag/application/PhabricatorApplicationFlags.php
rename to src/applications/flag/application/PhabricatorFlagsApplication.php
--- a/src/applications/flag/application/PhabricatorApplicationFlags.php
+++ b/src/applications/flag/application/PhabricatorFlagsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationFlags extends PhabricatorApplication {
+final class PhabricatorFlagsApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Personal Bookmarks');
diff --git a/src/applications/flag/conduit/ConduitAPI_flag_Method.php b/src/applications/flag/conduit/ConduitAPI_flag_Method.php
--- a/src/applications/flag/conduit/ConduitAPI_flag_Method.php
+++ b/src/applications/flag/conduit/ConduitAPI_flag_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_flag_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationFlags');
+    return PhabricatorApplication::getByClass('PhabricatorFlagsApplication');
   }
 
   protected function attachHandleToFlag($flag, PhabricatorUser $user) {
@@ -29,9 +28,9 @@
       'colorName'     => PhabricatorFlagColor::getColorName($color),
       'note'          => $flag->getNote(),
       'handle'        => array(
-        'uri'         => $uri,
-        'name'        => $flag->getHandle()->getName(),
-        'fullname'    => $flag->getHandle()->getFullName(),
+        'uri'      => $uri,
+        'name'     => $flag->getHandle()->getName(),
+        'fullname' => $flag->getHandle()->getFullName(),
       ),
       'dateCreated'   => $flag->getDateCreated(),
       'dateModified'  => $flag->getDateModified(),
diff --git a/src/applications/flag/query/PhabricatorFlagQuery.php b/src/applications/flag/query/PhabricatorFlagQuery.php
--- a/src/applications/flag/query/PhabricatorFlagQuery.php
+++ b/src/applications/flag/query/PhabricatorFlagQuery.php
@@ -36,7 +36,7 @@
   }
 
   /**
-   * Note this is done in php and not in mySQL, which means its inappropriate
+   * NOTE: this is done in PHP and not in MySQL, which means its inappropriate
    * for large datasets. Pragmatically, this is fine for user flags which are
    * typically well under 100 flags per user.
    */
@@ -65,7 +65,6 @@
       ->executeOne();
   }
 
-
   public function loadPage() {
     $table = new PhabricatorFlag();
     $conn_r = $table->establishConnection('r');
@@ -82,7 +81,6 @@
   }
 
   public function willFilterPage(array $flags) {
-
     if ($this->needObjects) {
       $objects = id(new PhabricatorObjectQuery())
         ->setViewer($this->getViewer())
@@ -160,9 +158,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationFlags';
+    return 'PhabricatorFlagsApplication';
   }
 
 }
diff --git a/src/applications/flag/query/PhabricatorFlagSearchEngine.php b/src/applications/flag/query/PhabricatorFlagSearchEngine.php
--- a/src/applications/flag/query/PhabricatorFlagSearchEngine.php
+++ b/src/applications/flag/query/PhabricatorFlagSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationFlags';
+    return 'PhabricatorFlagsApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
diff --git a/src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
rename from src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php
rename to src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
--- a/src/applications/harbormaster/application/PhabricatorApplicationHarbormaster.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationHarbormaster extends PhabricatorApplication {
+final class PhabricatorHarbormasterApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/harbormaster/';
diff --git a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php b/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php
--- a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php
+++ b/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationHarbormaster');
+      'PhabricatorHarbormasterApplication');
   }
 
   public function getMethodStatus() {
diff --git a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
--- a/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
+++ b/src/applications/harbormaster/engine/HarbormasterBuildEngine.php
@@ -244,7 +244,7 @@
     }
 
     // Identify all the steps which are ready to run (because all their
-    // depdendencies are complete).
+    // dependencies are complete).
 
     $previous_step = null;
     $runnable = array();
@@ -428,7 +428,7 @@
             ->setOldValue($old_status)
             ->setNewValue($new_status);
 
-          $harbormaster_phid = id(new PhabricatorApplicationHarbormaster())
+          $harbormaster_phid = id(new PhabricatorHarbormasterApplication())
             ->getPHID();
 
           $daemon_source = PhabricatorContentSource::newForSource(
@@ -448,7 +448,6 @@
         }
       }
     }
-
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildArtifactQuery.php
@@ -113,7 +113,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildItemQuery.php
@@ -54,7 +54,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildLogQuery.php
@@ -92,7 +92,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildMessageQuery.php
@@ -92,7 +92,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildPlanQuery.php
@@ -37,7 +37,6 @@
     return $table->loadAllFromArray($data);
   }
 
-
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
@@ -68,7 +67,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php
--- a/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -52,7 +52,6 @@
             HarbormasterBuildPlan::STATUS_DISABLED,
             pht('Disabled'),
             in_array(HarbormasterBuildPlan::STATUS_DISABLED, $status)));
-
   }
 
   protected function getURI($path) {
@@ -60,16 +59,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active Plans'),
       'all' => pht('All Plans'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/harbormaster/query/HarbormasterBuildQuery.php b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildQuery.php
@@ -173,7 +173,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildStepQuery.php
@@ -100,7 +100,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildTargetQuery.php
@@ -92,7 +92,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
--- a/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableQuery.php
@@ -216,7 +216,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
 }
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -160,15 +160,12 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Buildables'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -220,4 +217,5 @@
 
     return $list;
   }
+
 }
diff --git a/src/applications/harbormaster/storage/HarbormasterBuildable.php b/src/applications/harbormaster/storage/HarbormasterBuildable.php
--- a/src/applications/harbormaster/storage/HarbormasterBuildable.php
+++ b/src/applications/harbormaster/storage/HarbormasterBuildable.php
@@ -58,7 +58,7 @@
         return 'bluegrey';
     }
   }
-  
+
   public static function initializeNewBuildable(PhabricatorUser $actor) {
     return id(new HarbormasterBuildable())
       ->setIsManualBuildable(0)
@@ -110,7 +110,7 @@
     // Skip all of this logic if the Harbormaster application
     // isn't currently installed.
 
-    $harbormaster_app = 'PhabricatorApplicationHarbormaster';
+    $harbormaster_app = 'PhabricatorHarbormasterApplication';
     if (!PhabricatorApplication::isClassInstalled($harbormaster_app)) {
       return;
     }
diff --git a/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php b/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php
--- a/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php
+++ b/src/applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationHarbormaster';
+    return 'PhabricatorHarbormasterApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/help/application/PhabricatorApplicationHelp.php b/src/applications/help/application/PhabricatorHelpApplication.php
rename from src/applications/help/application/PhabricatorApplicationHelp.php
rename to src/applications/help/application/PhabricatorHelpApplication.php
--- a/src/applications/help/application/PhabricatorApplicationHelp.php
+++ b/src/applications/help/application/PhabricatorHelpApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationHelp extends PhabricatorApplication {
+final class PhabricatorHelpApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
@@ -24,7 +24,7 @@
   protected $auditNeededPackages;
 
   public function getAdapterApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function getObject() {
@@ -77,8 +77,7 @@
   }
 
   public function explainValidTriggerObjects() {
-    return pht(
-      'This rule can trigger for **repositories** and **projects**.');
+    return pht('This rule can trigger for **repositories** and **projects**.');
   }
 
   public function getFieldNameMap() {
diff --git a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
--- a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
+++ b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
@@ -23,7 +23,7 @@
   private $haveHunks;
 
   public function getAdapterApplicationClass() {
-    return 'PhabricatorApplicationDifferential';
+    return 'PhabricatorDifferentialApplication';
   }
 
   public function getObject() {
@@ -506,4 +506,5 @@
     }
     return $result;
   }
+
 }
diff --git a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
--- a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
+++ b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
@@ -13,12 +13,11 @@
   }
 
   public function getAdapterApplicationClass() {
-    return 'PhabricatorApplicationManiphest';
+    return 'PhabricatorManiphestApplication';
   }
 
   public function getAdapterContentDescription() {
-    return pht(
-      'React to tasks being created or updated.');
+    return pht('React to tasks being created or updated.');
   }
 
   public function getRepetitionOptions() {
diff --git a/src/applications/herald/adapter/HeraldPholioMockAdapter.php b/src/applications/herald/adapter/HeraldPholioMockAdapter.php
--- a/src/applications/herald/adapter/HeraldPholioMockAdapter.php
+++ b/src/applications/herald/adapter/HeraldPholioMockAdapter.php
@@ -6,7 +6,7 @@
   private $ccPHIDs = array();
 
   public function getAdapterApplicationClass() {
-    return 'PhabricatorApplicationPholio';
+    return 'PhabricatorPholioApplication';
   }
 
   public function getAdapterContentDescription() {
@@ -148,4 +148,5 @@
     }
     return $result;
   }
+
 }
diff --git a/src/applications/herald/application/PhabricatorApplicationHerald.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
rename from src/applications/herald/application/PhabricatorApplicationHerald.php
rename to src/applications/herald/application/PhabricatorHeraldApplication.php
--- a/src/applications/herald/application/PhabricatorApplicationHerald.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationHerald extends PhabricatorApplication {
+final class PhabricatorHeraldApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/herald/';
@@ -43,15 +43,15 @@
         'new/' => 'HeraldNewController',
         'rule/(?P<id>[1-9]\d*)/' => 'HeraldRuleViewController',
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleController',
-        'disable/(?P<id>[1-9]\d*)/(?P<action>\w+)/' =>
-          'HeraldDisableController',
+        'disable/(?P<id>[1-9]\d*)/(?P<action>\w+)/'
+          => 'HeraldDisableController',
         'history/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleEditHistoryController',
         'test/' => 'HeraldTestConsoleController',
         'transcript/' => array(
           '' => 'HeraldTranscriptListController',
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldTranscriptListController',
           '(?P<id>[1-9]\d*)/(?:(?P<filter>\w+)/)?'
-          => 'HeraldTranscriptController',
+            => 'HeraldTranscriptController',
         )
       )
     );
@@ -66,5 +66,4 @@
     );
   }
 
-
 }
diff --git a/src/applications/herald/query/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php
--- a/src/applications/herald/query/HeraldRuleQuery.php
+++ b/src/applications/herald/query/HeraldRuleQuery.php
@@ -1,7 +1,6 @@
 <?php
 
-final class HeraldRuleQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+final class HeraldRuleQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   private $ids;
   private $phids;
@@ -233,7 +232,6 @@
   }
 
   private function validateRuleAuthors(array $rules) {
-
     // "Global" and "Object" rules always have valid authors.
     foreach ($rules as $key => $rule) {
       if ($rule->isGlobalRule() || $rule->isObjectRule()) {
@@ -271,9 +269,8 @@
     }
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHerald';
+    return 'PhabricatorHeraldApplication';
   }
 
 }
diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
@@ -1,14 +1,13 @@
 <?php
 
-final class HeraldRuleSearchEngine
-  extends PhabricatorApplicationSearchEngine {
+final class HeraldRuleSearchEngine extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Herald Rules');
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationHerald';
+    return 'PhabricatorHeraldApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -118,7 +117,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -163,6 +161,7 @@
   protected function getRequiredHandlePHIDsForResultList(
     array $rules,
     PhabricatorSavedQuery $query) {
+
     return mpull($rules, 'getAuthorPHID');
   }
 
diff --git a/src/applications/herald/query/HeraldTranscriptQuery.php b/src/applications/herald/query/HeraldTranscriptQuery.php
--- a/src/applications/herald/query/HeraldTranscriptQuery.php
+++ b/src/applications/herald/query/HeraldTranscriptQuery.php
@@ -108,7 +108,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationHerald';
+    return 'PhabricatorHeraldApplication';
   }
 
 }
diff --git a/src/applications/herald/query/HeraldTranscriptSearchEngine.php b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
--- a/src/applications/herald/query/HeraldTranscriptSearchEngine.php
+++ b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationHerald';
+    return 'PhabricatorHeraldApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -75,15 +75,12 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array();
-
-    $names['all'] = pht('All');
-
-    return $names;
+    return array(
+      'all' => pht('All'),
+    );
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -20,7 +20,7 @@
 
   protected $configVersion = 37;
 
-  // phids for which this rule has been applied
+  // PHIDs for which this rule has been applied
   private $ruleApplied = self::ATTACHABLE;
   private $validAuthor = self::ATTACHABLE;
   private $author = self::ATTACHABLE;
@@ -221,7 +221,7 @@
         case PhabricatorPolicyCapability::CAN_VIEW:
           return PhabricatorPolicies::POLICY_USER;
         case PhabricatorPolicyCapability::CAN_EDIT:
-          $app = 'PhabricatorApplicationHerald';
+          $app = 'PhabricatorHeraldApplication';
           $herald = PhabricatorApplication::getByClass($app);
           $global = HeraldCapabilityManageGlobalRules::CAPABILITY;
           return $herald->getPolicy($global);
diff --git a/src/applications/home/application/PhabricatorApplicationHome.php b/src/applications/home/application/PhabricatorHomeApplication.php
rename from src/applications/home/application/PhabricatorApplicationHome.php
rename to src/applications/home/application/PhabricatorHomeApplication.php
--- a/src/applications/home/application/PhabricatorApplicationHome.php
+++ b/src/applications/home/application/PhabricatorHomeApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationHome extends PhabricatorApplication {
+final class PhabricatorHomeApplication extends PhabricatorApplication {
 
   const DASHBOARD_DEFAULT = 'dashboard:default';
 
diff --git a/src/applications/home/controller/PhabricatorHomeController.php b/src/applications/home/controller/PhabricatorHomeController.php
--- a/src/applications/home/controller/PhabricatorHomeController.php
+++ b/src/applications/home/controller/PhabricatorHomeController.php
@@ -33,7 +33,7 @@
       $user);
 
     // Force "Applications" to appear at the bottom.
-    $meta_app = 'PhabricatorApplicationApplications';
+    $meta_app = 'PhabricatorApplicationsApplication';
     $pinned = array_fuse($pinned);
     unset($pinned[$meta_app]);
     $pinned[$meta_app] = $meta_app;
@@ -41,7 +41,7 @@
 
     $tiles = array();
 
-    $home_app = new PhabricatorApplicationHome();
+    $home_app = new PhabricatorHomeApplication();
 
     $tiles[] = id(new PhabricatorApplicationLaunchView())
       ->setApplication($home_app)
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -1,7 +1,6 @@
 <?php
 
-final class PhabricatorHomeMainController
-  extends PhabricatorHomeController {
+final class PhabricatorHomeMainController extends PhabricatorHomeController {
 
   private $only;
   private $minipanels = array();
@@ -25,7 +24,7 @@
     if (!$dashboard) {
       $dashboard = PhabricatorDashboardInstall::getDashboard(
         $user,
-        PhabricatorApplicationHome::DASHBOARD_DEFAULT,
+        PhabricatorHomeApplication::DASHBOARD_DEFAULT,
         get_class($this->getCurrentApplication()));
     }
 
@@ -65,15 +64,15 @@
     $viewer = $this->getRequest()->getUser();
 
     $has_maniphest = PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationManiphest',
+      'PhabricatorManiphestApplication',
       $viewer);
 
     $has_audit = PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationAudit',
+      'PhabricatorAuditApplication',
       $viewer);
 
     $has_differential = PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationDifferential',
+      'PhabricatorDifferentialApplication',
       $viewer);
 
     if ($has_maniphest) {
diff --git a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
rename from src/applications/legalpad/application/PhabricatorApplicationLegalpad.php
rename to src/applications/legalpad/application/PhabricatorLegalpadApplication.php
--- a/src/applications/legalpad/application/PhabricatorApplicationLegalpad.php
+++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationLegalpad extends PhabricatorApplication {
+final class PhabricatorLegalpadApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/legalpad/';
@@ -50,10 +50,10 @@
         'comment/(?P<id>\d+)/' => 'LegalpadDocumentCommentController',
         'view/(?P<id>\d+)/' => 'LegalpadDocumentManageController',
         'done/' => 'LegalpadDocumentDoneController',
-        'verify/(?P<code>[^/]+)/' =>
-          'LegalpadDocumentSignatureVerificationController',
-        'signatures/(?:(?P<id>\d+)/)?(?:query/(?P<queryKey>[^/]+)/)?' =>
-          'LegalpadDocumentSignatureListController',
+        'verify/(?P<code>[^/]+)/'
+          => 'LegalpadDocumentSignatureVerificationController',
+        'signatures/(?:(?P<id>\d+)/)?(?:query/(?P<queryKey>[^/]+)/)?'
+          => 'LegalpadDocumentSignatureListController',
         'addsignature/(?P<id>\d+)/' => 'LegalpadDocumentSignatureAddController',
         'signature/(?P<id>\d+)/' => 'LegalpadDocumentSignatureViewController',
         'document/' => array(
@@ -64,12 +64,9 @@
 
   protected function getCustomCapabilities() {
     return array(
-      LegalpadCapabilityCreateDocuments::CAPABILITY => array(
-      ),
-      LegalpadCapabilityDefaultView::CAPABILITY => array(
-      ),
-      LegalpadCapabilityDefaultEdit::CAPABILITY => array(
-      ),
+      LegalpadCapabilityCreateDocuments::CAPABILITY => array(),
+      LegalpadCapabilityDefaultView::CAPABILITY => array(),
+      LegalpadCapabilityDefaultEdit::CAPABILITY => array(),
     );
   }
 
diff --git a/src/applications/legalpad/mail/LegalpadMockMailReceiver.php b/src/applications/legalpad/mail/LegalpadMockMailReceiver.php
--- a/src/applications/legalpad/mail/LegalpadMockMailReceiver.php
+++ b/src/applications/legalpad/mail/LegalpadMockMailReceiver.php
@@ -3,7 +3,7 @@
 final class LegalpadMockMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationLegalpad';
+    $app_class = 'PhabricatorLegalpadApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/legalpad/query/LegalpadDocumentQuery.php b/src/applications/legalpad/query/LegalpadDocumentQuery.php
--- a/src/applications/legalpad/query/LegalpadDocumentQuery.php
+++ b/src/applications/legalpad/query/LegalpadDocumentQuery.php
@@ -259,7 +259,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationLegalpad';
+    return 'PhabricatorLegalpadApplication';
   }
 
 }
diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationLegalpad';
+    return 'PhabricatorLegalpadApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -133,7 +133,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php
--- a/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSignatureQuery.php
@@ -144,7 +144,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationLegalpad';
+    return 'PhabricatorLegalpadApplication';
   }
 
 }
diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
--- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
@@ -10,7 +10,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationLegalpad';
+    return 'PhabricatorLegalpadApplication';
   }
 
   public function setDocument(LegalpadDocument $document) {
diff --git a/src/applications/legalpad/storage/LegalpadDocument.php b/src/applications/legalpad/storage/LegalpadDocument.php
--- a/src/applications/legalpad/storage/LegalpadDocument.php
+++ b/src/applications/legalpad/storage/LegalpadDocument.php
@@ -30,7 +30,7 @@
   public static function initializeNewDocument(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationLegalpad'))
+      ->withClasses(array('PhabricatorLegalpadApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(LegalpadCapabilityDefaultView::CAPABILITY);
diff --git a/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php b/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php
--- a/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php
+++ b/src/applications/legalpad/typeahead/LegalpadDocumentDatasource.php
@@ -1,14 +1,13 @@
 <?php
 
-final class LegalpadDocumentDatasource
-  extends PhabricatorTypeaheadDatasource {
+final class LegalpadDocumentDatasource extends PhabricatorTypeaheadDatasource {
 
   public function getPlaceholderText() {
     return pht('Type a document name...');
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationLegalpad';
+    return 'PhabricatorLegalpadApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/macro/application/PhabricatorApplicationMacro.php b/src/applications/macro/application/PhabricatorMacroApplication.php
rename from src/applications/macro/application/PhabricatorApplicationMacro.php
rename to src/applications/macro/application/PhabricatorMacroApplication.php
--- a/src/applications/macro/application/PhabricatorApplicationMacro.php
+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationMacro extends PhabricatorApplication {
+final class PhabricatorMacroApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/macro/';
@@ -47,7 +47,7 @@
   protected function getCustomCapabilities() {
     return array(
       PhabricatorMacroCapabilityManage::CAPABILITY => array(
-        'caption' => pht('Allows creating and editing macros.')
+        'caption' => pht('Allows creating and editing macros.'),
       ),
     );
   }
diff --git a/src/applications/macro/conduit/ConduitAPI_macro_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_Method.php
--- a/src/applications/macro/conduit/ConduitAPI_macro_Method.php
+++ b/src/applications/macro/conduit/ConduitAPI_macro_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_macro_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationMacro');
+    return PhabricatorApplication::getByClass('PhabricatorMacroApplication');
   }
 
 }
diff --git a/src/applications/macro/mail/PhabricatorMacroMailReceiver.php b/src/applications/macro/mail/PhabricatorMacroMailReceiver.php
--- a/src/applications/macro/mail/PhabricatorMacroMailReceiver.php
+++ b/src/applications/macro/mail/PhabricatorMacroMailReceiver.php
@@ -3,7 +3,7 @@
 final class PhabricatorMacroMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationManiphest';
+    $app_class = 'PhabricatorManiphestApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
@@ -11,7 +11,6 @@
     return 'MCRO[1-9]\d*';
   }
 
-
   protected function loadObject($pattern, PhabricatorUser $viewer) {
     $id = (int)substr($pattern, 4);
 
@@ -30,5 +29,4 @@
 
   }
 
-
 }
diff --git a/src/applications/macro/query/PhabricatorMacroQuery.php b/src/applications/macro/query/PhabricatorMacroQuery.php
--- a/src/applications/macro/query/PhabricatorMacroQuery.php
+++ b/src/applications/macro/query/PhabricatorMacroQuery.php
@@ -221,7 +221,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationMacro';
+    return 'PhabricatorMacroApplication';
   }
 
 }
diff --git a/src/applications/macro/query/PhabricatorMacroSearchEngine.php b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
--- a/src/applications/macro/query/PhabricatorMacroSearchEngine.php
+++ b/src/applications/macro/query/PhabricatorMacroSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationMacro';
+    return 'PhabricatorMacroApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -141,7 +141,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/macro/typeahead/PhabricatorMacroDatasource.php b/src/applications/macro/typeahead/PhabricatorMacroDatasource.php
--- a/src/applications/macro/typeahead/PhabricatorMacroDatasource.php
+++ b/src/applications/macro/typeahead/PhabricatorMacroDatasource.php
@@ -1,14 +1,13 @@
 <?php
 
-final class PhabricatorMacroDatasource
-  extends PhabricatorTypeaheadDatasource {
+final class PhabricatorMacroDatasource extends PhabricatorTypeaheadDatasource {
 
   public function getPlaceholderText() {
     return pht('Type a macro name...');
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationMacro';
+    return 'PhabricatorMacroApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/mailinglists/application/PhabricatorApplicationMailingLists.php b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
rename from src/applications/mailinglists/application/PhabricatorApplicationMailingLists.php
rename to src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
--- a/src/applications/mailinglists/application/PhabricatorApplicationMailingLists.php
+++ b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationMailingLists extends PhabricatorApplication {
+final class PhabricatorMailingListsApplication extends PhabricatorApplication {
 
   public function getName() {
     return 'Mailing Lists';
diff --git a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php
--- a/src/applications/mailinglists/query/PhabricatorMailingListQuery.php
+++ b/src/applications/mailinglists/query/PhabricatorMailingListQuery.php
@@ -80,7 +80,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationMailingLists';
+    return 'PhabricatorMailingListsApplication';
   }
 
 }
diff --git a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
--- a/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
+++ b/src/applications/mailinglists/query/PhabricatorMailingListSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationMailingLists';
+    return 'PhabricatorMailingListsApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -39,15 +39,12 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Lists'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php b/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php
--- a/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php
+++ b/src/applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationMailingLists';
+    return 'PhabricatorMailingListsApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
rename from src/applications/maniphest/application/PhabricatorApplicationManiphest.php
rename to src/applications/maniphest/application/PhabricatorManiphestApplication.php
--- a/src/applications/maniphest/application/PhabricatorApplicationManiphest.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationManiphest extends PhabricatorApplication {
+final class PhabricatorManiphestApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return 'Tasks and Bugs';
@@ -52,8 +52,8 @@
         'task/' => array(
           'create/' => 'ManiphestTaskEditController',
           'edit/(?P<id>[1-9]\d*)/' => 'ManiphestTaskEditController',
-          'descriptionpreview/' =>
-            'PhabricatorMarkupPreviewController',
+          'descriptionpreview/'
+            => 'PhabricatorMarkupPreviewController',
         ),
         'transaction/' => array(
           'save/' => 'ManiphestTransactionSaveController',
@@ -101,25 +101,17 @@
   protected function getCustomCapabilities() {
     return array(
       ManiphestCapabilityDefaultView::CAPABILITY => array(
-        'caption' => pht(
-          'Default view policy for newly created tasks.'),
+        'caption' => pht('Default view policy for newly created tasks.'),
       ),
       ManiphestCapabilityDefaultEdit::CAPABILITY => array(
-        'caption' => pht(
-          'Default edit policy for newly created tasks.'),
-      ),
-      ManiphestCapabilityEditStatus::CAPABILITY => array(
-      ),
-      ManiphestCapabilityEditAssign::CAPABILITY => array(
-      ),
-      ManiphestCapabilityEditPolicies::CAPABILITY => array(
-      ),
-      ManiphestCapabilityEditPriority::CAPABILITY => array(
-      ),
-      ManiphestCapabilityEditProjects::CAPABILITY => array(
-      ),
-      ManiphestCapabilityBulkEdit::CAPABILITY => array(
+        'caption' => pht('Default edit policy for newly created tasks.'),
       ),
+      ManiphestCapabilityEditStatus::CAPABILITY => array(),
+      ManiphestCapabilityEditAssign::CAPABILITY => array(),
+      ManiphestCapabilityEditPolicies::CAPABILITY => array(),
+      ManiphestCapabilityEditPriority::CAPABILITY => array(),
+      ManiphestCapabilityEditProjects::CAPABILITY => array(),
+      ManiphestCapabilityBulkEdit::CAPABILITY => array(),
     );
   }
 
diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
+++ b/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
@@ -4,12 +4,12 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationManiphest');
+      'PhabricatorManiphestApplication');
   }
 
   public function defineErrorTypes() {
     return array(
-      'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.'
+      'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
     );
   }
 
@@ -23,8 +23,8 @@
 
     if (!$is_new) {
       $fields += array(
-        'id'        => 'optional int',
-        'phid'      => 'optional int',
+        'id'    => 'optional int',
+        'phid'  => 'optional int',
       );
     }
 
@@ -279,19 +279,18 @@
   }
 
   /**
-   * Note this is a temporary stop gap since its easy to make malformed Tasks.
+   * NOTE: This is a temporary stop gap since its easy to make malformed tasks.
    * Long-term, the values set in @{method:defineParamTypes} will be used to
    * validate data implicitly within the larger Conduit application.
    *
-   * TODO -- remove this in favor of generalized Conduit hotness
+   * TODO: Remove this in favor of generalized Conduit hotness.
    */
   private function validatePHIDList(array $phid_list, $phid_type, $field) {
     $phid_groups = phid_group_by_type($phid_list);
     unset($phid_groups[$phid_type]);
     if (!empty($phid_groups)) {
       throw id(new ConduitException('ERR-INVALID-PARAMETER'))
-        ->setErrorDescription(
-          'One or more PHIDs were invalid for '.$field.'.');
+        ->setErrorDescription('One or more PHIDs were invalid for '.$field.'.');
     }
 
     return true;
diff --git a/src/applications/maniphest/editor/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
--- a/src/applications/maniphest/editor/ManiphestTransactionEditor.php
+++ b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
@@ -60,7 +60,6 @@
       case ManiphestTransaction::TYPE_SUBPRIORITY:
         return $object->getSubpriority();
     }
-
   }
 
   protected function getCustomTransactionNewValue(
@@ -84,7 +83,6 @@
     }
   }
 
-
   protected function transactionHasEffect(
     PhabricatorLiskDAO $object,
     PhabricatorApplicationTransaction $xaction) {
@@ -156,7 +154,6 @@
         // these do external (edge) updates
         return;
     }
-
   }
 
   protected function expandTransaction(
@@ -286,7 +283,6 @@
     return $xactions;
   }
 
-
   protected function shouldSendMail(
     PhabricatorLiskDAO $object,
     array $xactions) {
@@ -464,7 +460,7 @@
     if ($app_capability) {
       $app = id(new PhabricatorApplicationQuery())
         ->setViewer($this->getActor())
-        ->withClasses(array('PhabricatorApplicationManiphest'))
+        ->withClasses(array('PhabricatorManiphestApplication'))
         ->executeOne();
       PhabricatorPolicyFilter::requireCapability(
         $this->getActor(),
@@ -492,7 +488,6 @@
   }
 
   private function getNextSubpriority($pri, $sub, $dir = '>') {
-
     switch ($dir) {
       case '>':
         $order = 'ASC';
diff --git a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
--- a/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
+++ b/src/applications/maniphest/mail/ManiphestCreateMailReceiver.php
@@ -3,7 +3,7 @@
 final class ManiphestCreateMailReceiver extends PhabricatorMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationManiphest';
+    $app_class = 'PhabricatorManiphestApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
--- a/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
+++ b/src/applications/maniphest/mail/ManiphestTaskMailReceiver.php
@@ -3,7 +3,7 @@
 final class ManiphestTaskMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationManiphest';
+    $app_class = 'PhabricatorManiphestApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php b/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php
--- a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php
+++ b/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationManiphest';
+    return 'PhabricatorManiphestApplication';
   }
 
   public function newObject() {
diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/query/ManiphestTaskQuery.php
--- a/src/applications/maniphest/query/ManiphestTaskQuery.php
+++ b/src/applications/maniphest/query/ManiphestTaskQuery.php
@@ -97,7 +97,7 @@
    *
    * This is used by boards to supplement queries.
    *
-   * @param list<phid> List of project PHIDs to add to any existing constriant.
+   * @param list<phid> List of project PHIDs to add to any existing constraint.
    * @return this
    */
   public function addWithAllProjects(array $projects) {
@@ -967,7 +967,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationManiphest';
+    return 'PhabricatorManiphestApplication';
   }
 
 }
diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -35,7 +35,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationManiphest';
+    return 'PhabricatorManiphestApplication';
   }
 
   public function getCustomFieldObject() {
@@ -499,9 +499,9 @@
   private function getOrderValues() {
     return array(
       'priority' => ManiphestTaskQuery::ORDER_PRIORITY,
-      'updated' => ManiphestTaskQuery::ORDER_MODIFIED,
-      'created' => ManiphestTaskQuery::ORDER_CREATED,
-      'title' => ManiphestTaskQuery::ORDER_TITLE,
+      'updated'  => ManiphestTaskQuery::ORDER_MODIFIED,
+      'created'  => ManiphestTaskQuery::ORDER_CREATED,
+      'title'    => ManiphestTaskQuery::ORDER_TITLE,
     );
   }
 
@@ -509,9 +509,9 @@
     return array(
       'priority' => pht('Priority'),
       'assigned' => pht('Assigned'),
-      'status' => pht('Status'),
-      'project' => pht('Project'),
-      'none' => pht('None'),
+      'status'   => pht('Status'),
+      'project'  => pht('Project'),
+      'none'     => pht('None'),
     );
   }
 
@@ -519,9 +519,9 @@
     return array(
       'priority' => ManiphestTaskQuery::GROUP_PRIORITY,
       'assigned' => ManiphestTaskQuery::GROUP_OWNER,
-      'status' => ManiphestTaskQuery::GROUP_STATUS,
-      'project' => ManiphestTaskQuery::GROUP_PROJECT,
-      'none' => ManiphestTaskQuery::GROUP_NONE,
+      'status'   => ManiphestTaskQuery::GROUP_STATUS,
+      'project'  => ManiphestTaskQuery::GROUP_PROJECT,
+      'none'     => ManiphestTaskQuery::GROUP_NONE,
     );
   }
 
diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
--- a/src/applications/maniphest/storage/ManiphestTask.php
+++ b/src/applications/maniphest/storage/ManiphestTask.php
@@ -42,7 +42,7 @@
   public static function initializeNewTask(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationManiphest'))
+      ->withClasses(array('PhabricatorManiphestApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(ManiphestCapabilityDefaultView::CAPABILITY);
@@ -231,7 +231,6 @@
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $user) {
-
     // The owner of a task can always view and edit it.
     $owner_phid = $this->getOwnerPHID();
     if ($owner_phid) {
@@ -245,8 +244,7 @@
   }
 
   public function describeAutomaticCapability($capability) {
-    return pht(
-      'The owner of a task can always view and edit it.');
+    return pht('The owner of a task can always view and edit it.');
   }
 
 
diff --git a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
--- a/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
+++ b/src/applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationManiphest';
+    return 'PhabricatorManiphestApplication';
   }
 
   public function loadResults() {
@@ -19,7 +19,7 @@
 
     $priority_map = ManiphestTaskPriority::getTaskPriorityMap();
     foreach ($priority_map as $value => $name) {
-      // NOTE: $value is not a phid but is unique. This'll work.
+      // NOTE: $value is not a PHID but is unique. This'll work.
       $results[] = id(new PhabricatorTypeaheadResult())
         ->setPHID($value)
         ->setName($name);
diff --git a/src/applications/meta/application/PhabricatorApplicationApplications.php b/src/applications/meta/application/PhabricatorApplicationsApplication.php
rename from src/applications/meta/application/PhabricatorApplicationApplications.php
rename to src/applications/meta/application/PhabricatorApplicationsApplication.php
--- a/src/applications/meta/application/PhabricatorApplicationApplications.php
+++ b/src/applications/meta/application/PhabricatorApplicationsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationApplications extends PhabricatorApplication {
+final class PhabricatorApplicationsApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
@@ -31,15 +31,15 @@
   public function getRoutes() {
     return array(
       '/applications/' => array(
-        '(?:query/(?P<queryKey>[^/]+)/)?' =>
-          'PhabricatorApplicationsListController',
-        'view/(?P<application>\w+)/' =>
-          'PhabricatorApplicationDetailViewController',
-        'edit/(?P<application>\w+)/' =>
-          'PhabricatorApplicationEditController',
-        '(?P<application>\w+)/(?P<action>install|uninstall)/' =>
-          'PhabricatorApplicationUninstallController',
-        ),
+        '(?:query/(?P<queryKey>[^/]+)/)?'
+          => 'PhabricatorApplicationsListController',
+        'view/(?P<application>\w+)/'
+          => 'PhabricatorApplicationDetailViewController',
+        'edit/(?P<application>\w+)/'
+          => 'PhabricatorApplicationEditController',
+        '(?P<application>\w+)/(?P<action>install|uninstall)/'
+          => 'PhabricatorApplicationUninstallController',
+      ),
     );
   }
 
diff --git a/src/applications/meta/query/PhabricatorAppSearchEngine.php b/src/applications/meta/query/PhabricatorAppSearchEngine.php
--- a/src/applications/meta/query/PhabricatorAppSearchEngine.php
+++ b/src/applications/meta/query/PhabricatorAppSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationApplications';
+    return 'PhabricatorApplicationsApplication';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
@@ -123,7 +123,6 @@
               'true' => pht('Show Launchable Applications'),
               'false' => pht('Show Non-Launchable Applications'),
             )));
-
   }
 
   protected function getURI($path) {
@@ -131,16 +130,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'launcher' => pht('Launcher'),
       'all' => pht('All Applications'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
--- a/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
+++ b/src/applications/meta/typeahead/PhabricatorApplicationDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationApplications';
+    return 'PhabricatorApplicationsApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
rename from src/applications/metamta/application/PhabricatorApplicationMetaMTA.php
rename to src/applications/metamta/application/PhabricatorMetaMTAApplication.php
--- a/src/applications/metamta/application/PhabricatorApplicationMetaMTA.php
+++ b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationMetaMTA extends PhabricatorApplication {
+final class PhabricatorMetaMTAApplication extends PhabricatorApplication {
 
   public function getIconName() {
     return 'metamta';
@@ -34,7 +34,7 @@
     return array(
       '/mail/' => array(
         'sendgrid/' => 'PhabricatorMetaMTASendGridReceiveController',
-        'mailgun/' => 'PhabricatorMetaMTAMailgunReceiveController',
+        'mailgun/'  => 'PhabricatorMetaMTAMailgunReceiveController',
       ),
     );
   }
diff --git a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php
--- a/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php
+++ b/src/applications/metamta/typeahead/PhabricatorMetaMTAMailableDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationMetaMTA';
+    return 'PhabricatorMetaMTAApplication';
   }
 
   public function getComponentDatasources() {
diff --git a/src/applications/notification/application/PhabricatorApplicationNotifications.php b/src/applications/notification/application/PhabricatorNotificationsApplication.php
rename from src/applications/notification/application/PhabricatorApplicationNotifications.php
rename to src/applications/notification/application/PhabricatorNotificationsApplication.php
--- a/src/applications/notification/application/PhabricatorApplicationNotifications.php
+++ b/src/applications/notification/application/PhabricatorNotificationsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationNotifications extends PhabricatorApplication {
+final class PhabricatorNotificationsApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/notification/';
diff --git a/src/applications/notification/PhabricatorNotificationQuery.php b/src/applications/notification/query/PhabricatorNotificationQuery.php
rename from src/applications/notification/PhabricatorNotificationQuery.php
rename to src/applications/notification/query/PhabricatorNotificationQuery.php
--- a/src/applications/notification/PhabricatorNotificationQuery.php
+++ b/src/applications/notification/query/PhabricatorNotificationQuery.php
@@ -111,9 +111,8 @@
     return $item->getChronologicalKey();
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationNotifications';
+    return 'PhabricatorNotificationsApplication';
   }
 
 }
diff --git a/src/applications/nuance/application/PhabricatorApplicationNuance.php b/src/applications/nuance/application/PhabricatorNuanceApplication.php
rename from src/applications/nuance/application/PhabricatorApplicationNuance.php
rename to src/applications/nuance/application/PhabricatorNuanceApplication.php
--- a/src/applications/nuance/application/PhabricatorApplicationNuance.php
+++ b/src/applications/nuance/application/PhabricatorNuanceApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationNuance extends PhabricatorApplication {
+final class PhabricatorNuanceApplication extends PhabricatorApplication {
 
   public function getIconName() {
     return 'nuance';
@@ -15,7 +15,7 @@
   }
 
   public function isLaunchable() {
-    // try to hide this even more for now
+    // Try to hide this even more for now.
     return false;
   }
 
@@ -61,15 +61,12 @@
   protected function getCustomCapabilities() {
     return array(
       NuanceCapabilitySourceDefaultView::CAPABILITY => array(
-        'caption' => pht(
-          'Default view policy for newly created sources.'),
+        'caption' => pht('Default view policy for newly created sources.'),
       ),
       NuanceCapabilitySourceDefaultEdit::CAPABILITY => array(
-        'caption' => pht(
-          'Default edit policy for newly created sources.'),
-      ),
-      NuanceCapabilitySourceManage::CAPABILITY => array(
+        'caption' => pht('Default edit policy for newly created sources.'),
       ),
+      NuanceCapabilitySourceManage::CAPABILITY => array(),
     );
   }
 
diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
--- a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
+++ b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_nuance_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationNuance');
+    return PhabricatorApplication::getByClass('PhabricatorNuanceApplication');
   }
 
   public function getMethodStatus() {
diff --git a/src/applications/nuance/query/NuanceQuery.php b/src/applications/nuance/query/NuanceQuery.php
--- a/src/applications/nuance/query/NuanceQuery.php
+++ b/src/applications/nuance/query/NuanceQuery.php
@@ -1,10 +1,9 @@
 <?php
 
-abstract class NuanceQuery
-  extends PhabricatorCursorPagedPolicyAwareQuery {
+abstract class NuanceQuery extends PhabricatorCursorPagedPolicyAwareQuery {
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationNuance';
+    return 'PhabricatorNuanceApplication';
   }
 
 }
diff --git a/src/applications/nuance/storage/NuanceSource.php b/src/applications/nuance/storage/NuanceSource.php
--- a/src/applications/nuance/storage/NuanceSource.php
+++ b/src/applications/nuance/storage/NuanceSource.php
@@ -1,7 +1,6 @@
 <?php
 
-final class NuanceSource
-  extends NuanceDAO
+final class NuanceSource extends NuanceDAO
   implements PhabricatorPolicyInterface {
 
   protected $name;
@@ -21,8 +20,7 @@
   }
 
   public function generatePHID() {
-    return PhabricatorPHID::generateNewPHID(
-      NuancePHIDTypeSource::TYPECONST);
+    return PhabricatorPHID::generateNewPHID(NuancePHIDTypeSource::TYPECONST);
   }
 
   public function save() {
@@ -39,7 +37,7 @@
   public static function initializeNewSource(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationNuance'))
+      ->withClasses(array('PhabricatorNuanceApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
@@ -54,7 +52,6 @@
       ->setViewPolicy($view_policy)
       ->setEditPolicy($edit_policy)
       ->setType($lucky_definition->getSourceTypeConstant());
-
   }
 
   public function getCapabilities() {
@@ -81,5 +78,4 @@
     return null;
   }
 
-
 }
diff --git a/src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
rename from src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php
rename to src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
--- a/src/applications/oauthserver/application/PhabricatorApplicationOAuthServer.php
+++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationOAuthServer extends PhabricatorApplication {
+final class PhabricatorOAuthServerApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/oauthserver/';
@@ -39,14 +39,14 @@
       '/oauthserver/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorOAuthClientListController',
-        'auth/'          => 'PhabricatorOAuthServerAuthController',
+        'auth/' => 'PhabricatorOAuthServerAuthController',
         'test/(?P<id>\d+)/' => 'PhabricatorOAuthServerTestController',
-        'token/'         => 'PhabricatorOAuthServerTokenController',
+        'token/' => 'PhabricatorOAuthServerTokenController',
         'client/' => array(
-          'create/'                 => 'PhabricatorOAuthClientEditController',
+          'create/' => 'PhabricatorOAuthClientEditController',
           'delete/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientDeleteController',
-          'edit/(?P<phid>[^/]+)/'   => 'PhabricatorOAuthClientEditController',
-          'view/(?P<phid>[^/]+)/'   => 'PhabricatorOAuthClientViewController',
+          'edit/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientEditController',
+          'view/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientViewController',
         ),
       ),
     );
diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
--- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
+++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
@@ -16,7 +16,7 @@
   }
 
   public function isEnabled() {
-    $app_name = 'PhabricatorApplicationOAuthServer';
+    $app_name = 'PhabricatorOAuthServerApplication';
     return PhabricatorApplication::isClassInstalled($app_name);
   }
 
@@ -26,7 +26,7 @@
     // TODO: It would be nice to simply disable this panel, but we can't do
     // viewer-based checks for enabled panels right now.
 
-    $app_class = 'PhabricatorApplicationOAuthServer';
+    $app_class = 'PhabricatorOAuthServerApplication';
     $installed = PhabricatorApplication::isClassInstalledForViewer(
       $app_class,
       $viewer);
diff --git a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
--- a/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
+++ b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
@@ -89,7 +89,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationOAuthServer';
+    return 'PhabricatorOAuthServerApplication';
   }
 
 }
diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php
--- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php
+++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php
@@ -26,7 +26,6 @@
     $table  = new PhabricatorOAuthServerClient();
     $conn_r = $table->establishConnection('r');
 
-
     $data = queryfx_all(
       $conn_r,
       'SELECT * FROM %T client %Q %Q %Q',
@@ -68,7 +67,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationOAuthServer';
+    return 'PhabricatorOAuthServerApplication';
   }
 
 }
diff --git a/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php
--- a/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php
+++ b/src/applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationOAuthServer';
+    return 'PhabricatorOAuthServerApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -49,7 +49,6 @@
           ->setName('creators')
           ->setLabel(pht('Creators'))
           ->setValue($creator_handles));
-
   }
 
   protected function getURI($path) {
@@ -84,7 +83,6 @@
     return parent::buildSavedQueryFromBuiltin($query_key);
   }
 
-
   protected function getRequiredHandlePHIDsForResultList(
     array $clients,
     PhabricatorSavedQuery $query) {
diff --git a/src/applications/owners/application/PhabricatorApplicationOwners.php b/src/applications/owners/application/PhabricatorOwnersApplication.php
rename from src/applications/owners/application/PhabricatorApplicationOwners.php
rename to src/applications/owners/application/PhabricatorOwnersApplication.php
--- a/src/applications/owners/application/PhabricatorApplicationOwners.php
+++ b/src/applications/owners/application/PhabricatorOwnersApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationOwners extends PhabricatorApplication {
+final class PhabricatorOwnersApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/owners/';
diff --git a/src/applications/owners/conduit/ConduitAPI_owners_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_Method.php
--- a/src/applications/owners/conduit/ConduitAPI_owners_Method.php
+++ b/src/applications/owners/conduit/ConduitAPI_owners_Method.php
@@ -1,11 +1,9 @@
 <?php
 
-abstract class ConduitAPI_owners_Method
-  extends ConduitAPIMethod {
+abstract class ConduitAPI_owners_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationOwners');
+    return PhabricatorApplication::getByClass('PhabricatorOwnersApplication');
   }
 
 }
diff --git a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
--- a/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
+++ b/src/applications/owners/query/PhabricatorOwnersPackageQuery.php
@@ -79,9 +79,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationOwners';
+    return 'PhabricatorOwnersApplication';
   }
 
 }
diff --git a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
--- a/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
+++ b/src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationOwners';
+    return 'PhabricatorOwnersApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/passphrase/application/PhabricatorApplicationPassphrase.php b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
rename from src/applications/passphrase/application/PhabricatorApplicationPassphrase.php
rename to src/applications/passphrase/application/PhabricatorPassphraseApplication.php
--- a/src/applications/passphrase/application/PhabricatorApplicationPassphrase.php
+++ b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPassphrase extends PhabricatorApplication {
+final class PhabricatorPassphraseApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/passphrase/';
diff --git a/src/applications/passphrase/query/PassphraseCredentialQuery.php b/src/applications/passphrase/query/PassphraseCredentialQuery.php
--- a/src/applications/passphrase/query/PassphraseCredentialQuery.php
+++ b/src/applications/passphrase/query/PassphraseCredentialQuery.php
@@ -131,7 +131,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPassphrase';
+    return 'PhabricatorPassphraseApplication';
   }
 
 }
diff --git a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
--- a/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
+++ b/src/applications/passphrase/query/PassphraseCredentialSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPassphrase';
+    return 'PhabricatorPassphraseApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -47,7 +47,6 @@
             'false' => pht('Show Only Active Credentials'),
             'true' => pht('Show Only Destroyed Credentials'),
           )));
-
   }
 
   protected function getURI($path) {
@@ -55,16 +54,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active Credentials'),
       'all' => pht('All Credentials'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -116,5 +112,4 @@
     return $list;
   }
 
-
 }
diff --git a/src/applications/paste/application/PhabricatorApplicationPaste.php b/src/applications/paste/application/PhabricatorPasteApplication.php
rename from src/applications/paste/application/PhabricatorApplicationPaste.php
rename to src/applications/paste/application/PhabricatorPasteApplication.php
--- a/src/applications/paste/application/PhabricatorApplicationPaste.php
+++ b/src/applications/paste/application/PhabricatorPasteApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPaste extends PhabricatorApplication {
+final class PhabricatorPasteApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/paste/';
@@ -34,9 +34,9 @@
         => 'PhabricatorPasteViewController',
       '/paste/' => array(
         '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorPasteListController',
-        'create/'                       => 'PhabricatorPasteEditController',
-        'edit/(?P<id>[1-9]\d*)/'        => 'PhabricatorPasteEditController',
-        'comment/(?P<id>[1-9]\d*)/'     => 'PhabricatorPasteCommentController',
+        'create/' => 'PhabricatorPasteEditController',
+        'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteEditController',
+        'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteCommentController',
       ),
     );
   }
@@ -44,8 +44,7 @@
   protected function getCustomCapabilities() {
     return array(
       PasteCapabilityDefaultView::CAPABILITY => array(
-        'caption' => pht(
-          'Default view policy for newly created pastes.')
+        'caption' => pht('Default view policy for newly created pastes.'),
       ),
     );
   }
diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
--- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php
+++ b/src/applications/paste/conduit/ConduitAPI_paste_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_paste_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationPaste');
+    return PhabricatorApplication::getByClass('PhabricatorPasteApplication');
   }
 
   protected function buildPasteInfoDictionary(PhabricatorPaste $paste) {
diff --git a/src/applications/paste/mail/PasteCreateMailReceiver.php b/src/applications/paste/mail/PasteCreateMailReceiver.php
--- a/src/applications/paste/mail/PasteCreateMailReceiver.php
+++ b/src/applications/paste/mail/PasteCreateMailReceiver.php
@@ -3,7 +3,7 @@
 final class PasteCreateMailReceiver extends PhabricatorMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationPaste';
+    $app_class = 'PhabricatorPasteApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/paste/mail/PasteMockMailReceiver.php b/src/applications/paste/mail/PasteMockMailReceiver.php
--- a/src/applications/paste/mail/PasteMockMailReceiver.php
+++ b/src/applications/paste/mail/PasteMockMailReceiver.php
@@ -3,7 +3,7 @@
 final class PasteMockMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationPaste';
+    $app_class = 'PhabricatorPasteApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
--- a/src/applications/paste/query/PhabricatorPasteQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
@@ -252,7 +252,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPaste';
+    return 'PhabricatorPasteApplication';
   }
 
 }
diff --git a/src/applications/paste/storage/PhabricatorPaste.php b/src/applications/paste/storage/PhabricatorPaste.php
--- a/src/applications/paste/storage/PhabricatorPaste.php
+++ b/src/applications/paste/storage/PhabricatorPaste.php
@@ -22,7 +22,7 @@
   public static function initializeNewPaste(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationPaste'))
+      ->withClasses(array('PhabricatorPasteApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(PasteCapabilityDefaultView::CAPABILITY);
@@ -131,5 +131,4 @@
     return pht('The author of a paste can always view and edit it.');
   }
 
-
 }
diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorPeopleApplication.php
rename from src/applications/people/application/PhabricatorApplicationPeople.php
rename to src/applications/people/application/PhabricatorPeopleApplication.php
--- a/src/applications/people/application/PhabricatorApplicationPeople.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPeople extends PhabricatorApplication {
+final class PhabricatorPeopleApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('User Accounts and Profiles');
@@ -75,8 +75,7 @@
 
   protected function getCustomCapabilities() {
     return array(
-      PeopleCapabilityBrowseUserDirectory::CAPABILITY => array(
-      ),
+      PeopleCapabilityBrowseUserDirectory::CAPABILITY => array(),
     );
   }
 
@@ -158,5 +157,4 @@
     return $items;
   }
 
-
 }
diff --git a/src/applications/people/conduit/ConduitAPI_user_Method.php b/src/applications/people/conduit/ConduitAPI_user_Method.php
--- a/src/applications/people/conduit/ConduitAPI_user_Method.php
+++ b/src/applications/people/conduit/ConduitAPI_user_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationPeople');
+      'PhabricatorPeopleApplication');
   }
 
   protected function buildUserInformationDictionary(
diff --git a/src/applications/people/customfield/PhabricatorUserStatusField.php b/src/applications/people/customfield/PhabricatorUserStatusField.php
--- a/src/applications/people/customfield/PhabricatorUserStatusField.php
+++ b/src/applications/people/customfield/PhabricatorUserStatusField.php
@@ -23,7 +23,7 @@
 
   public function isFieldEnabled() {
     return PhabricatorApplication::isClassInstalled(
-      'PhabricatorApplicationCalendar');
+      'PhabricatorCalendarApplication');
   }
 
   public function renderPropertyViewValue(array $handles) {
diff --git a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
--- a/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
+++ b/src/applications/people/event/PhabricatorPeopleHovercardEventListener.php
@@ -38,7 +38,7 @@
     } else if (!$user->isUserActivated()) {
       $hovercard->addField(pht('Account'), pht('Not Activated'));
     } else if (PhabricatorApplication::isClassInstalledForViewer(
-        'PhabricatorApplicationCalendar',
+        'PhabricatorCalendarApplication',
         $viewer)) {
       $statuses = id(new PhabricatorCalendarEvent())->loadCurrentStatuses(
         array($user->getPHID()));
diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
--- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
+++ b/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
   public function getTypeIcon() {
diff --git a/src/applications/people/query/PhabricatorPeopleLogQuery.php b/src/applications/people/query/PhabricatorPeopleLogQuery.php
--- a/src/applications/people/query/PhabricatorPeopleLogQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleLogQuery.php
@@ -107,7 +107,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
 }
diff --git a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
--- a/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleLogSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -297,7 +297,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
 }
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
   public function getCustomFieldObject() {
diff --git a/src/applications/people/typeahead/PhabricatorPeopleDatasource.php b/src/applications/people/typeahead/PhabricatorPeopleDatasource.php
--- a/src/applications/people/typeahead/PhabricatorPeopleDatasource.php
+++ b/src/applications/people/typeahead/PhabricatorPeopleDatasource.php
@@ -20,7 +20,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationPeople';
+    return 'PhabricatorPeopleApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/phame/application/PhabricatorApplicationPhame.php b/src/applications/phame/application/PhabricatorApplicationPhame.php
deleted file mode 100644
--- a/src/applications/phame/application/PhabricatorApplicationPhame.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-final class PhabricatorApplicationPhame extends PhabricatorApplication {
-
-  public function getBaseURI() {
-    return '/phame/';
-  }
-
-  public function getIconName() {
-    return 'phame';
-  }
-
-  public function getShortDescription() {
-    return 'Blog';
-  }
-
-  public function getTitleGlyph() {
-    return "\xe2\x9c\xa9";
-  }
-
-  public function getHelpURI() {
-    return PhabricatorEnv::getDoclink('Phame User Guide');
-  }
-
-  public function isBeta() {
-    return true;
-  }
-
-  public function getRoutes() {
-    return array(
-     '/phame/' => array(
-        '' => 'PhamePostListController',
-        'r/(?P<id>\d+)/(?P<hash>[^/]+)/(?P<name>.*)'
-                                          => 'PhameResourceController',
-
-        'live/(?P<id>[^/]+)/(?P<more>.*)' => 'PhameBlogLiveController',
-        'post/' => array(
-          '(?:(?P<filter>draft|all)/)?'     => 'PhamePostListController',
-          'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
-          'delete/(?P<id>[^/]+)/'           => 'PhamePostDeleteController',
-          'edit/(?:(?P<id>[^/]+)/)?'        => 'PhamePostEditController',
-          'view/(?P<id>\d+)/'               => 'PhamePostViewController',
-          'publish/(?P<id>\d+)/'            => 'PhamePostPublishController',
-          'unpublish/(?P<id>\d+)/'          => 'PhamePostUnpublishController',
-          'notlive/(?P<id>\d+)/'            => 'PhamePostNotLiveController',
-          'preview/'                        => 'PhamePostPreviewController',
-          'framed/(?P<id>\d+)/'             => 'PhamePostFramedController',
-          'new/'                            => 'PhamePostNewController',
-          'move/(?P<id>\d+)/'               => 'PhamePostNewController'
-        ),
-        'blog/' => array(
-          '(?:(?P<filter>user|all)/)?'      => 'PhameBlogListController',
-          'delete/(?P<id>[^/]+)/'           => 'PhameBlogDeleteController',
-          'edit/(?P<id>[^/]+)/'             => 'PhameBlogEditController',
-          'view/(?P<id>[^/]+)/'             => 'PhameBlogViewController',
-          'feed/(?P<id>[^/]+)/'             => 'PhameBlogFeedController',
-          'new/'                            => 'PhameBlogEditController',
-        ),
-      ),
-    );
-  }
-}
diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -0,0 +1,63 @@
+<?php
+
+final class PhabricatorPhameApplication extends PhabricatorApplication {
+
+  public function getBaseURI() {
+    return '/phame/';
+  }
+
+  public function getIconName() {
+    return 'phame';
+  }
+
+  public function getShortDescription() {
+    return 'Blog';
+  }
+
+  public function getTitleGlyph() {
+    return "\xe2\x9c\xa9";
+  }
+
+  public function getHelpURI() {
+    return PhabricatorEnv::getDoclink('Phame User Guide');
+  }
+
+  public function isBeta() {
+    return true;
+  }
+
+  public function getRoutes() {
+    return array(
+     '/phame/' => array(
+        '' => 'PhamePostListController',
+        'r/(?P<id>\d+)/(?P<hash>[^/]+)/(?P<name>.*)'
+          => 'PhameResourceController',
+
+        'live/(?P<id>[^/]+)/(?P<more>.*)' => 'PhameBlogLiveController',
+        'post/' => array(
+          '(?:(?P<filter>draft|all)/)?' => 'PhamePostListController',
+          'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
+          'delete/(?P<id>[^/]+)/' => 'PhamePostDeleteController',
+          'edit/(?:(?P<id>[^/]+)/)?' => 'PhamePostEditController',
+          'view/(?P<id>\d+)/' => 'PhamePostViewController',
+          'publish/(?P<id>\d+)/' => 'PhamePostPublishController',
+          'unpublish/(?P<id>\d+)/' => 'PhamePostUnpublishController',
+          'notlive/(?P<id>\d+)/' => 'PhamePostNotLiveController',
+          'preview/' => 'PhamePostPreviewController',
+          'framed/(?P<id>\d+)/' => 'PhamePostFramedController',
+          'new/' => 'PhamePostNewController',
+          'move/(?P<id>\d+)/' => 'PhamePostNewController'
+        ),
+        'blog/' => array(
+          '(?:(?P<filter>user|all)/)?' => 'PhameBlogListController',
+          'delete/(?P<id>[^/]+)/' => 'PhameBlogDeleteController',
+          'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController',
+          'view/(?P<id>[^/]+)/' => 'PhameBlogViewController',
+          'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController',
+          'new/' => 'PhameBlogEditController',
+        ),
+      ),
+    );
+  }
+
+}
diff --git a/src/applications/phame/conduit/ConduitAPI_phame_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_Method.php
--- a/src/applications/phame/conduit/ConduitAPI_phame_Method.php
+++ b/src/applications/phame/conduit/ConduitAPI_phame_Method.php
@@ -2,8 +2,8 @@
 
 abstract class ConduitAPI_phame_Method extends ConduitAPIMethod {
 
-  public function getApplication() {
-    return PhabricatorApplication::getByClass('PhabricatorApplicationPhame');
+  final public function getApplication() {
+    return PhabricatorApplication::getByClass('PhabricatorPhameApplication');
   }
 
 }
diff --git a/src/applications/phid/query/PhabricatorObjectListQuery.php b/src/applications/phid/query/PhabricatorObjectListQuery.php
--- a/src/applications/phid/query/PhabricatorObjectListQuery.php
+++ b/src/applications/phid/query/PhabricatorObjectListQuery.php
@@ -144,7 +144,7 @@
     }
 
     $mailing_list_app = PhabricatorApplication::getByClass(
-      'PhabricatorApplicationMailingLists');
+      'PhabricatorMailingListsApplication');
     if ($mailing_list_app->isInstalled()) {
       if ($names) {
         // We still haven't been able to resolve everything; try mailing lists
diff --git a/src/applications/phlux/application/PhabricatorApplicationPhlux.php b/src/applications/phlux/application/PhabricatorPhluxApplication.php
rename from src/applications/phlux/application/PhabricatorApplicationPhlux.php
rename to src/applications/phlux/application/PhabricatorPhluxApplication.php
--- a/src/applications/phlux/application/PhabricatorApplicationPhlux.php
+++ b/src/applications/phlux/application/PhabricatorPhluxApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPhlux extends PhabricatorApplication {
+final class PhabricatorPhluxApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/phlux/';
diff --git a/src/applications/phlux/query/PhluxVariableQuery.php b/src/applications/phlux/query/PhluxVariableQuery.php
--- a/src/applications/phlux/query/PhluxVariableQuery.php
+++ b/src/applications/phlux/query/PhluxVariableQuery.php
@@ -66,7 +66,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhlux';
+    return 'PhabricatorPhluxApplication';
   }
 
 }
diff --git a/src/applications/pholio/application/PhabricatorApplicationPholio.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
rename from src/applications/pholio/application/PhabricatorApplicationPholio.php
rename to src/applications/pholio/application/PhabricatorPholioApplication.php
--- a/src/applications/pholio/application/PhabricatorApplicationPholio.php
+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPholio extends PhabricatorApplication {
+final class PhabricatorPholioApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/pholio/';
diff --git a/src/applications/pholio/mail/PholioMockMailReceiver.php b/src/applications/pholio/mail/PholioMockMailReceiver.php
--- a/src/applications/pholio/mail/PholioMockMailReceiver.php
+++ b/src/applications/pholio/mail/PholioMockMailReceiver.php
@@ -3,7 +3,7 @@
 final class PholioMockMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationPholio';
+    $app_class = 'PhabricatorPholioApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/pholio/phid/PholioPHIDTypeMock.php b/src/applications/pholio/phid/PholioPHIDTypeMock.php
--- a/src/applications/pholio/phid/PholioPHIDTypeMock.php
+++ b/src/applications/pholio/phid/PholioPHIDTypeMock.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationPholio';
+    return 'PhabricatorPholioApplication';
   }
 
   public function newObject() {
diff --git a/src/applications/pholio/query/PholioImageQuery.php b/src/applications/pholio/query/PholioImageQuery.php
--- a/src/applications/pholio/query/PholioImageQuery.php
+++ b/src/applications/pholio/query/PholioImageQuery.php
@@ -159,7 +159,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPholio';
+    return 'PhabricatorPholioApplication';
   }
 
 }
diff --git a/src/applications/pholio/query/PholioMockQuery.php b/src/applications/pholio/query/PholioMockQuery.php
--- a/src/applications/pholio/query/PholioMockQuery.php
+++ b/src/applications/pholio/query/PholioMockQuery.php
@@ -172,7 +172,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPholio';
+    return 'PhabricatorPholioApplication';
   }
 
 }
diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
--- a/src/applications/pholio/query/PholioMockSearchEngine.php
+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
@@ -1,14 +1,13 @@
 <?php
 
-final class PholioMockSearchEngine
-  extends PhabricatorApplicationSearchEngine {
+final class PholioMockSearchEngine extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Pholio Mocks');
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPholio';
+    return 'PhabricatorPholioApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -85,7 +84,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -32,7 +32,7 @@
   public static function initializeNewMock(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationPholio'))
+      ->withClasses(array('PhabricatorPholioApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(PholioCapabilityDefaultView::CAPABILITY);
diff --git a/src/applications/phortune/application/PhabricatorApplicationPhortune.php b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
rename from src/applications/phortune/application/PhabricatorApplicationPhortune.php
rename to src/applications/phortune/application/PhabricatorPhortuneApplication.php
--- a/src/applications/phortune/application/PhabricatorApplicationPhortune.php
+++ b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPhortune extends PhabricatorApplication {
+final class PhabricatorPhortuneApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/phortune/';
diff --git a/src/applications/phortune/provider/PhortunePaymentProvider.php b/src/applications/phortune/provider/PhortunePaymentProvider.php
--- a/src/applications/phortune/provider/PhortunePaymentProvider.php
+++ b/src/applications/phortune/provider/PhortunePaymentProvider.php
@@ -91,8 +91,7 @@
   /**
    * Determine of a provider can handle a payment method.
    *
-   * @return bool True if this provider can apply charges to the payment
-   *              method.
+   * @return bool True if this provider can apply charges to the payment method.
    */
   abstract public function canHandlePaymentMethod(
     PhortunePaymentMethod $method);
@@ -182,7 +181,7 @@
 
     $digest = PhabricatorHash::digestForIndex($this->getProviderKey());
 
-    $app = PhabricatorApplication::getByClass('PhabricatorApplicationPhortune');
+    $app = PhabricatorApplication::getByClass('PhabricatorPhortuneApplication');
     $path = $app->getBaseURI().'provider/'.$digest.'/'.$action.'/';
 
     $uri = new PhutilURI($path);
diff --git a/src/applications/phortune/query/PhortuneAccountQuery.php b/src/applications/phortune/query/PhortuneAccountQuery.php
--- a/src/applications/phortune/query/PhortuneAccountQuery.php
+++ b/src/applications/phortune/query/PhortuneAccountQuery.php
@@ -95,9 +95,8 @@
     return implode(' ', $joins);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhortune';
+    return 'PhabricatorPhortuneApplication';
   }
 
 }
diff --git a/src/applications/phortune/query/PhortunePaymentMethodQuery.php b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
--- a/src/applications/phortune/query/PhortunePaymentMethodQuery.php
+++ b/src/applications/phortune/query/PhortunePaymentMethodQuery.php
@@ -110,9 +110,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhortune';
+    return 'PhabricatorPhortuneApplication';
   }
 
 }
diff --git a/src/applications/phortune/query/PhortuneProductQuery.php b/src/applications/phortune/query/PhortuneProductQuery.php
--- a/src/applications/phortune/query/PhortuneProductQuery.php
+++ b/src/applications/phortune/query/PhortuneProductQuery.php
@@ -54,7 +54,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhortune';
+    return 'PhabricatorPhortuneApplication';
   }
 
 }
diff --git a/src/applications/phpast/application/PhabricatorApplicationPHPAST.php b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
rename from src/applications/phpast/application/PhabricatorApplicationPHPAST.php
rename to src/applications/phpast/application/PhabricatorPHPASTApplication.php
--- a/src/applications/phpast/application/PhabricatorApplicationPHPAST.php
+++ b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPHPAST extends PhabricatorApplication {
+final class PhabricatorPHPASTApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/xhpast/';
diff --git a/src/applications/phragment/application/PhabricatorApplicationPhragment.php b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
rename from src/applications/phragment/application/PhabricatorApplicationPhragment.php
rename to src/applications/phragment/application/PhabricatorPhragmentApplication.php
--- a/src/applications/phragment/application/PhabricatorApplicationPhragment.php
+++ b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPhragment extends PhabricatorApplication {
+final class PhabricatorPhragmentApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/phragment/';
@@ -59,8 +59,7 @@
 
   protected function getCustomCapabilities() {
     return array(
-      PhragmentCapabilityCanCreate::CAPABILITY => array(
-      ),
+      PhragmentCapabilityCanCreate::CAPABILITY => array(),
     );
   }
 
diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
--- a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
+++ b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationPhragment');
+      'PhabricatorPhragmentApplication');
   }
 
 }
diff --git a/src/applications/phragment/query/PhragmentFragmentQuery.php b/src/applications/phragment/query/PhragmentFragmentQuery.php
--- a/src/applications/phragment/query/PhragmentFragmentQuery.php
+++ b/src/applications/phragment/query/PhragmentFragmentQuery.php
@@ -125,6 +125,6 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhragment';
+    return 'PhabricatorPhragmentApplication';
   }
 }
diff --git a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php
--- a/src/applications/phragment/query/PhragmentFragmentVersionQuery.php
+++ b/src/applications/phragment/query/PhragmentFragmentVersionQuery.php
@@ -118,6 +118,6 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhragment';
+    return 'PhabricatorPhragmentApplication';
   }
 }
diff --git a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php
--- a/src/applications/phragment/query/PhragmentSnapshotChildQuery.php
+++ b/src/applications/phragment/query/PhragmentSnapshotChildQuery.php
@@ -169,6 +169,6 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhragment';
+    return 'PhabricatorPhragmentApplication';
   }
 }
diff --git a/src/applications/phragment/query/PhragmentSnapshotQuery.php b/src/applications/phragment/query/PhragmentSnapshotQuery.php
--- a/src/applications/phragment/query/PhragmentSnapshotQuery.php
+++ b/src/applications/phragment/query/PhragmentSnapshotQuery.php
@@ -105,6 +105,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhragment';
+    return 'PhabricatorPhragmentApplication';
   }
+
 }
diff --git a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
rename from src/applications/phrequent/application/PhabricatorApplicationPhrequent.php
rename to src/applications/phrequent/application/PhabricatorPhrequentApplication.php
--- a/src/applications/phrequent/application/PhabricatorApplicationPhrequent.php
+++ b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPhrequent extends PhabricatorApplication {
+final class PhabricatorPhrequentApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Track Time Spent');
diff --git a/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php b/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php
--- a/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php
+++ b/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php
@@ -4,8 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationPhrequent');
+      'PhabricatorPhrequentApplication');
   }
 
-
 }
diff --git a/src/applications/phrequent/query/PhrequentSearchEngine.php b/src/applications/phrequent/query/PhrequentSearchEngine.php
--- a/src/applications/phrequent/query/PhrequentSearchEngine.php
+++ b/src/applications/phrequent/query/PhrequentSearchEngine.php
@@ -1,14 +1,13 @@
 <?php
 
-final class PhrequentSearchEngine
-  extends PhabricatorApplicationSearchEngine {
+final class PhrequentSearchEngine extends PhabricatorApplicationSearchEngine {
 
   public function getResultTypeDescription() {
     return pht('Phrequent Time');
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPhrequent';
+    return 'PhabricatorPhrequentApplication';
   }
 
   public function getPageSize(PhabricatorSavedQuery $saved) {
@@ -92,16 +91,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'tracking' => pht('Currently Tracking'),
       'all' => pht('All Tracked'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -203,4 +199,5 @@
 
     return $view;
   }
+
 }
diff --git a/src/applications/phrequent/query/PhrequentUserTimeQuery.php b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
--- a/src/applications/phrequent/query/PhrequentUserTimeQuery.php
+++ b/src/applications/phrequent/query/PhrequentUserTimeQuery.php
@@ -302,9 +302,8 @@
     return $sum_ended['N'] + $sum_not_ended['N'];
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhrequent';
+    return 'PhabricatorPhrequentApplication';
   }
 
 }
diff --git a/src/applications/phriction/application/PhabricatorApplicationPhriction.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
rename from src/applications/phriction/application/PhabricatorApplicationPhriction.php
rename to src/applications/phriction/application/PhabricatorPhrictionApplication.php
--- a/src/applications/phriction/application/PhabricatorApplicationPhriction.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPhriction extends PhabricatorApplication {
+final class PhabricatorPhrictionApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Wiki');
@@ -54,7 +54,7 @@
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionEditController',
         'delete/(?P<id>[1-9]\d*)/'    => 'PhrictionDeleteController',
         'new/'                        => 'PhrictionNewController',
-        'move/(?:(?P<id>[1-9]\d*)/)?'      => 'PhrictionMoveController',
+        'move/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionMoveController',
 
         'preview/' => 'PhabricatorMarkupPreviewController',
         'diff/(?P<id>[1-9]\d*)/' => 'PhrictionDiffController',
diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
--- a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
+++ b/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationPhriction');
+      'PhabricatorPhrictionApplication');
   }
 
   final protected function buildDocumentInfoDictionary(PhrictionDocument $doc) {
diff --git a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php b/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php
--- a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php
+++ b/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationPhriction';
+    return 'PhabricatorPhrictionApplication';
   }
 
   public function newObject() {
diff --git a/src/applications/phriction/query/PhrictionDocumentQuery.php b/src/applications/phriction/query/PhrictionDocumentQuery.php
--- a/src/applications/phriction/query/PhrictionDocumentQuery.php
+++ b/src/applications/phriction/query/PhrictionDocumentQuery.php
@@ -267,9 +267,8 @@
     }
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPhriction';
+    return 'PhabricatorPhrictionApplication';
   }
 
 }
diff --git a/src/applications/policy/application/PhabricatorApplicationPolicy.php b/src/applications/policy/application/PhabricatorPolicyApplication.php
rename from src/applications/policy/application/PhabricatorApplicationPolicy.php
rename to src/applications/policy/application/PhabricatorPolicyApplication.php
--- a/src/applications/policy/application/PhabricatorApplicationPolicy.php
+++ b/src/applications/policy/application/PhabricatorPolicyApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPolicy extends PhabricatorApplication {
+final class PhabricatorPolicyApplication extends PhabricatorApplication {
 
   public function isLaunchable() {
     return false;
diff --git a/src/applications/policy/query/PhabricatorPolicyQuery.php b/src/applications/policy/query/PhabricatorPolicyQuery.php
--- a/src/applications/policy/query/PhabricatorPolicyQuery.php
+++ b/src/applications/policy/query/PhabricatorPolicyQuery.php
@@ -228,9 +228,8 @@
     return true;
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPolicy';
+    return 'PhabricatorPolicyApplication';
   }
 
 }
diff --git a/src/applications/ponder/application/PhabricatorApplicationPonder.php b/src/applications/ponder/application/PhabricatorPonderApplication.php
rename from src/applications/ponder/application/PhabricatorApplicationPonder.php
rename to src/applications/ponder/application/PhabricatorPonderApplication.php
--- a/src/applications/ponder/application/PhabricatorApplicationPonder.php
+++ b/src/applications/ponder/application/PhabricatorPonderApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationPonder extends PhabricatorApplication {
+final class PhabricatorPonderApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/ponder/';
@@ -54,8 +54,8 @@
         'question/comment/(?P<id>\d+)/' => 'PonderQuestionCommentController',
         'question/history/(?P<id>\d+)/' => 'PonderQuestionHistoryController',
         'preview/' => 'PhabricatorMarkupPreviewController',
-        'question/(?P<status>open|close)/(?P<id>[1-9]\d*)/' =>
-          'PonderQuestionStatusController',
+        'question/(?P<status>open|close)/(?P<id>[1-9]\d*)/'
+          => 'PonderQuestionStatusController',
         'vote/' => 'PonderVoteSaveController',
       ),
     );
diff --git a/src/applications/ponder/mail/PonderQuestionMailReceiver.php b/src/applications/ponder/mail/PonderQuestionMailReceiver.php
--- a/src/applications/ponder/mail/PonderQuestionMailReceiver.php
+++ b/src/applications/ponder/mail/PonderQuestionMailReceiver.php
@@ -3,7 +3,7 @@
 final class PonderQuestionMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationPonder';
+    $app_class = 'PhabricatorPonderApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php b/src/applications/ponder/phid/PonderPHIDTypeQuestion.php
--- a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php
+++ b/src/applications/ponder/phid/PonderPHIDTypeQuestion.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationPonder';
+    return 'PhabricatorPonderApplication';
   }
 
   public function newObject() {
diff --git a/src/applications/ponder/query/PonderAnswerQuery.php b/src/applications/ponder/query/PonderAnswerQuery.php
--- a/src/applications/ponder/query/PonderAnswerQuery.php
+++ b/src/applications/ponder/query/PonderAnswerQuery.php
@@ -115,7 +115,6 @@
       }
     }
 
-
     return $answers;
   }
 
@@ -123,9 +122,8 @@
     return true;
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPonder';
+    return 'PhabricatorPonderApplication';
   }
 
 }
diff --git a/src/applications/ponder/query/PonderQuestionQuery.php b/src/applications/ponder/query/PonderQuestionQuery.php
--- a/src/applications/ponder/query/PonderQuestionQuery.php
+++ b/src/applications/ponder/query/PonderQuestionQuery.php
@@ -194,9 +194,8 @@
     return implode(' ', $joins);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationPonder';
+    return 'PhabricatorPonderApplication';
   }
 
 }
diff --git a/src/applications/ponder/query/PonderQuestionSearchEngine.php b/src/applications/ponder/query/PonderQuestionSearchEngine.php
--- a/src/applications/ponder/query/PonderQuestionSearchEngine.php
+++ b/src/applications/ponder/query/PonderQuestionSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationPonder';
+    return 'PhabricatorPonderApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
diff --git a/src/applications/project/application/PhabricatorApplicationProject.php b/src/applications/project/application/PhabricatorProjectApplication.php
rename from src/applications/project/application/PhabricatorApplicationProject.php
rename to src/applications/project/application/PhabricatorProjectApplication.php
--- a/src/applications/project/application/PhabricatorApplicationProject.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationProject extends PhabricatorApplication {
+final class PhabricatorProjectApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Projects');
@@ -46,23 +46,23 @@
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectEditMainController',
         'details/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectEditDetailsController',
-        'archive/(?P<id>[1-9]\d*)/' =>
-          'PhabricatorProjectArchiveController',
+        'archive/(?P<id>[1-9]\d*)/'
+          => 'PhabricatorProjectArchiveController',
         'members/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectMembersEditController',
         'members/(?P<id>[1-9]\d*)/remove/'
           => 'PhabricatorProjectMembersRemoveController',
         'view/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectProfileController',
-        'picture/(?P<id>[1-9]\d*)/' =>
-          'PhabricatorProjectEditPictureController',
-        'icon/(?P<id>[1-9]\d*)/' =>
-          'PhabricatorProjectEditIconController',
+        'picture/(?P<id>[1-9]\d*)/'
+          => 'PhabricatorProjectEditPictureController',
+        'icon/(?P<id>[1-9]\d*)/'
+          => 'PhabricatorProjectEditIconController',
         'create/' => 'PhabricatorProjectCreateController',
         'board/(?P<id>[1-9]\d*)/'.
           '(?P<filter>filter/)?'.
-          '(?:query/(?P<queryKey>[^/]+)/)?' =>
-          'PhabricatorProjectBoardViewController',
+          '(?:query/(?P<queryKey>[^/]+)/)?'
+          => 'PhabricatorProjectBoardViewController',
         'move/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectMoveController',
         'board/(?P<projectID>[1-9]\d*)/' => array(
           'edit/(?:(?P<id>\d+)/)?'
@@ -90,8 +90,7 @@
 
   protected function getCustomCapabilities() {
     return array(
-      ProjectCapabilityCreateProjects::CAPABILITY => array(
-      ),
+      ProjectCapabilityCreateProjects::CAPABILITY => array(),
     );
   }
 
diff --git a/src/applications/project/conduit/ConduitAPI_project_Method.php b/src/applications/project/conduit/ConduitAPI_project_Method.php
--- a/src/applications/project/conduit/ConduitAPI_project_Method.php
+++ b/src/applications/project/conduit/ConduitAPI_project_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_project_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationProject');
+    return PhabricatorApplication::getByClass('PhabricatorProjectApplication');
   }
 
   protected function buildProjectInfoDictionary(PhabricatorProject $project) {
diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php
--- a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php
+++ b/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationProject';
+    return 'PhabricatorProjectApplication';
   }
 
   public function getTypeIcon() {
@@ -111,5 +111,4 @@
     return phutil_utf8_strtolower($slug);
   }
 
-
 }
diff --git a/src/applications/project/query/PhabricatorProjectColumnQuery.php b/src/applications/project/query/PhabricatorProjectColumnQuery.php
--- a/src/applications/project/query/PhabricatorProjectColumnQuery.php
+++ b/src/applications/project/query/PhabricatorProjectColumnQuery.php
@@ -106,7 +106,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationProject';
+    return 'PhabricatorProjectApplication';
   }
 
 }
diff --git a/src/applications/project/query/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
--- a/src/applications/project/query/PhabricatorProjectQuery.php
+++ b/src/applications/project/query/PhabricatorProjectQuery.php
@@ -350,9 +350,8 @@
     return implode(' ', $joins);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationProject';
+    return 'PhabricatorProjectApplication';
   }
 
   protected function getApplicationSearchObjectPHIDColumn() {
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationProject';
+    return 'PhabricatorProjectApplication';
   }
 
   public function getCustomFieldObject() {
@@ -108,7 +108,6 @@
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/project/typeahead/PhabricatorProjectDatasource.php b/src/applications/project/typeahead/PhabricatorProjectDatasource.php
--- a/src/applications/project/typeahead/PhabricatorProjectDatasource.php
+++ b/src/applications/project/typeahead/PhabricatorProjectDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationProject';
+    return 'PhabricatorProjectApplication';
   }
 
   public function loadResults() {
diff --git a/src/applications/releeph/application/PhabricatorApplicationReleeph.php b/src/applications/releeph/application/PhabricatorReleephApplication.php
rename from src/applications/releeph/application/PhabricatorApplicationReleeph.php
rename to src/applications/releeph/application/PhabricatorReleephApplication.php
--- a/src/applications/releeph/application/PhabricatorApplicationReleeph.php
+++ b/src/applications/releeph/application/PhabricatorReleephApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationReleeph extends PhabricatorApplication {
+final class PhabricatorReleephApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Releeph');
@@ -49,17 +49,17 @@
         ),
 
         'branch/' => array(
-          'edit/(?P<branchID>[1-9]\d*)/' =>
-            'ReleephBranchEditController',
-          '(?P<action>close|re-open)/(?P<branchID>[1-9]\d*)/' =>
-            'ReleephBranchAccessController',
+          'edit/(?P<branchID>[1-9]\d*)/'
+            => 'ReleephBranchEditController',
+          '(?P<action>close|re-open)/(?P<branchID>[1-9]\d*)/'
+            => 'ReleephBranchAccessController',
           'preview/' => 'ReleephBranchNamePreviewController',
           '(?P<branchID>[1-9]\d*)/' => array(
             'history/' => 'ReleephBranchHistoryController',
             '(?:query/(?P<queryKey>[^/]+)/)?' => 'ReleephBranchViewController',
           ),
-          'pull/(?P<branchID>[1-9]\d*)/' =>
-            'ReleephRequestEditController',
+          'pull/(?P<branchID>[1-9]\d*)/'
+            => 'ReleephRequestEditController',
         ),
 
         'request/' => array(
@@ -68,14 +68,14 @@
             'D(?P<diffRevID>[1-9]\d*)' =>
               'ReleephRequestDifferentialCreateController',
           ),
-          'edit/(?P<requestID>[1-9]\d*)/' =>
-            'ReleephRequestEditController',
-          'action/(?P<action>.+)/(?P<requestID>[1-9]\d*)/' =>
-            'ReleephRequestActionController',
+          'edit/(?P<requestID>[1-9]\d*)/'
+            => 'ReleephRequestEditController',
+          'action/(?P<action>.+)/(?P<requestID>[1-9]\d*)/'
+            => 'ReleephRequestActionController',
           'typeahead/' =>
             'ReleephRequestTypeaheadController',
-          'comment/(?P<requestID>[1-9]\d*)/' =>
-            'ReleephRequestCommentController',
+          'comment/(?P<requestID>[1-9]\d*)/'
+            => 'ReleephRequestCommentController',
         ),
       )
     );
diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php b/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php
--- a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php
+++ b/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php
@@ -11,7 +11,7 @@
   }
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass('PhabricatorApplicationReleeph');
+    return PhabricatorApplication::getByClass('PhabricatorReleephApplication');
   }
 
 }
diff --git a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
rename from src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
rename to src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
--- a/src/applications/releeph/config/PhabricatorApplicationReleephConfigOptions.php
+++ b/src/applications/releeph/config/PhabricatorReleephApplicationConfigOptions.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationReleephConfigOptions
+final class PhabricatorReleephApplicationConfigOptions
   extends PhabricatorApplicationConfigOptions {
 
   public function getName() {
@@ -12,7 +12,6 @@
   }
 
   public function getOptions() {
-
     $default_fields = array(
       new ReleephSummaryFieldSpecification(),
       new ReleephRequestorFieldSpecification(),
@@ -70,5 +69,4 @@
     );
   }
 
-
 }
diff --git a/src/applications/releeph/mail/ReleephRequestMailReceiver.php b/src/applications/releeph/mail/ReleephRequestMailReceiver.php
--- a/src/applications/releeph/mail/ReleephRequestMailReceiver.php
+++ b/src/applications/releeph/mail/ReleephRequestMailReceiver.php
@@ -3,7 +3,7 @@
 final class ReleephRequestMailReceiver extends PhabricatorObjectMailReceiver {
 
   public function isEnabled() {
-    $app_class = 'PhabricatorApplicationReleeph';
+    $app_class = 'PhabricatorReleephApplication';
     return PhabricatorApplication::isClassInstalled($app_class);
   }
 
diff --git a/src/applications/releeph/query/ReleephBranchQuery.php b/src/applications/releeph/query/ReleephBranchQuery.php
--- a/src/applications/releeph/query/ReleephBranchQuery.php
+++ b/src/applications/releeph/query/ReleephBranchQuery.php
@@ -69,7 +69,6 @@
     }
   }
 
-
   public function willFilterPage(array $branches) {
     $project_ids = mpull($branches, 'getReleephProjectID');
 
@@ -146,9 +145,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationReleeph';
+    return 'PhabricatorReleephApplication';
   }
 
 }
diff --git a/src/applications/releeph/query/ReleephProductQuery.php b/src/applications/releeph/query/ReleephProductQuery.php
--- a/src/applications/releeph/query/ReleephProductQuery.php
+++ b/src/applications/releeph/query/ReleephProductQuery.php
@@ -83,7 +83,6 @@
   }
 
   public function didFilterPage(array $products) {
-
     if ($this->needArcanistProjects) {
       $project_ids = array_filter(mpull($products, 'getArcanistProjectID'));
       if ($project_ids) {
@@ -104,7 +103,6 @@
     return $products;
   }
 
-
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
@@ -169,7 +167,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationReleeph';
+    return 'PhabricatorReleephApplication';
   }
 
 }
diff --git a/src/applications/releeph/query/ReleephProductSearchEngine.php b/src/applications/releeph/query/ReleephProductSearchEngine.php
--- a/src/applications/releeph/query/ReleephProductSearchEngine.php
+++ b/src/applications/releeph/query/ReleephProductSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationReleeph';
+    return 'PhabricatorReleephApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -43,7 +43,6 @@
         ->setLabel(pht('Show Products'))
         ->setValue($saved_query->getParameter('active'))
         ->setOptions($this->getActiveOptions()));
-
   }
 
   protected function getURI($path) {
@@ -51,16 +50,13 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'active' => pht('Active'),
       'all' => pht('All'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
@@ -134,5 +130,4 @@
     return $list;
   }
 
-
 }
diff --git a/src/applications/releeph/query/ReleephRequestQuery.php b/src/applications/releeph/query/ReleephRequestQuery.php
--- a/src/applications/releeph/query/ReleephRequestQuery.php
+++ b/src/applications/releeph/query/ReleephRequestQuery.php
@@ -79,7 +79,6 @@
   }
 
   public function willFilterPage(array $requests) {
-
     // Load requested objects: you must be able to see an object to see
     // requests for it.
     $object_phids = mpull($requests, 'getRequestedObjectPHID');
@@ -241,9 +240,8 @@
     }
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationReleeph';
+    return 'PhabricatorReleephApplication';
   }
 
 }
diff --git a/src/applications/repository/application/PhabricatorApplicationRepositories.php b/src/applications/repository/application/PhabricatorRepositoriesApplication.php
rename from src/applications/repository/application/PhabricatorApplicationRepositories.php
rename to src/applications/repository/application/PhabricatorRepositoriesApplication.php
--- a/src/applications/repository/application/PhabricatorApplicationRepositories.php
+++ b/src/applications/repository/application/PhabricatorRepositoriesApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationRepositories extends PhabricatorApplication {
+final class PhabricatorRepositoriesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/repository/';
@@ -25,11 +25,11 @@
   public function getRoutes() {
     return array(
       '/repository/' => array(
-        ''                     => 'PhabricatorRepositoryListController',
-        'project/edit/(?P<id>[1-9]\d*)/' =>
-          'PhabricatorRepositoryArcanistProjectEditController',
-        'project/delete/(?P<id>[1-9]\d*)/' =>
-          'PhabricatorRepositoryArcanistProjectDeleteController',
+        '' => 'PhabricatorRepositoryListController',
+        'project/edit/(?P<id>[1-9]\d*)/'
+          => 'PhabricatorRepositoryArcanistProjectEditController',
+        'project/delete/(?P<id>[1-9]\d*)/'
+          => 'PhabricatorRepositoryArcanistProjectDeleteController',
       ),
     );
   }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_Method.php
--- a/src/applications/repository/conduit/ConduitAPI_repository_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_Method.php
@@ -4,7 +4,7 @@
 
   public function getApplication() {
     return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationDiffusion');
+      'PhabricatorDiffusionApplication');
   }
 
 }
diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
--- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
+++ b/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
@@ -58,7 +58,7 @@
   protected function execute(ConduitAPIRequest $request) {
     $application = id(new PhabricatorApplicationQuery())
       ->setViewer($request->getUser())
-      ->withClasses(array('PhabricatorApplicationDiffusion'))
+      ->withClasses(array('PhabricatorDiffusionApplication'))
       ->executeOne();
 
     PhabricatorPolicyFilter::requireCapability(
diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php
--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php
@@ -13,7 +13,7 @@
   }
 
   public function getPHIDTypeApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function newObject() {
@@ -65,7 +65,6 @@
       '[a-f0-9]{'.$min_unqualified.',40}';
   }
 
-
   public function canLoadNamedObject($name) {
     $pattern = self::getCommitObjectNamePattern();
     return preg_match('(^'.$pattern.'$)', $name);
diff --git a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryMirrorQuery.php
@@ -63,7 +63,6 @@
     return $mirrors;
   }
 
-
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
@@ -93,9 +92,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
 }
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushEventQuery.php
@@ -124,9 +124,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
 }
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogQuery.php
@@ -82,7 +82,6 @@
     return $logs;
   }
 
-
   private function buildWhereClause(AphrontDatabaseConnection $conn_r) {
     $where = array();
 
@@ -140,9 +139,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
 }
diff --git a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -91,15 +91,12 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Push Logs'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/repository/query/PhabricatorRepositoryQuery.php b/src/applications/repository/query/PhabricatorRepositoryQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryQuery.php
@@ -102,7 +102,6 @@
     return $this;
   }
 
-
   protected function loadPage() {
     $table = new PhabricatorRepository();
     $conn_r = $table->establishConnection('r');
@@ -237,7 +236,6 @@
   }
 
   protected function getPagingColumn() {
-
     $order = $this->order;
     switch ($order) {
       case self::ORDER_CREATED:
@@ -424,7 +422,7 @@
 
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   private function getNormalizedPaths() {
diff --git a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
--- a/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
+++ b/src/applications/repository/query/PhabricatorRepositoryRefCursorQuery.php
@@ -93,9 +93,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
 }
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationDiffusion';
+    return 'PhabricatorDiffusionApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -51,7 +51,7 @@
   public static function initializeNewRepository(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationDiffusion'))
+      ->withClasses(array('PhabricatorDiffusionApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(DiffusionCapabilityDefaultView::CAPABILITY);
diff --git a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
--- a/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
+++ b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
@@ -409,7 +409,7 @@
     PhabricatorRepositoryCommit $commit,
     $message) {
 
-    $maniphest = 'PhabricatorApplicationManiphest';
+    $maniphest = 'PhabricatorManiphestApplication';
     if (!PhabricatorApplication::isClassInstalled($maniphest)) {
       return;
     }
diff --git a/src/applications/search/application/PhabricatorApplicationSearch.php b/src/applications/search/application/PhabricatorSearchApplication.php
rename from src/applications/search/application/PhabricatorApplicationSearch.php
rename to src/applications/search/application/PhabricatorSearchApplication.php
--- a/src/applications/search/application/PhabricatorApplicationSearch.php
+++ b/src/applications/search/application/PhabricatorSearchApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSearch extends PhabricatorApplication {
+final class PhabricatorSearchApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/search/';
@@ -35,13 +35,13 @@
         'select/(?P<type>\w+)/'
           => 'PhabricatorSearchSelectController',
         'index/(?P<phid>[^/]+)/' => 'PhabricatorSearchIndexController',
-        'hovercard/(?P<mode>retrieve|test)/' =>
-          'PhabricatorSearchHovercardController',
+        'hovercard/(?P<mode>retrieve|test)/'
+          => 'PhabricatorSearchHovercardController',
         'edit/(?P<queryKey>[^/]+)/' => 'PhabricatorSearchEditController',
         'delete/(?P<queryKey>[^/]+)/(?P<engine>[^/]+)/'
           => 'PhabricatorSearchDeleteController',
         'order/(?P<engine>[^/]+)/' => 'PhabricatorSearchOrderController',
-        ),
+      ),
     );
   }
 
diff --git a/src/applications/search/query/PhabricatorNamedQueryQuery.php b/src/applications/search/query/PhabricatorNamedQueryQuery.php
--- a/src/applications/search/query/PhabricatorNamedQueryQuery.php
+++ b/src/applications/search/query/PhabricatorNamedQueryQuery.php
@@ -79,9 +79,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationSearch';
+    return 'PhabricatorSearchApplication';
   }
 
 }
diff --git a/src/applications/search/query/PhabricatorSavedQueryQuery.php b/src/applications/search/query/PhabricatorSavedQueryQuery.php
--- a/src/applications/search/query/PhabricatorSavedQueryQuery.php
+++ b/src/applications/search/query/PhabricatorSavedQueryQuery.php
@@ -66,9 +66,8 @@
     return $this->formatWhereClause($where);
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationSearch';
+    return 'PhabricatorSearchApplication';
   }
 
 }
diff --git a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
--- a/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
+++ b/src/applications/search/query/PhabricatorSearchApplicationSearchEngine.php
@@ -8,7 +8,7 @@
   }
 
   public function getApplicationClassName() {
-    return 'PhabricatorApplicationSearch';
+    return 'PhabricatorSearchApplication';
   }
 
   public function buildSavedQueryFromRequest(AphrontRequest $request) {
@@ -170,17 +170,14 @@
   }
 
   public function getBuiltinQueryNames() {
-    $names = array(
+    return array(
       'all' => pht('All Documents'),
       'open' => pht('Open Documents'),
       'open-tasks' => pht('Open Tasks'),
     );
-
-    return $names;
   }
 
   public function buildSavedQueryFromBuiltin($query_key) {
-
     $query = $this->newSavedQuery();
     $query->setQueryKey($query_key);
 
diff --git a/src/applications/search/query/PhabricatorSearchDocumentQuery.php b/src/applications/search/query/PhabricatorSearchDocumentQuery.php
--- a/src/applications/search/query/PhabricatorSearchDocumentQuery.php
+++ b/src/applications/search/query/PhabricatorSearchDocumentQuery.php
@@ -25,7 +25,6 @@
   }
 
   protected function willFilterPage(array $handles) {
-
     // NOTE: This is used by the object selector dialog to exclude the object
     // you're looking at, so that, e.g., a task can't be set as a dependency
     // of itself in the UI.
@@ -67,7 +66,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationSearch';
+    return 'PhabricatorSearchApplication';
   }
 
   protected function getPagingValue($result) {
diff --git a/src/applications/search/typeahead/PhabricatorSearchDatasource.php b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
--- a/src/applications/search/typeahead/PhabricatorSearchDatasource.php
+++ b/src/applications/search/typeahead/PhabricatorSearchDatasource.php
@@ -8,7 +8,7 @@
   }
 
   public function getDatasourceApplicationClass() {
-    return 'PhabricatorApplicationSearch';
+    return 'PhabricatorSearchApplication';
   }
 
   public function getComponentDatasources() {
diff --git a/src/applications/settings/application/PhabricatorApplicationSettings.php b/src/applications/settings/application/PhabricatorSettingsApplication.php
rename from src/applications/settings/application/PhabricatorApplicationSettings.php
rename to src/applications/settings/application/PhabricatorSettingsApplication.php
--- a/src/applications/settings/application/PhabricatorApplicationSettings.php
+++ b/src/applications/settings/application/PhabricatorSettingsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSettings extends PhabricatorApplication {
+final class PhabricatorSettingsApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/settings/';
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
--- a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
@@ -5,7 +5,7 @@
 
   public function isEnabled() {
     return PhabricatorApplication::isClassInstalled(
-      'PhabricatorApplicationConpherence');
+      'PhabricatorConpherenceApplication');
   }
 
   public function getPanelKey() {
@@ -65,4 +65,5 @@
       $form_box,
     );
   }
+
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
@@ -53,12 +53,12 @@
       $mailtags = $preferences->getPreference('mailtags', array());
       $all_tags = $this->getMailTags();
 
-      $maniphest = 'PhabricatorApplicationManiphest';
+      $maniphest = 'PhabricatorManiphestApplication';
       if (!PhabricatorApplication::isClassInstalled($maniphest)) {
         $all_tags = array_diff_key($all_tags, $this->getManiphestMailTags());
       }
 
-      $pholio = 'PhabricatorApplicationPholio';
+      $pholio = 'PhabricatorPholioApplication';
       if (!PhabricatorApplication::isClassInstalled($pholio)) {
         $all_tags = array_diff_key($all_tags, $this->getPholioMailTags());
       }
@@ -186,7 +186,7 @@
         '**Phabricator will send an email to your primary account when:**'));
 
     if (PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationDifferential', $user)) {
+      'PhabricatorDifferentialApplication', $user)) {
       $form
         ->appendChild(
           $this->buildMailTagCheckboxes(
@@ -196,7 +196,7 @@
     }
 
     if (PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationManiphest', $user)) {
+      'PhabricatorManiphestApplication', $user)) {
       $form->appendChild(
         $this->buildMailTagCheckboxes(
           $this->getManiphestMailTags(),
@@ -205,7 +205,7 @@
     }
 
     if (PhabricatorApplication::isClassInstalledForViewer(
-      'PhabricatorApplicationPholio', $user)) {
+      'PhabricatorPholioApplication', $user)) {
       $form->appendChild(
         $this->buildMailTagCheckboxes(
           $this->getPholioMailTags(),
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php
--- a/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelHomePreferences.php
@@ -42,7 +42,7 @@
       }
       asort($options);
 
-      unset($options['PhabricatorApplicationApplications']);
+      unset($options['PhabricatorApplicationsApplication']);
 
       if ($request->isFormPost()) {
         $pin = $request->getStr('pin');
@@ -137,7 +137,7 @@
       ));
 
     foreach ($app_list as $key => $application) {
-      if ($key == 'PhabricatorApplicationApplications') {
+      if ($key == 'PhabricatorApplicationsApplication') {
         continue;
       }
 
@@ -194,4 +194,5 @@
 
     return $box;
   }
+
 }
diff --git a/src/applications/slowvote/application/PhabricatorApplicationSlowvote.php b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
rename from src/applications/slowvote/application/PhabricatorApplicationSlowvote.php
rename to src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
--- a/src/applications/slowvote/application/PhabricatorApplicationSlowvote.php
+++ b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSlowvote extends PhabricatorApplication {
+final class PhabricatorSlowvoteApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/vote/';
diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php b/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
+++ b/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_slowvote_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationSlowvote');
+    return PhabricatorApplication::getByClass('PhabricatorSlowvoteApplication');
   }
 
 }
diff --git a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
--- a/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
+++ b/src/applications/slowvote/query/PhabricatorSlowvoteQuery.php
@@ -178,9 +178,8 @@
     return 'p.id';
   }
 
-
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationSlowvote';
+    return 'PhabricatorSlowvoteApplication';
   }
 
 }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
--- a/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
@@ -31,7 +31,7 @@
   public static function initializeNewPoll(PhabricatorUser $actor) {
     $app = id(new PhabricatorApplicationQuery())
       ->setViewer($actor)
-      ->withClasses(array('PhabricatorApplicationSlowvote'))
+      ->withClasses(array('PhabricatorSlowvoteApplication'))
       ->executeOne();
 
     $view_policy = $app->getPolicy(
diff --git a/src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
rename from src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php
rename to src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
--- a/src/applications/subscriptions/application/PhabricatorApplicationSubscriptions.php
+++ b/src/applications/subscriptions/application/PhabricatorSubscriptionsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSubscriptions extends PhabricatorApplication {
+final class PhabricatorSubscriptionsApplication extends PhabricatorApplication {
 
   public function isLaunchable() {
     return false;
@@ -22,8 +22,8 @@
         '(?P<action>add|delete)/'.
         '(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsEditController',
         'list/(?P<phid>[^/]+)/' => 'PhabricatorSubscriptionsListController',
-        'transaction/(?P<type>add|rem)/(?<phid>[^/]+)/' =>
-          'PhabricatorSubscriptionsTransactionController',
+        'transaction/(?P<type>add|rem)/(?<phid>[^/]+)/'
+          => 'PhabricatorSubscriptionsTransactionController',
       ),
     );
   }
diff --git a/src/applications/support/application/PhabricatorApplicationSupport.php b/src/applications/support/application/PhabricatorSupportApplication.php
rename from src/applications/support/application/PhabricatorApplicationSupport.php
rename to src/applications/support/application/PhabricatorSupportApplication.php
--- a/src/applications/support/application/PhabricatorApplicationSupport.php
+++ b/src/applications/support/application/PhabricatorSupportApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSupport extends PhabricatorApplication {
+final class PhabricatorSupportApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
diff --git a/src/applications/system/application/PhabricatorApplicationSystem.php b/src/applications/system/application/PhabricatorSystemApplication.php
rename from src/applications/system/application/PhabricatorApplicationSystem.php
rename to src/applications/system/application/PhabricatorSystemApplication.php
--- a/src/applications/system/application/PhabricatorApplicationSystem.php
+++ b/src/applications/system/application/PhabricatorSystemApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationSystem extends PhabricatorApplication {
+final class PhabricatorSystemApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
diff --git a/src/applications/tokens/application/PhabricatorApplicationTokens.php b/src/applications/tokens/application/PhabricatorTokensApplication.php
rename from src/applications/tokens/application/PhabricatorApplicationTokens.php
rename to src/applications/tokens/application/PhabricatorTokensApplication.php
--- a/src/applications/tokens/application/PhabricatorApplicationTokens.php
+++ b/src/applications/tokens/application/PhabricatorTokensApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationTokens extends PhabricatorApplication {
+final class PhabricatorTokensApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Tokens');
diff --git a/src/applications/tokens/conduit/ConduitAPI_token_Method.php b/src/applications/tokens/conduit/ConduitAPI_token_Method.php
--- a/src/applications/tokens/conduit/ConduitAPI_token_Method.php
+++ b/src/applications/tokens/conduit/ConduitAPI_token_Method.php
@@ -3,8 +3,7 @@
 abstract class ConduitAPI_token_Method extends ConduitAPIMethod {
 
   public function getApplication() {
-    return PhabricatorApplication::getByClass(
-      'PhabricatorApplicationTokens');
+    return PhabricatorApplication::getByClass('PhabricatorTokensApplication');
   }
 
   public function getMethodStatus() {
@@ -42,5 +41,4 @@
     return $list;
   }
 
-
 }
diff --git a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
--- a/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
+++ b/src/applications/tokens/query/PhabricatorTokenGivenQuery.php
@@ -90,7 +90,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationTokens';
+    return 'PhabricatorTokensApplication';
   }
 
 }
diff --git a/src/applications/tokens/query/PhabricatorTokenQuery.php b/src/applications/tokens/query/PhabricatorTokenQuery.php
--- a/src/applications/tokens/query/PhabricatorTokenQuery.php
+++ b/src/applications/tokens/query/PhabricatorTokenQuery.php
@@ -63,7 +63,7 @@
 
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationTokens';
+    return 'PhabricatorTokensApplication';
   }
 
 }
diff --git a/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php b/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php
--- a/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php
+++ b/src/applications/tokens/query/PhabricatorTokenReceiverQuery.php
@@ -35,7 +35,7 @@
   }
 
   public function getQueryApplicationClass() {
-    return 'PhabricatorApplicationTokens';
+    return 'PhabricatorTokensApplication';
   }
 
 }
diff --git a/src/applications/transactions/application/PhabricatorApplicationTransactions.php b/src/applications/transactions/application/PhabricatorTransactionsApplication.php
rename from src/applications/transactions/application/PhabricatorApplicationTransactions.php
rename to src/applications/transactions/application/PhabricatorTransactionsApplication.php
--- a/src/applications/transactions/application/PhabricatorApplicationTransactions.php
+++ b/src/applications/transactions/application/PhabricatorTransactionsApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationTransactions extends PhabricatorApplication {
+final class PhabricatorTransactionsApplication extends PhabricatorApplication {
 
   public function isLaunchable() {
     return false;
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -716,7 +716,7 @@
         // Herald application) as the author of record, so that transactions
         // will render in a reasonable way ("Herald assigned this task ...").
         $herald_actor = PhabricatorUser::getOmnipotentUser();
-        $herald_phid = id(new PhabricatorApplicationHerald())->getPHID();
+        $herald_phid = id(new PhabricatorHeraldApplication())->getPHID();
 
         // TODO: It would be nice to give transactions a more specific source
         // which points at the rule which generated them. You can figure this
diff --git a/src/applications/typeahead/application/PhabricatorApplicationTypeahead.php b/src/applications/typeahead/application/PhabricatorTypeaheadApplication.php
rename from src/applications/typeahead/application/PhabricatorApplicationTypeahead.php
rename to src/applications/typeahead/application/PhabricatorTypeaheadApplication.php
--- a/src/applications/typeahead/application/PhabricatorApplicationTypeahead.php
+++ b/src/applications/typeahead/application/PhabricatorTypeaheadApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationTypeahead extends PhabricatorApplication {
+final class PhabricatorTypeaheadApplication extends PhabricatorApplication {
 
   public function getRoutes() {
     return array(
diff --git a/src/applications/uiexample/application/PhabricatorApplicationUIExamples.php b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
rename from src/applications/uiexample/application/PhabricatorApplicationUIExamples.php
rename to src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
--- a/src/applications/uiexample/application/PhabricatorApplicationUIExamples.php
+++ b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationUIExamples extends PhabricatorApplication {
+final class PhabricatorUIExamplesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/uiexample/';
diff --git a/src/applications/xhprof/application/PhabricatorApplicationXHProf.php b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
rename from src/applications/xhprof/application/PhabricatorApplicationXHProf.php
rename to src/applications/xhprof/application/PhabricatorXHProfApplication.php
--- a/src/applications/xhprof/application/PhabricatorApplicationXHProf.php
+++ b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorApplicationXHProf extends PhabricatorApplication {
+final class PhabricatorXHProfApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/xhprof/';
@@ -32,5 +32,4 @@
     );
   }
 
-
 }
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -278,7 +278,7 @@
 
     $message_tag = '';
     $message_notification_dropdown = '';
-    $conpherence = 'PhabricatorApplicationConpherence';
+    $conpherence = 'PhabricatorConpherenceApplication';
     if (PhabricatorApplication::isClassInstalledForViewer(
       $conpherence,
       $user)) {
@@ -364,7 +364,7 @@
 
     $bubble_tag = '';
     $notification_dropdown = '';
-    $notification_app = 'PhabricatorApplicationNotifications';
+    $notification_app = 'PhabricatorNotificationsApplication';
     if (PhabricatorApplication::isClassInstalledForViewer(
       $notification_app,
       $user)) {