D9986.id.largetrue.diff
No OneTemporary
Actions

Size

246 KB

Referenced Files

None

Subscribers

None

D9986.id.largetrue.diff
View Options

	diff --git a/resources/sql/autopatches/20140211.dx.2.migcommenttext.php b/resources/sql/autopatches/20140211.dx.2.migcommenttext.php
	--- a/resources/sql/autopatches/20140211.dx.2.migcommenttext.php
	+++ b/resources/sql/autopatches/20140211.dx.2.migcommenttext.php
	@@ -27,12 +27,12 @@
	$dst_table = 'differential_inline_comment';

	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST);

	$comment_phid = PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_XCMT,
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ DifferentialRevisionPHIDType::TYPECONST);

	queryfx(
	$conn_w,
	diff --git a/resources/sql/autopatches/20140212.dx.1.armageddon.php b/resources/sql/autopatches/20140212.dx.1.armageddon.php
	--- a/resources/sql/autopatches/20140212.dx.1.armageddon.php
	+++ b/resources/sql/autopatches/20140212.dx.1.armageddon.php
	@@ -171,8 +171,8 @@
	$xaction_phid = idx($xaction, 'phid');
	if (!$xaction_phid) {
	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST);
	}
	unset($xaction['phid']);

	diff --git a/resources/sql/patches/20130715.votecomments.php b/resources/sql/patches/20130715.votecomments.php
	--- a/resources/sql/patches/20130715.votecomments.php
	+++ b/resources/sql/patches/20130715.votecomments.php
	@@ -43,8 +43,8 @@
	$comment_phid = PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_XCMT);
	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- PhabricatorSlowvotePHIDTypePoll::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ PhabricatorSlowvotePollPHIDType::TYPECONST);

	$source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_LEGACY,
	diff --git a/resources/sql/patches/20130728.ponderxcomment.php b/resources/sql/patches/20130728.ponderxcomment.php
	--- a/resources/sql/patches/20130728.ponderxcomment.php
	+++ b/resources/sql/patches/20130728.ponderxcomment.php
	@@ -16,22 +16,22 @@

	$type = phid_get_type($row['targetPHID']);
	switch ($type) {
	- case PonderPHIDTypeQuestion::TYPECONST:
	+ case PonderQuestionPHIDType::TYPECONST:
	$table_obj = $qtable;
	$comment_obj = new PonderQuestionTransactionComment();
	break;
	- case PonderPHIDTypeAnswer::TYPECONST:
	+ case PonderAnswerPHIDType::TYPECONST:
	$table_obj = $atable;
	$comment_obj = new PonderAnswerTransactionComment();
	break;
	}

	$comment_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	$type);

	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	$type);

	queryfx(
	diff --git a/resources/sql/patches/20130801.pastexactions.php b/resources/sql/patches/20130801.pastexactions.php
	--- a/resources/sql/patches/20130801.pastexactions.php
	+++ b/resources/sql/patches/20130801.pastexactions.php
	@@ -15,7 +15,7 @@
	echo "Adding transactions for paste id {$id}...\n";

	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST);

	queryfx(
	$conn_w,
	diff --git a/resources/sql/patches/20130802.heraldphids.php b/resources/sql/patches/20130802.heraldphids.php
	--- a/resources/sql/patches/20130802.heraldphids.php
	+++ b/resources/sql/patches/20130802.heraldphids.php
	@@ -17,7 +17,7 @@
	$conn_w,
	'UPDATE %T SET phid = %s WHERE id = %d',
	$table->getTableName(),
	- PhabricatorPHID::generateNewPHID(HeraldPHIDTypeRule::TYPECONST),
	+ PhabricatorPHID::generateNewPHID(HeraldRulePHIDType::TYPECONST),
	$rule->getID());
	}

	diff --git a/resources/sql/patches/20130921.xmigratemaniphest.php b/resources/sql/patches/20130921.xmigratemaniphest.php
	--- a/resources/sql/patches/20130921.xmigratemaniphest.php
	+++ b/resources/sql/patches/20130921.xmigratemaniphest.php
	@@ -62,8 +62,8 @@
	// a comment in addition to an action) we'll insert that below.
	if ($row['transactionType'] != 'comment') {
	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- ManiphestPHIDTypeTask::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST);

	queryfx(
	$conn_w,
	@@ -93,12 +93,12 @@
	if ($has_comment) {
	$comment_phid = PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_XCMT,
	- ManiphestPHIDTypeTask::TYPECONST);
	+ ManiphestTaskPHIDType::TYPECONST);
	$comment_version = 1;

	$comment_xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- ManiphestPHIDTypeTask::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST);

	// Insert the comment data.
	queryfx(
	diff --git a/resources/sql/patches/20130926.dinline.php b/resources/sql/patches/20130926.dinline.php
	--- a/resources/sql/patches/20130926.dinline.php
	+++ b/resources/sql/patches/20130926.dinline.php
	@@ -34,15 +34,15 @@

	if ($row['commentID']) {
	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST);
	} else {
	$xaction_phid = null;
	}

	$comment_phid = PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_XCMT,
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ DifferentialRevisionPHIDType::TYPECONST);

	queryfx(
	$conn_w,
	diff --git a/resources/sql/patches/20131020.pxactionmig.php b/resources/sql/patches/20131020.pxactionmig.php
	--- a/resources/sql/patches/20131020.pxactionmig.php
	+++ b/resources/sql/patches/20131020.pxactionmig.php
	@@ -47,7 +47,7 @@
	}

	$xaction_phid = PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	PhabricatorProjectPHIDTypeProject::TYPECONST);

	queryfx(
	diff --git a/resources/sql/patches/20131106.diffphid.2.mig.php b/resources/sql/patches/20131106.diffphid.2.mig.php
	--- a/resources/sql/patches/20131106.diffphid.2.mig.php
	+++ b/resources/sql/patches/20131106.diffphid.2.mig.php
	@@ -20,7 +20,7 @@
	continue;
	}

	- $type_diff = DifferentialPHIDTypeDiff::TYPECONST;
	+ $type_diff = DifferentialDiffPHIDType::TYPECONST;
	$new_phid = PhabricatorPHID::generateNewPHID($type_diff);

	$sql[] = qsprintf(
	diff --git a/resources/sql/patches/migrate-differential-dependencies.php b/resources/sql/patches/migrate-differential-dependencies.php
	--- a/resources/sql/patches/migrate-differential-dependencies.php
	+++ b/resources/sql/patches/migrate-differential-dependencies.php
	@@ -8,7 +8,7 @@
	$id = $rev->getID();
	echo "Revision {$id}: ";

	- $deps = $rev->getAttachedPHIDs(DifferentialPHIDTypeRevision::TYPECONST);
	+ $deps = $rev->getAttachedPHIDs(DifferentialRevisionPHIDType::TYPECONST);
	if (!$deps) {
	echo "-\n";
	continue;
	diff --git a/resources/sql/patches/migrate-maniphest-dependencies.php b/resources/sql/patches/migrate-maniphest-dependencies.php
	--- a/resources/sql/patches/migrate-maniphest-dependencies.php
	+++ b/resources/sql/patches/migrate-maniphest-dependencies.php
	@@ -8,7 +8,7 @@
	$id = $task->getID();
	echo "Task {$id}: ";

	- $deps = $task->getAttachedPHIDs(ManiphestPHIDTypeTask::TYPECONST);
	+ $deps = $task->getAttachedPHIDs(ManiphestTaskPHIDType::TYPECONST);
	if (!$deps) {
	echo "-\n";
	continue;
	diff --git a/resources/sql/patches/migrate-maniphest-revisions.php b/resources/sql/patches/migrate-maniphest-revisions.php
	--- a/resources/sql/patches/migrate-maniphest-revisions.php
	+++ b/resources/sql/patches/migrate-maniphest-revisions.php
	@@ -8,7 +8,7 @@
	$id = $task->getID();
	echo "Task {$id}: ";

	- $revs = $task->getAttachedPHIDs(DifferentialPHIDTypeRevision::TYPECONST);
	+ $revs = $task->getAttachedPHIDs(DifferentialRevisionPHIDType::TYPECONST);
	if (!$revs) {
	echo "-\n";
	continue;
	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
	@@ -374,6 +374,7 @@
	'DifferentialDependsOnField' => 'applications/differential/customfield/DifferentialDependsOnField.php',
	'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
	'DifferentialDiffCreateController' => 'applications/differential/controller/DifferentialDiffCreateController.php',
	+ 'DifferentialDiffPHIDType' => 'applications/differential/phid/DifferentialDiffPHIDType.php',
	'DifferentialDiffProperty' => 'applications/differential/storage/DifferentialDiffProperty.php',
	'DifferentialDiffQuery' => 'applications/differential/query/DifferentialDiffQuery.php',
	'DifferentialDiffTableOfContentsView' => 'applications/differential/view/DifferentialDiffTableOfContentsView.php',
	@@ -412,8 +413,6 @@
	'DifferentialLocalCommitsView' => 'applications/differential/view/DifferentialLocalCommitsView.php',
	'DifferentialMail' => 'applications/differential/mail/DifferentialMail.php',
	'DifferentialManiphestTasksField' => 'applications/differential/customfield/DifferentialManiphestTasksField.php',
	- 'DifferentialPHIDTypeDiff' => 'applications/differential/phid/DifferentialPHIDTypeDiff.php',
	- 'DifferentialPHIDTypeRevision' => 'applications/differential/phid/DifferentialPHIDTypeRevision.php',
	'DifferentialParseCacheGarbageCollector' => 'applications/differential/garbagecollector/DifferentialParseCacheGarbageCollector.php',
	'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
	'DifferentialPathField' => 'applications/differential/customfield/DifferentialPathField.php',
	@@ -444,6 +443,7 @@
	'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php',
	'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php',
	'DifferentialRevisionMailReceiver' => 'applications/differential/mail/DifferentialRevisionMailReceiver.php',
	+ 'DifferentialRevisionPHIDType' => 'applications/differential/phid/DifferentialRevisionPHIDType.php',
	'DifferentialRevisionQuery' => 'applications/differential/query/DifferentialRevisionQuery.php',
	'DifferentialRevisionSearchEngine' => 'applications/differential/query/DifferentialRevisionSearchEngine.php',
	'DifferentialRevisionStatus' => 'applications/differential/constants/DifferentialRevisionStatus.php',
	@@ -603,6 +603,7 @@
	'DivinerAtomCache' => 'applications/diviner/cache/DivinerAtomCache.php',
	'DivinerAtomController' => 'applications/diviner/controller/DivinerAtomController.php',
	'DivinerAtomListController' => 'applications/diviner/controller/DivinerAtomListController.php',
	+ 'DivinerAtomPHIDType' => 'applications/diviner/phid/DivinerAtomPHIDType.php',
	'DivinerAtomQuery' => 'applications/diviner/query/DivinerAtomQuery.php',
	'DivinerAtomRef' => 'applications/diviner/atom/DivinerAtomRef.php',
	'DivinerAtomSearchEngine' => 'applications/diviner/query/DivinerAtomSearchEngine.php',
	@@ -610,6 +611,7 @@
	'DivinerAtomizer' => 'applications/diviner/atomizer/DivinerAtomizer.php',
	'DivinerBookController' => 'applications/diviner/controller/DivinerBookController.php',
	'DivinerBookItemView' => 'applications/diviner/view/DivinerBookItemView.php',
	+ 'DivinerBookPHIDType' => 'applications/diviner/phid/DivinerBookPHIDType.php',
	'DivinerBookQuery' => 'applications/diviner/query/DivinerBookQuery.php',
	'DivinerController' => 'applications/diviner/controller/DivinerController.php',
	'DivinerDAO' => 'applications/diviner/storage/DivinerDAO.php',
	@@ -623,8 +625,6 @@
	'DivinerLivePublisher' => 'applications/diviner/publisher/DivinerLivePublisher.php',
	'DivinerLiveSymbol' => 'applications/diviner/storage/DivinerLiveSymbol.php',
	'DivinerMainController' => 'applications/diviner/controller/DivinerMainController.php',
	- 'DivinerPHIDTypeAtom' => 'applications/diviner/phid/DivinerPHIDTypeAtom.php',
	- 'DivinerPHIDTypeBook' => 'applications/diviner/phid/DivinerPHIDTypeBook.php',
	'DivinerPHPAtomizer' => 'applications/diviner/atomizer/DivinerPHPAtomizer.php',
	'DivinerParameterTableView' => 'applications/diviner/view/DivinerParameterTableView.php',
	'DivinerPublishCache' => 'applications/diviner/cache/DivinerPublishCache.php',
	@@ -663,6 +663,7 @@
	'DrydockBlueprintEditor' => 'applications/drydock/editor/DrydockBlueprintEditor.php',
	'DrydockBlueprintImplementation' => 'applications/drydock/blueprint/DrydockBlueprintImplementation.php',
	'DrydockBlueprintListController' => 'applications/drydock/controller/DrydockBlueprintListController.php',
	+ 'DrydockBlueprintPHIDType' => 'applications/drydock/phid/DrydockBlueprintPHIDType.php',
	'DrydockBlueprintQuery' => 'applications/drydock/query/DrydockBlueprintQuery.php',
	'DrydockBlueprintScopeGuard' => 'applications/drydock/util/DrydockBlueprintScopeGuard.php',
	'DrydockBlueprintSearchEngine' => 'applications/drydock/query/DrydockBlueprintSearchEngine.php',
	@@ -683,6 +684,7 @@
	'DrydockLeaseController' => 'applications/drydock/controller/DrydockLeaseController.php',
	'DrydockLeaseListController' => 'applications/drydock/controller/DrydockLeaseListController.php',
	'DrydockLeaseListView' => 'applications/drydock/view/DrydockLeaseListView.php',
	+ 'DrydockLeasePHIDType' => 'applications/drydock/phid/DrydockLeasePHIDType.php',
	'DrydockLeaseQuery' => 'applications/drydock/query/DrydockLeaseQuery.php',
	'DrydockLeaseReleaseController' => 'applications/drydock/controller/DrydockLeaseReleaseController.php',
	'DrydockLeaseSearchEngine' => 'applications/drydock/query/DrydockLeaseSearchEngine.php',
	@@ -701,9 +703,6 @@
	'DrydockManagementLeaseWorkflow' => 'applications/drydock/management/DrydockManagementLeaseWorkflow.php',
	'DrydockManagementReleaseWorkflow' => 'applications/drydock/management/DrydockManagementReleaseWorkflow.php',
	'DrydockManagementWorkflow' => 'applications/drydock/management/DrydockManagementWorkflow.php',
	- 'DrydockPHIDTypeBlueprint' => 'applications/drydock/phid/DrydockPHIDTypeBlueprint.php',
	- 'DrydockPHIDTypeLease' => 'applications/drydock/phid/DrydockPHIDTypeLease.php',
	- 'DrydockPHIDTypeResource' => 'applications/drydock/phid/DrydockPHIDTypeResource.php',
	'DrydockPreallocatedHostBlueprintImplementation' => 'applications/drydock/blueprint/DrydockPreallocatedHostBlueprintImplementation.php',
	'DrydockQuery' => 'applications/drydock/query/DrydockQuery.php',
	'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
	@@ -711,6 +710,7 @@
	'DrydockResourceController' => 'applications/drydock/controller/DrydockResourceController.php',
	'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
	'DrydockResourceListView' => 'applications/drydock/view/DrydockResourceListView.php',
	+ 'DrydockResourcePHIDType' => 'applications/drydock/phid/DrydockResourcePHIDType.php',
	'DrydockResourceQuery' => 'applications/drydock/query/DrydockResourceQuery.php',
	'DrydockResourceSearchEngine' => 'applications/drydock/query/DrydockResourceSearchEngine.php',
	'DrydockResourceStatus' => 'applications/drydock/constants/DrydockResourceStatus.php',
	@@ -732,14 +732,18 @@
	'HarbormasterBuildCommand' => 'applications/harbormaster/storage/HarbormasterBuildCommand.php',
	'HarbormasterBuildEngine' => 'applications/harbormaster/engine/HarbormasterBuildEngine.php',
	'HarbormasterBuildItem' => 'applications/harbormaster/storage/build/HarbormasterBuildItem.php',
	+ 'HarbormasterBuildItemPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php',
	'HarbormasterBuildItemQuery' => 'applications/harbormaster/query/HarbormasterBuildItemQuery.php',
	'HarbormasterBuildLog' => 'applications/harbormaster/storage/build/HarbormasterBuildLog.php',
	+ 'HarbormasterBuildLogPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php',
	'HarbormasterBuildLogQuery' => 'applications/harbormaster/query/HarbormasterBuildLogQuery.php',
	'HarbormasterBuildMessage' => 'applications/harbormaster/storage/HarbormasterBuildMessage.php',
	'HarbormasterBuildMessageQuery' => 'applications/harbormaster/query/HarbormasterBuildMessageQuery.php',
	+ 'HarbormasterBuildPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPHIDType.php',
	'HarbormasterBuildPlan' => 'applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php',
	'HarbormasterBuildPlanDatasource' => 'applications/harbormaster/typeahead/HarbormasterBuildPlanDatasource.php',
	'HarbormasterBuildPlanEditor' => 'applications/harbormaster/editor/HarbormasterBuildPlanEditor.php',
	+ 'HarbormasterBuildPlanPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php',
	'HarbormasterBuildPlanQuery' => 'applications/harbormaster/query/HarbormasterBuildPlanQuery.php',
	'HarbormasterBuildPlanSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildPlanSearchEngine.php',
	'HarbormasterBuildPlanTransaction' => 'applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php',
	@@ -751,10 +755,12 @@
	'HarbormasterBuildStepCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCustomField.php',
	'HarbormasterBuildStepEditor' => 'applications/harbormaster/editor/HarbormasterBuildStepEditor.php',
	'HarbormasterBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterBuildStepImplementation.php',
	+ 'HarbormasterBuildStepPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php',
	'HarbormasterBuildStepQuery' => 'applications/harbormaster/query/HarbormasterBuildStepQuery.php',
	'HarbormasterBuildStepTransaction' => 'applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php',
	'HarbormasterBuildStepTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildStepTransactionQuery.php',
	'HarbormasterBuildTarget' => 'applications/harbormaster/storage/build/HarbormasterBuildTarget.php',
	+ 'HarbormasterBuildTargetPHIDType' => 'applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php',
	'HarbormasterBuildTargetQuery' => 'applications/harbormaster/query/HarbormasterBuildTargetQuery.php',
	'HarbormasterBuildTransaction' => 'applications/harbormaster/storage/HarbormasterBuildTransaction.php',
	'HarbormasterBuildTransactionEditor' => 'applications/harbormaster/editor/HarbormasterBuildTransactionEditor.php',
	@@ -765,6 +771,7 @@
	'HarbormasterBuildableActionController' => 'applications/harbormaster/controller/HarbormasterBuildableActionController.php',
	'HarbormasterBuildableInterface' => 'applications/harbormaster/interface/HarbormasterBuildableInterface.php',
	'HarbormasterBuildableListController' => 'applications/harbormaster/controller/HarbormasterBuildableListController.php',
	+ 'HarbormasterBuildablePHIDType' => 'applications/harbormaster/phid/HarbormasterBuildablePHIDType.php',
	'HarbormasterBuildableQuery' => 'applications/harbormaster/query/HarbormasterBuildableQuery.php',
	'HarbormasterBuildableSearchEngine' => 'applications/harbormaster/query/HarbormasterBuildableSearchEngine.php',
	'HarbormasterBuildableTransaction' => 'applications/harbormaster/storage/HarbormasterBuildableTransaction.php',
	@@ -781,13 +788,6 @@
	'HarbormasterManagementUpdateWorkflow' => 'applications/harbormaster/management/HarbormasterManagementUpdateWorkflow.php',
	'HarbormasterManagementWorkflow' => 'applications/harbormaster/management/HarbormasterManagementWorkflow.php',
	'HarbormasterObject' => 'applications/harbormaster/storage/HarbormasterObject.php',
	- 'HarbormasterPHIDTypeBuild' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuild.php',
	- 'HarbormasterPHIDTypeBuildItem' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildItem.php',
	- 'HarbormasterPHIDTypeBuildLog' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildLog.php',
	- 'HarbormasterPHIDTypeBuildPlan' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildPlan.php',
	- 'HarbormasterPHIDTypeBuildStep' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildStep.php',
	- 'HarbormasterPHIDTypeBuildTarget' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildTarget.php',
	- 'HarbormasterPHIDTypeBuildable' => 'applications/harbormaster/phid/HarbormasterPHIDTypeBuildable.php',
	'HarbormasterPlanController' => 'applications/harbormaster/controller/HarbormasterPlanController.php',
	'HarbormasterPlanDisableController' => 'applications/harbormaster/controller/HarbormasterPlanDisableController.php',
	'HarbormasterPlanEditController' => 'applications/harbormaster/controller/HarbormasterPlanEditController.php',
	@@ -829,7 +829,6 @@
	'HeraldManiphestTaskAdapter' => 'applications/herald/adapter/HeraldManiphestTaskAdapter.php',
	'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
	'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
	- 'HeraldPHIDTypeRule' => 'applications/herald/phid/HeraldPHIDTypeRule.php',
	'HeraldPholioMockAdapter' => 'applications/herald/adapter/HeraldPholioMockAdapter.php',
	'HeraldPreCommitAdapter' => 'applications/diffusion/herald/HeraldPreCommitAdapter.php',
	'HeraldPreCommitContentAdapter' => 'applications/diffusion/herald/HeraldPreCommitContentAdapter.php',
	@@ -844,6 +843,7 @@
	'HeraldRuleEditHistoryView' => 'applications/herald/view/HeraldRuleEditHistoryView.php',
	'HeraldRuleEditor' => 'applications/herald/editor/HeraldRuleEditor.php',
	'HeraldRuleListController' => 'applications/herald/controller/HeraldRuleListController.php',
	+ 'HeraldRulePHIDType' => 'applications/herald/phid/HeraldRulePHIDType.php',
	'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
	'HeraldRuleSearchEngine' => 'applications/herald/query/HeraldRuleSearchEngine.php',
	'HeraldRuleTransaction' => 'applications/herald/storage/HeraldRuleTransaction.php',
	@@ -936,7 +936,6 @@
	'ManiphestHovercardEventListener' => 'applications/maniphest/event/ManiphestHovercardEventListener.php',
	'ManiphestNameIndex' => 'applications/maniphest/storage/ManiphestNameIndex.php',
	'ManiphestNameIndexEventListener' => 'applications/maniphest/event/ManiphestNameIndexEventListener.php',
	- 'ManiphestPHIDTypeTask' => 'applications/maniphest/phid/ManiphestPHIDTypeTask.php',
	'ManiphestRemarkupRule' => 'applications/maniphest/remarkup/ManiphestRemarkupRule.php',
	'ManiphestReplyHandler' => 'applications/maniphest/mail/ManiphestReplyHandler.php',
	'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php',
	@@ -954,6 +953,7 @@
	'ManiphestTaskListView' => 'applications/maniphest/view/ManiphestTaskListView.php',
	'ManiphestTaskMailReceiver' => 'applications/maniphest/mail/ManiphestTaskMailReceiver.php',
	'ManiphestTaskOwner' => 'applications/maniphest/constants/ManiphestTaskOwner.php',
	+ 'ManiphestTaskPHIDType' => 'applications/maniphest/phid/ManiphestTaskPHIDType.php',
	'ManiphestTaskPriority' => 'applications/maniphest/constants/ManiphestTaskPriority.php',
	'ManiphestTaskPriorityDatasource' => 'applications/maniphest/typeahead/ManiphestTaskPriorityDatasource.php',
	'ManiphestTaskQuery' => 'applications/maniphest/query/ManiphestTaskQuery.php',
	@@ -983,21 +983,19 @@
	'NuanceItem' => 'applications/nuance/storage/NuanceItem.php',
	'NuanceItemEditController' => 'applications/nuance/controller/NuanceItemEditController.php',
	'NuanceItemEditor' => 'applications/nuance/editor/NuanceItemEditor.php',
	+ 'NuanceItemPHIDType' => 'applications/nuance/phid/NuanceItemPHIDType.php',
	'NuanceItemQuery' => 'applications/nuance/query/NuanceItemQuery.php',
	'NuanceItemTransaction' => 'applications/nuance/storage/NuanceItemTransaction.php',
	'NuanceItemTransactionComment' => 'applications/nuance/storage/NuanceItemTransactionComment.php',
	'NuanceItemTransactionQuery' => 'applications/nuance/query/NuanceItemTransactionQuery.php',
	'NuanceItemViewController' => 'applications/nuance/controller/NuanceItemViewController.php',
	- 'NuancePHIDTypeItem' => 'applications/nuance/phid/NuancePHIDTypeItem.php',
	- 'NuancePHIDTypeQueue' => 'applications/nuance/phid/NuancePHIDTypeQueue.php',
	- 'NuancePHIDTypeRequestor' => 'applications/nuance/phid/NuancePHIDTypeRequestor.php',
	- 'NuancePHIDTypeSource' => 'applications/nuance/phid/NuancePHIDTypeSource.php',
	'NuancePhabricatorFormSourceDefinition' => 'applications/nuance/source/NuancePhabricatorFormSourceDefinition.php',
	'NuanceQuery' => 'applications/nuance/query/NuanceQuery.php',
	'NuanceQueue' => 'applications/nuance/storage/NuanceQueue.php',
	'NuanceQueueEditController' => 'applications/nuance/controller/NuanceQueueEditController.php',
	'NuanceQueueEditor' => 'applications/nuance/editor/NuanceQueueEditor.php',
	'NuanceQueueItem' => 'applications/nuance/storage/NuanceQueueItem.php',
	+ 'NuanceQueuePHIDType' => 'applications/nuance/phid/NuanceQueuePHIDType.php',
	'NuanceQueueQuery' => 'applications/nuance/query/NuanceQueueQuery.php',
	'NuanceQueueTransaction' => 'applications/nuance/storage/NuanceQueueTransaction.php',
	'NuanceQueueTransactionComment' => 'applications/nuance/storage/NuanceQueueTransactionComment.php',
	@@ -1006,6 +1004,7 @@
	'NuanceRequestor' => 'applications/nuance/storage/NuanceRequestor.php',
	'NuanceRequestorEditController' => 'applications/nuance/controller/NuanceRequestorEditController.php',
	'NuanceRequestorEditor' => 'applications/nuance/editor/NuanceRequestorEditor.php',
	+ 'NuanceRequestorPHIDType' => 'applications/nuance/phid/NuanceRequestorPHIDType.php',
	'NuanceRequestorQuery' => 'applications/nuance/query/NuanceRequestorQuery.php',
	'NuanceRequestorSource' => 'applications/nuance/storage/NuanceRequestorSource.php',
	'NuanceRequestorTransaction' => 'applications/nuance/storage/NuanceRequestorTransaction.php',
	@@ -1016,6 +1015,7 @@
	'NuanceSourceDefinition' => 'applications/nuance/source/NuanceSourceDefinition.php',
	'NuanceSourceEditController' => 'applications/nuance/controller/NuanceSourceEditController.php',
	'NuanceSourceEditor' => 'applications/nuance/editor/NuanceSourceEditor.php',
	+ 'NuanceSourcePHIDType' => 'applications/nuance/phid/NuanceSourcePHIDType.php',
	'NuanceSourceQuery' => 'applications/nuance/query/NuanceSourceQuery.php',
	'NuanceSourceTransaction' => 'applications/nuance/storage/NuanceSourceTransaction.php',
	'NuanceSourceTransactionComment' => 'applications/nuance/storage/NuanceSourceTransactionComment.php',
	@@ -1092,6 +1092,7 @@
	'PassphraseCredentialEditController' => 'applications/passphrase/controller/PassphraseCredentialEditController.php',
	'PassphraseCredentialListController' => 'applications/passphrase/controller/PassphraseCredentialListController.php',
	'PassphraseCredentialLockController' => 'applications/passphrase/controller/PassphraseCredentialLockController.php',
	+ 'PassphraseCredentialPHIDType' => 'applications/passphrase/phid/PassphraseCredentialPHIDType.php',
	'PassphraseCredentialPublicController' => 'applications/passphrase/controller/PassphraseCredentialPublicController.php',
	'PassphraseCredentialQuery' => 'applications/passphrase/query/PassphraseCredentialQuery.php',
	'PassphraseCredentialRevealController' => 'applications/passphrase/controller/PassphraseCredentialRevealController.php',
	@@ -1107,7 +1108,6 @@
	'PassphraseCredentialTypeSSHPrivateKeyText' => 'applications/passphrase/credentialtype/PassphraseCredentialTypeSSHPrivateKeyText.php',
	'PassphraseCredentialViewController' => 'applications/passphrase/controller/PassphraseCredentialViewController.php',
	'PassphraseDAO' => 'applications/passphrase/storage/PassphraseDAO.php',
	- 'PassphrasePHIDTypeCredential' => 'applications/passphrase/phid/PassphrasePHIDTypeCredential.php',
	'PassphrasePasswordKey' => 'applications/passphrase/keys/PassphrasePasswordKey.php',
	'PassphraseRemarkupRule' => 'applications/passphrase/remarkup/PassphraseRemarkupRule.php',
	'PassphraseSSHKey' => 'applications/passphrase/keys/PassphraseSSHKey.php',
	@@ -1140,12 +1140,12 @@
	'PhabricatorAphrontViewTestCase' => 'view/__tests__/PhabricatorAphrontViewTestCase.php',
	'PhabricatorAppSearchEngine' => 'applications/meta/query/PhabricatorAppSearchEngine.php',
	'PhabricatorApplication' => 'applications/base/PhabricatorApplication.php',
	+ 'PhabricatorApplicationApplicationPHIDType' => 'applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php',
	'PhabricatorApplicationConfigOptions' => 'applications/config/option/PhabricatorApplicationConfigOptions.php',
	'PhabricatorApplicationDatasource' => 'applications/meta/typeahead/PhabricatorApplicationDatasource.php',
	'PhabricatorApplicationDetailViewController' => 'applications/meta/controller/PhabricatorApplicationDetailViewController.php',
	'PhabricatorApplicationEditController' => 'applications/meta/controller/PhabricatorApplicationEditController.php',
	'PhabricatorApplicationLaunchView' => 'applications/meta/view/PhabricatorApplicationLaunchView.php',
	- 'PhabricatorApplicationPHIDTypeApplication' => 'applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php',
	'PhabricatorApplicationQuery' => 'applications/meta/query/PhabricatorApplicationQuery.php',
	'PhabricatorApplicationSearchController' => 'applications/search/controller/PhabricatorApplicationSearchController.php',
	'PhabricatorApplicationSearchEngine' => 'applications/search/engine/PhabricatorApplicationSearchEngine.php',
	@@ -1167,11 +1167,11 @@
	'PhabricatorApplicationTransactionInterface' => 'applications/transactions/interface/PhabricatorApplicationTransactionInterface.php',
	'PhabricatorApplicationTransactionNoEffectException' => 'applications/transactions/exception/PhabricatorApplicationTransactionNoEffectException.php',
	'PhabricatorApplicationTransactionNoEffectResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionNoEffectResponse.php',
	- 'PhabricatorApplicationTransactionPHIDTypeTransaction' => 'applications/transactions/phid/PhabricatorApplicationTransactionPHIDTypeTransaction.php',
	'PhabricatorApplicationTransactionQuery' => 'applications/transactions/query/PhabricatorApplicationTransactionQuery.php',
	'PhabricatorApplicationTransactionResponse' => 'applications/transactions/response/PhabricatorApplicationTransactionResponse.php',
	'PhabricatorApplicationTransactionStructureException' => 'applications/transactions/exception/PhabricatorApplicationTransactionStructureException.php',
	'PhabricatorApplicationTransactionTextDiffDetailView' => 'applications/transactions/view/PhabricatorApplicationTransactionTextDiffDetailView.php',
	+ 'PhabricatorApplicationTransactionTransactionPHIDType' => 'applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php',
	'PhabricatorApplicationTransactionValidationError' => 'applications/transactions/error/PhabricatorApplicationTransactionValidationError.php',
	'PhabricatorApplicationTransactionValidationException' => 'applications/transactions/exception/PhabricatorApplicationTransactionValidationException.php',
	'PhabricatorApplicationTransactionValueController' => 'applications/transactions/controller/PhabricatorApplicationTransactionValueController.php',
	@@ -1201,6 +1201,7 @@
	'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
	'PhabricatorAuthAccountView' => 'applications/auth/view/PhabricatorAuthAccountView.php',
	'PhabricatorAuthApplication' => 'applications/auth/application/PhabricatorAuthApplication.php',
	+ 'PhabricatorAuthAuthFactorPHIDType' => 'applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php',
	'PhabricatorAuthConfirmLinkController' => 'applications/auth/controller/PhabricatorAuthConfirmLinkController.php',
	'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
	'PhabricatorAuthDAO' => 'applications/auth/storage/PhabricatorAuthDAO.php',
	@@ -1228,7 +1229,6 @@
	'PhabricatorAuthNewController' => 'applications/auth/controller/config/PhabricatorAuthNewController.php',
	'PhabricatorAuthOldOAuthRedirectController' => 'applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php',
	'PhabricatorAuthOneTimeLoginController' => 'applications/auth/controller/PhabricatorAuthOneTimeLoginController.php',
	- 'PhabricatorAuthPHIDTypeAuthFactor' => 'applications/auth/phid/PhabricatorAuthPHIDTypeAuthFactor.php',
	'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
	'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
	'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
	@@ -1290,12 +1290,12 @@
	'PhabricatorCalendarEventEditController' => 'applications/calendar/controller/PhabricatorCalendarEventEditController.php',
	'PhabricatorCalendarEventInvalidEpochException' => 'applications/calendar/exception/PhabricatorCalendarEventInvalidEpochException.php',
	'PhabricatorCalendarEventListController' => 'applications/calendar/controller/PhabricatorCalendarEventListController.php',
	+ 'PhabricatorCalendarEventPHIDType' => 'applications/calendar/phid/PhabricatorCalendarEventPHIDType.php',
	'PhabricatorCalendarEventQuery' => 'applications/calendar/query/PhabricatorCalendarEventQuery.php',
	'PhabricatorCalendarEventSearchEngine' => 'applications/calendar/query/PhabricatorCalendarEventSearchEngine.php',
	'PhabricatorCalendarEventViewController' => 'applications/calendar/controller/PhabricatorCalendarEventViewController.php',
	'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
	'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
	- 'PhabricatorCalendarPHIDTypeEvent' => 'applications/calendar/phid/PhabricatorCalendarPHIDTypeEvent.php',
	'PhabricatorCalendarViewController' => 'applications/calendar/controller/PhabricatorCalendarViewController.php',
	'PhabricatorCampfireProtocolAdapter' => 'infrastructure/daemon/bot/adapter/PhabricatorCampfireProtocolAdapter.php',
	'PhabricatorChangeParserTestCase' => 'applications/repository/worker/__tests__/PhabricatorChangeParserTestCase.php',
	@@ -1333,6 +1333,7 @@
	'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php',
	'PhabricatorConfigAllController' => 'applications/config/controller/PhabricatorConfigAllController.php',
	'PhabricatorConfigApplication' => 'applications/config/application/PhabricatorConfigApplication.php',
	+ 'PhabricatorConfigConfigPHIDType' => 'applications/config/phid/PhabricatorConfigConfigPHIDType.php',
	'PhabricatorConfigController' => 'applications/config/controller/PhabricatorConfigController.php',
	'PhabricatorConfigDatabaseSource' => 'infrastructure/env/PhabricatorConfigDatabaseSource.php',
	'PhabricatorConfigDefaultSource' => 'infrastructure/env/PhabricatorConfigDefaultSource.php',
	@@ -1358,7 +1359,6 @@
	'PhabricatorConfigManagementWorkflow' => 'applications/config/management/PhabricatorConfigManagementWorkflow.php',
	'PhabricatorConfigOption' => 'applications/config/option/PhabricatorConfigOption.php',
	'PhabricatorConfigOptionType' => 'applications/config/custom/PhabricatorConfigOptionType.php',
	- 'PhabricatorConfigPHIDTypeConfig' => 'applications/config/phid/PhabricatorConfigPHIDTypeConfig.php',
	'PhabricatorConfigProxySource' => 'infrastructure/env/PhabricatorConfigProxySource.php',
	'PhabricatorConfigResponse' => 'applications/config/response/PhabricatorConfigResponse.php',
	'PhabricatorConfigSource' => 'infrastructure/env/PhabricatorConfigSource.php',
	@@ -1368,7 +1368,7 @@
	'PhabricatorConfigValidationException' => 'applications/config/exception/PhabricatorConfigValidationException.php',
	'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php',
	'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php',
	- 'PhabricatorConpherencePHIDTypeThread' => 'applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php',
	+ 'PhabricatorConpherenceThreadPHIDType' => 'applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php',
	'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
	'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
	'PhabricatorController' => 'applications/base/controller/PhabricatorController.php',
	@@ -1378,11 +1378,11 @@
	'PhabricatorCountdownApplication' => 'applications/countdown/application/PhabricatorCountdownApplication.php',
	'PhabricatorCountdownCapabilityDefaultView' => 'applications/countdown/capability/PhabricatorCountdownCapabilityDefaultView.php',
	'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
	+ 'PhabricatorCountdownCountdownPHIDType' => 'applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php',
	'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
	'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
	'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
	'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
	- 'PhabricatorCountdownPHIDTypeCountdown' => 'applications/countdown/phid/PhabricatorCountdownPHIDTypeCountdown.php',
	'PhabricatorCountdownQuery' => 'applications/countdown/query/PhabricatorCountdownQuery.php',
	'PhabricatorCountdownRemarkupRule' => 'applications/countdown/remarkup/PhabricatorCountdownRemarkupRule.php',
	'PhabricatorCountdownSearchEngine' => 'applications/countdown/query/PhabricatorCountdownSearchEngine.php',
	@@ -1439,6 +1439,7 @@
	'PhabricatorDashboardController' => 'applications/dashboard/controller/PhabricatorDashboardController.php',
	'PhabricatorDashboardCopyController' => 'applications/dashboard/controller/PhabricatorDashboardCopyController.php',
	'PhabricatorDashboardDAO' => 'applications/dashboard/storage/PhabricatorDashboardDAO.php',
	+ 'PhabricatorDashboardDashboardPHIDType' => 'applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php',
	'PhabricatorDashboardEditController' => 'applications/dashboard/controller/PhabricatorDashboardEditController.php',
	'PhabricatorDashboardHistoryController' => 'applications/dashboard/controller/PhabricatorDashboardHistoryController.php',
	'PhabricatorDashboardInstall' => 'applications/dashboard/storage/PhabricatorDashboardInstall.php',
	@@ -1447,14 +1448,13 @@
	'PhabricatorDashboardListController' => 'applications/dashboard/controller/PhabricatorDashboardListController.php',
	'PhabricatorDashboardManageController' => 'applications/dashboard/controller/PhabricatorDashboardManageController.php',
	'PhabricatorDashboardMovePanelController' => 'applications/dashboard/controller/PhabricatorDashboardMovePanelController.php',
	- 'PhabricatorDashboardPHIDTypeDashboard' => 'applications/dashboard/phid/PhabricatorDashboardPHIDTypeDashboard.php',
	- 'PhabricatorDashboardPHIDTypePanel' => 'applications/dashboard/phid/PhabricatorDashboardPHIDTypePanel.php',
	'PhabricatorDashboardPanel' => 'applications/dashboard/storage/PhabricatorDashboardPanel.php',
	'PhabricatorDashboardPanelArchiveController' => 'applications/dashboard/controller/PhabricatorDashboardPanelArchiveController.php',
	'PhabricatorDashboardPanelCoreCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelCoreCustomField.php',
	'PhabricatorDashboardPanelCustomField' => 'applications/dashboard/customfield/PhabricatorDashboardPanelCustomField.php',
	'PhabricatorDashboardPanelEditController' => 'applications/dashboard/controller/PhabricatorDashboardPanelEditController.php',
	'PhabricatorDashboardPanelListController' => 'applications/dashboard/controller/PhabricatorDashboardPanelListController.php',
	+ 'PhabricatorDashboardPanelPHIDType' => 'applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php',
	'PhabricatorDashboardPanelQuery' => 'applications/dashboard/query/PhabricatorDashboardPanelQuery.php',
	'PhabricatorDashboardPanelRenderController' => 'applications/dashboard/controller/PhabricatorDashboardPanelRenderController.php',
	'PhabricatorDashboardPanelRenderingEngine' => 'applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php',
	@@ -1584,12 +1584,12 @@
	'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
	'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
	'PhabricatorFileEditor' => 'applications/files/editor/PhabricatorFileEditor.php',
	+ 'PhabricatorFileFilePHIDType' => 'applications/files/phid/PhabricatorFileFilePHIDType.php',
	'PhabricatorFileImageMacro' => 'applications/macro/storage/PhabricatorFileImageMacro.php',
	'PhabricatorFileInfoController' => 'applications/files/controller/PhabricatorFileInfoController.php',
	'PhabricatorFileLinkListView' => 'view/layout/PhabricatorFileLinkListView.php',
	'PhabricatorFileLinkView' => 'view/layout/PhabricatorFileLinkView.php',
	'PhabricatorFileListController' => 'applications/files/controller/PhabricatorFileListController.php',
	- 'PhabricatorFilePHIDTypeFile' => 'applications/files/phid/PhabricatorFilePHIDTypeFile.php',
	'PhabricatorFileQuery' => 'applications/files/query/PhabricatorFileQuery.php',
	'PhabricatorFileSearchEngine' => 'applications/files/query/PhabricatorFileSearchEngine.php',
	'PhabricatorFileShortcutController' => 'applications/files/controller/PhabricatorFileShortcutController.php',
	@@ -1675,7 +1675,7 @@
	'PhabricatorLegacyEdgeType' => 'infrastructure/edges/type/PhabricatorLegacyEdgeType.php',
	'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php',
	'PhabricatorLegalpadConfigOptions' => 'applications/legalpad/config/PhabricatorLegalpadConfigOptions.php',
	- 'PhabricatorLegalpadPHIDTypeDocument' => 'applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php',
	+ 'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php',
	'PhabricatorLipsumArtist' => 'applications/lipsum/image/PhabricatorLipsumArtist.php',
	'PhabricatorLipsumGenerateWorkflow' => 'applications/lipsum/management/PhabricatorLipsumGenerateWorkflow.php',
	'PhabricatorLipsumManagementWorkflow' => 'applications/lipsum/management/PhabricatorLipsumManagementWorkflow.php',
	@@ -1695,10 +1695,10 @@
	'PhabricatorMacroEditController' => 'applications/macro/controller/PhabricatorMacroEditController.php',
	'PhabricatorMacroEditor' => 'applications/macro/editor/PhabricatorMacroEditor.php',
	'PhabricatorMacroListController' => 'applications/macro/controller/PhabricatorMacroListController.php',
	+ 'PhabricatorMacroMacroPHIDType' => 'applications/macro/phid/PhabricatorMacroMacroPHIDType.php',
	'PhabricatorMacroMailReceiver' => 'applications/macro/mail/PhabricatorMacroMailReceiver.php',
	'PhabricatorMacroMemeController' => 'applications/macro/controller/PhabricatorMacroMemeController.php',
	'PhabricatorMacroMemeDialogController' => 'applications/macro/controller/PhabricatorMacroMemeDialogController.php',
	- 'PhabricatorMacroPHIDTypeMacro' => 'applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php',
	'PhabricatorMacroQuery' => 'applications/macro/query/PhabricatorMacroQuery.php',
	'PhabricatorMacroReplyHandler' => 'applications/macro/mail/PhabricatorMacroReplyHandler.php',
	'PhabricatorMacroSearchEngine' => 'applications/macro/query/PhabricatorMacroSearchEngine.php',
	@@ -1728,7 +1728,7 @@
	'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
	'PhabricatorMailgunConfigOptions' => 'applications/config/option/PhabricatorMailgunConfigOptions.php',
	'PhabricatorMailingListDatasource' => 'applications/mailinglists/typeahead/PhabricatorMailingListDatasource.php',
	- 'PhabricatorMailingListPHIDTypeList' => 'applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php',
	+ 'PhabricatorMailingListListPHIDType' => 'applications/mailinglists/phid/PhabricatorMailingListListPHIDType.php',
	'PhabricatorMailingListQuery' => 'applications/mailinglists/query/PhabricatorMailingListQuery.php',
	'PhabricatorMailingListSearchEngine' => 'applications/mailinglists/query/PhabricatorMailingListSearchEngine.php',
	'PhabricatorMailingListsApplication' => 'applications/mailinglists/application/PhabricatorMailingListsApplication.php',
	@@ -1813,12 +1813,12 @@
	'PhabricatorOAuthServerAuthorizationsSettingsPanel' => 'applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php',
	'PhabricatorOAuthServerCapabilityCreateClients' => 'applications/oauthserver/capability/PhabricatorOAuthServerCapabilityCreateClients.php',
	'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
	+ 'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php',
	+ 'PhabricatorOAuthServerClientPHIDType' => 'applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php',
	'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
	'PhabricatorOAuthServerClientSearchEngine' => 'applications/oauthserver/query/PhabricatorOAuthServerClientSearchEngine.php',
	'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
	'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
	- 'PhabricatorOAuthServerPHIDTypeClient' => 'applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClient.php',
	- 'PhabricatorOAuthServerPHIDTypeClientAuthorization' => 'applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClientAuthorization.php',
	'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
	'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
	'PhabricatorOAuthServerTestController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTestController.php',
	@@ -1843,9 +1843,9 @@
	'PhabricatorOwnersEditController' => 'applications/owners/controller/PhabricatorOwnersEditController.php',
	'PhabricatorOwnersListController' => 'applications/owners/controller/PhabricatorOwnersListController.php',
	'PhabricatorOwnersOwner' => 'applications/owners/storage/PhabricatorOwnersOwner.php',
	- 'PhabricatorOwnersPHIDTypePackage' => 'applications/owners/phid/PhabricatorOwnersPHIDTypePackage.php',
	'PhabricatorOwnersPackage' => 'applications/owners/storage/PhabricatorOwnersPackage.php',
	'PhabricatorOwnersPackageDatasource' => 'applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php',
	+ 'PhabricatorOwnersPackagePHIDType' => 'applications/owners/phid/PhabricatorOwnersPackagePHIDType.php',
	'PhabricatorOwnersPackagePathValidator' => 'applications/repository/worker/commitchangeparser/PhabricatorOwnersPackagePathValidator.php',
	'PhabricatorOwnersPackageQuery' => 'applications/owners/query/PhabricatorOwnersPackageQuery.php',
	'PhabricatorOwnersPackageTestCase' => 'applications/owners/storage/__tests__/PhabricatorOwnersPackageTestCase.php',
	@@ -1872,7 +1872,7 @@
	'PhabricatorPasteEditController' => 'applications/paste/controller/PhabricatorPasteEditController.php',
	'PhabricatorPasteEditor' => 'applications/paste/editor/PhabricatorPasteEditor.php',
	'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php',
	- 'PhabricatorPastePHIDTypePaste' => 'applications/paste/phid/PhabricatorPastePHIDTypePaste.php',
	+ 'PhabricatorPastePastePHIDType' => 'applications/paste/phid/PhabricatorPastePastePHIDType.php',
	'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php',
	'PhabricatorPasteRemarkupRule' => 'applications/paste/remarkup/PhabricatorPasteRemarkupRule.php',
	'PhabricatorPasteSearchEngine' => 'applications/paste/query/PhabricatorPasteSearchEngine.php',
	@@ -1890,6 +1890,7 @@
	'PhabricatorPeopleDeleteController' => 'applications/people/controller/PhabricatorPeopleDeleteController.php',
	'PhabricatorPeopleDisableController' => 'applications/people/controller/PhabricatorPeopleDisableController.php',
	'PhabricatorPeopleEmpowerController' => 'applications/people/controller/PhabricatorPeopleEmpowerController.php',
	+ 'PhabricatorPeopleExternalPHIDType' => 'applications/people/phid/PhabricatorPeopleExternalPHIDType.php',
	'PhabricatorPeopleHovercardEventListener' => 'applications/people/event/PhabricatorPeopleHovercardEventListener.php',
	'PhabricatorPeopleLdapController' => 'applications/people/controller/PhabricatorPeopleLdapController.php',
	'PhabricatorPeopleListController' => 'applications/people/controller/PhabricatorPeopleListController.php',
	@@ -1897,8 +1898,6 @@
	'PhabricatorPeopleLogSearchEngine' => 'applications/people/query/PhabricatorPeopleLogSearchEngine.php',
	'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
	'PhabricatorPeopleNewController' => 'applications/people/controller/PhabricatorPeopleNewController.php',
	- 'PhabricatorPeoplePHIDTypeExternal' => 'applications/people/phid/PhabricatorPeoplePHIDTypeExternal.php',
	- 'PhabricatorPeoplePHIDTypeUser' => 'applications/people/phid/PhabricatorPeoplePHIDTypeUser.php',
	'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
	'PhabricatorPeopleProfileEditController' => 'applications/people/controller/PhabricatorPeopleProfileEditController.php',
	'PhabricatorPeopleProfilePictureController' => 'applications/people/controller/PhabricatorPeopleProfilePictureController.php',
	@@ -1906,12 +1905,13 @@
	'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
	'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
	'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
	+ 'PhabricatorPeopleUserPHIDType' => 'applications/people/phid/PhabricatorPeopleUserPHIDType.php',
	'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php',
	'PhabricatorPersonaAuthProvider' => 'applications/auth/provider/PhabricatorPersonaAuthProvider.php',
	'PhabricatorPhameApplication' => 'applications/phame/application/PhabricatorPhameApplication.php',
	+ 'PhabricatorPhameBlogPHIDType' => 'applications/phame/phid/PhabricatorPhameBlogPHIDType.php',
	'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
	- 'PhabricatorPhamePHIDTypeBlog' => 'applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php',
	- 'PhabricatorPhamePHIDTypePost' => 'applications/phame/phid/PhabricatorPhamePHIDTypePost.php',
	+ 'PhabricatorPhamePostPHIDType' => 'applications/phame/phid/PhabricatorPhamePostPHIDType.php',
	'PhabricatorPhluxApplication' => 'applications/phlux/application/PhabricatorPhluxApplication.php',
	'PhabricatorPholioApplication' => 'applications/pholio/application/PhabricatorPholioApplication.php',
	'PhabricatorPholioConfigOptions' => 'applications/pholio/config/PhabricatorPholioConfigOptions.php',
	@@ -1967,6 +1967,7 @@
	'PhabricatorProjectBoardViewController' => 'applications/project/controller/PhabricatorProjectBoardViewController.php',
	'PhabricatorProjectColumn' => 'applications/project/storage/PhabricatorProjectColumn.php',
	'PhabricatorProjectColumnDetailController' => 'applications/project/controller/PhabricatorProjectColumnDetailController.php',
	+ 'PhabricatorProjectColumnPHIDType' => 'applications/project/phid/PhabricatorProjectColumnPHIDType.php',
	'PhabricatorProjectColumnQuery' => 'applications/project/query/PhabricatorProjectColumnQuery.php',
	'PhabricatorProjectColumnTransaction' => 'applications/project/storage/PhabricatorProjectColumnTransaction.php',
	'PhabricatorProjectColumnTransactionEditor' => 'applications/project/editor/PhabricatorProjectColumnTransactionEditor.php',
	@@ -1997,10 +1998,9 @@
	'PhabricatorProjectNameCollisionException' => 'applications/project/exception/PhabricatorProjectNameCollisionException.php',
	'PhabricatorProjectObjectHasProjectEdgeType' => 'applications/project/edge/PhabricatorProjectObjectHasProjectEdgeType.php',
	'PhabricatorProjectOrUserDatasource' => 'applications/project/typeahead/PhabricatorProjectOrUserDatasource.php',
	- 'PhabricatorProjectPHIDTypeColumn' => 'applications/project/phid/PhabricatorProjectPHIDTypeColumn.php',
	- 'PhabricatorProjectPHIDTypeProject' => 'applications/project/phid/PhabricatorProjectPHIDTypeProject.php',
	'PhabricatorProjectProfileController' => 'applications/project/controller/PhabricatorProjectProfileController.php',
	'PhabricatorProjectProjectHasObjectEdgeType' => 'applications/project/edge/PhabricatorProjectProjectHasObjectEdgeType.php',
	+ 'PhabricatorProjectProjectPHIDType' => 'applications/project/phid/PhabricatorProjectProjectPHIDType.php',
	'PhabricatorProjectQuery' => 'applications/project/query/PhabricatorProjectQuery.php',
	'PhabricatorProjectSearchEngine' => 'applications/project/query/PhabricatorProjectSearchEngine.php',
	'PhabricatorProjectSearchIndexer' => 'applications/project/search/PhabricatorProjectSearchIndexer.php',
	@@ -2040,6 +2040,7 @@
	'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php',
	'PhabricatorRepositoryArcanistProjectDeleteController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectDeleteController.php',
	'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectEditController.php',
	+ 'PhabricatorRepositoryArcanistProjectPHIDType' => 'applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php',
	'PhabricatorRepositoryArcanistProjectQuery' => 'applications/repository/query/PhabricatorRepositoryArcanistProjectQuery.php',
	'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php',
	'PhabricatorRepositoryBranch' => 'applications/repository/storage/PhabricatorRepositoryBranch.php',
	@@ -2049,6 +2050,7 @@
	'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php',
	'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php',
	+ 'PhabricatorRepositoryCommitPHIDType' => 'applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php',
	'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php',
	'PhabricatorRepositoryCommitRef' => 'applications/repository/engine/PhabricatorRepositoryCommitRef.php',
	'PhabricatorRepositoryCommitSearchIndexer' => 'applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php',
	@@ -2080,19 +2082,16 @@
	'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php',
	'PhabricatorRepositoryMirror' => 'applications/repository/storage/PhabricatorRepositoryMirror.php',
	'PhabricatorRepositoryMirrorEngine' => 'applications/repository/engine/PhabricatorRepositoryMirrorEngine.php',
	+ 'PhabricatorRepositoryMirrorPHIDType' => 'applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php',
	'PhabricatorRepositoryMirrorQuery' => 'applications/repository/query/PhabricatorRepositoryMirrorQuery.php',
	- 'PhabricatorRepositoryPHIDTypeArcanistProject' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php',
	- 'PhabricatorRepositoryPHIDTypeCommit' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php',
	- 'PhabricatorRepositoryPHIDTypeMirror' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php',
	- 'PhabricatorRepositoryPHIDTypePushEvent' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypePushEvent.php',
	- 'PhabricatorRepositoryPHIDTypePushLog' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypePushLog.php',
	- 'PhabricatorRepositoryPHIDTypeRepository' => 'applications/repository/phid/PhabricatorRepositoryPHIDTypeRepository.php',
	'PhabricatorRepositoryParsedChange' => 'applications/repository/data/PhabricatorRepositoryParsedChange.php',
	'PhabricatorRepositoryPullEngine' => 'applications/repository/engine/PhabricatorRepositoryPullEngine.php',
	'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php',
	'PhabricatorRepositoryPushEvent' => 'applications/repository/storage/PhabricatorRepositoryPushEvent.php',
	+ 'PhabricatorRepositoryPushEventPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php',
	'PhabricatorRepositoryPushEventQuery' => 'applications/repository/query/PhabricatorRepositoryPushEventQuery.php',
	'PhabricatorRepositoryPushLog' => 'applications/repository/storage/PhabricatorRepositoryPushLog.php',
	+ 'PhabricatorRepositoryPushLogPHIDType' => 'applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php',
	'PhabricatorRepositoryPushLogQuery' => 'applications/repository/query/PhabricatorRepositoryPushLogQuery.php',
	'PhabricatorRepositoryPushLogSearchEngine' => 'applications/repository/query/PhabricatorRepositoryPushLogSearchEngine.php',
	'PhabricatorRepositoryPushMailWorker' => 'applications/repository/worker/PhabricatorRepositoryPushMailWorker.php',
	@@ -2101,6 +2100,7 @@
	'PhabricatorRepositoryRefCursor' => 'applications/repository/storage/PhabricatorRepositoryRefCursor.php',
	'PhabricatorRepositoryRefCursorQuery' => 'applications/repository/query/PhabricatorRepositoryRefCursorQuery.php',
	'PhabricatorRepositoryRefEngine' => 'applications/repository/engine/PhabricatorRepositoryRefEngine.php',
	+ 'PhabricatorRepositoryRepositoryPHIDType' => 'applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php',
	'PhabricatorRepositorySearchEngine' => 'applications/repository/query/PhabricatorRepositorySearchEngine.php',
	'PhabricatorRepositoryStatusMessage' => 'applications/repository/storage/PhabricatorRepositoryStatusMessage.php',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php',
	@@ -2228,9 +2228,9 @@
	'PhabricatorSlowvoteEditor' => 'applications/slowvote/editor/PhabricatorSlowvoteEditor.php',
	'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
	'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/PhabricatorSlowvoteOption.php',
	- 'PhabricatorSlowvotePHIDTypePoll' => 'applications/slowvote/phid/PhabricatorSlowvotePHIDTypePoll.php',
	'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/PhabricatorSlowvotePoll.php',
	'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/PhabricatorSlowvotePollController.php',
	+ 'PhabricatorSlowvotePollPHIDType' => 'applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php',
	'PhabricatorSlowvoteQuery' => 'applications/slowvote/query/PhabricatorSlowvoteQuery.php',
	'PhabricatorSlowvoteSearchEngine' => 'applications/slowvote/query/PhabricatorSlowvoteSearchEngine.php',
	'PhabricatorSlowvoteTransaction' => 'applications/slowvote/storage/PhabricatorSlowvoteTransaction.php',
	@@ -2313,10 +2313,10 @@
	'PhabricatorTokenGivenFeedStory' => 'applications/tokens/feed/PhabricatorTokenGivenFeedStory.php',
	'PhabricatorTokenGivenQuery' => 'applications/tokens/query/PhabricatorTokenGivenQuery.php',
	'PhabricatorTokenLeaderController' => 'applications/tokens/controller/PhabricatorTokenLeaderController.php',
	- 'PhabricatorTokenPHIDTypeToken' => 'applications/tokens/phid/PhabricatorTokenPHIDTypeToken.php',
	'PhabricatorTokenQuery' => 'applications/tokens/query/PhabricatorTokenQuery.php',
	'PhabricatorTokenReceiverInterface' => 'applications/tokens/interface/PhabricatorTokenReceiverInterface.php',
	'PhabricatorTokenReceiverQuery' => 'applications/tokens/query/PhabricatorTokenReceiverQuery.php',
	+ 'PhabricatorTokenTokenPHIDType' => 'applications/tokens/phid/PhabricatorTokenTokenPHIDType.php',
	'PhabricatorTokenUIEventListener' => 'applications/tokens/event/PhabricatorTokenUIEventListener.php',
	'PhabricatorTokensApplication' => 'applications/tokens/application/PhabricatorTokensApplication.php',
	'PhabricatorTransactionView' => 'view/layout/PhabricatorTransactionView.php',
	@@ -2445,11 +2445,11 @@
	'PhluxDAO' => 'applications/phlux/storage/PhluxDAO.php',
	'PhluxEditController' => 'applications/phlux/controller/PhluxEditController.php',
	'PhluxListController' => 'applications/phlux/controller/PhluxListController.php',
	- 'PhluxPHIDTypeVariable' => 'applications/phlux/phid/PhluxPHIDTypeVariable.php',
	'PhluxTransaction' => 'applications/phlux/storage/PhluxTransaction.php',
	'PhluxTransactionQuery' => 'applications/phlux/query/PhluxTransactionQuery.php',
	'PhluxVariable' => 'applications/phlux/storage/PhluxVariable.php',
	'PhluxVariableEditor' => 'applications/phlux/editor/PhluxVariableEditor.php',
	+ 'PhluxVariablePHIDType' => 'applications/phlux/phid/PhluxVariablePHIDType.php',
	'PhluxVariableQuery' => 'applications/phlux/query/PhluxVariableQuery.php',
	'PhluxViewController' => 'applications/phlux/controller/PhluxViewController.php',
	'PholioActionMenuEventListener' => 'applications/pholio/event/PholioActionMenuEventListener.php',
	@@ -2459,6 +2459,7 @@
	'PholioController' => 'applications/pholio/controller/PholioController.php',
	'PholioDAO' => 'applications/pholio/storage/PholioDAO.php',
	'PholioImage' => 'applications/pholio/storage/PholioImage.php',
	+ 'PholioImagePHIDType' => 'applications/pholio/phid/PholioImagePHIDType.php',
	'PholioImageQuery' => 'applications/pholio/query/PholioImageQuery.php',
	'PholioImageUploadController' => 'applications/pholio/controller/PholioImageUploadController.php',
	'PholioInlineController' => 'applications/pholio/controller/PholioInlineController.php',
	@@ -2472,12 +2473,11 @@
	'PholioMockImagesView' => 'applications/pholio/view/PholioMockImagesView.php',
	'PholioMockListController' => 'applications/pholio/controller/PholioMockListController.php',
	'PholioMockMailReceiver' => 'applications/pholio/mail/PholioMockMailReceiver.php',
	+ 'PholioMockPHIDType' => 'applications/pholio/phid/PholioMockPHIDType.php',
	'PholioMockQuery' => 'applications/pholio/query/PholioMockQuery.php',
	'PholioMockSearchEngine' => 'applications/pholio/query/PholioMockSearchEngine.php',
	'PholioMockThumbGridView' => 'applications/pholio/view/PholioMockThumbGridView.php',
	'PholioMockViewController' => 'applications/pholio/controller/PholioMockViewController.php',
	- 'PholioPHIDTypeImage' => 'applications/pholio/phid/PholioPHIDTypeImage.php',
	- 'PholioPHIDTypeMock' => 'applications/pholio/phid/PholioPHIDTypeMock.php',
	'PholioRemarkupRule' => 'applications/pholio/remarkup/PholioRemarkupRule.php',
	'PholioReplyHandler' => 'applications/pholio/mail/PholioReplyHandler.php',
	'PholioSearchIndexer' => 'applications/pholio/search/PholioSearchIndexer.php',
	@@ -2543,13 +2543,12 @@
	'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
	'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
	'PhragmentFragment' => 'applications/phragment/storage/PhragmentFragment.php',
	+ 'PhragmentFragmentPHIDType' => 'applications/phragment/phid/PhragmentFragmentPHIDType.php',
	'PhragmentFragmentQuery' => 'applications/phragment/query/PhragmentFragmentQuery.php',
	'PhragmentFragmentVersion' => 'applications/phragment/storage/PhragmentFragmentVersion.php',
	+ 'PhragmentFragmentVersionPHIDType' => 'applications/phragment/phid/PhragmentFragmentVersionPHIDType.php',
	'PhragmentFragmentVersionQuery' => 'applications/phragment/query/PhragmentFragmentVersionQuery.php',
	'PhragmentHistoryController' => 'applications/phragment/controller/PhragmentHistoryController.php',
	- 'PhragmentPHIDTypeFragment' => 'applications/phragment/phid/PhragmentPHIDTypeFragment.php',
	- 'PhragmentPHIDTypeFragmentVersion' => 'applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php',
	- 'PhragmentPHIDTypeSnapshot' => 'applications/phragment/phid/PhragmentPHIDTypeSnapshot.php',
	'PhragmentPatchController' => 'applications/phragment/controller/PhragmentPatchController.php',
	'PhragmentPatchUtil' => 'applications/phragment/util/PhragmentPatchUtil.php',
	'PhragmentPolicyController' => 'applications/phragment/controller/PhragmentPolicyController.php',
	@@ -2559,6 +2558,7 @@
	'PhragmentSnapshotChildQuery' => 'applications/phragment/query/PhragmentSnapshotChildQuery.php',
	'PhragmentSnapshotCreateController' => 'applications/phragment/controller/PhragmentSnapshotCreateController.php',
	'PhragmentSnapshotDeleteController' => 'applications/phragment/controller/PhragmentSnapshotDeleteController.php',
	+ 'PhragmentSnapshotPHIDType' => 'applications/phragment/phid/PhragmentSnapshotPHIDType.php',
	'PhragmentSnapshotPromoteController' => 'applications/phragment/controller/PhragmentSnapshotPromoteController.php',
	'PhragmentSnapshotQuery' => 'applications/phragment/query/PhragmentSnapshotQuery.php',
	'PhragmentSnapshotViewController' => 'applications/phragment/controller/PhragmentSnapshotViewController.php',
	@@ -2590,6 +2590,7 @@
	'PhrictionDocument' => 'applications/phriction/storage/PhrictionDocument.php',
	'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
	'PhrictionDocumentEditor' => 'applications/phriction/editor/PhrictionDocumentEditor.php',
	+ 'PhrictionDocumentPHIDType' => 'applications/phriction/phid/PhrictionDocumentPHIDType.php',
	'PhrictionDocumentPreviewController' => 'applications/phriction/controller/PhrictionDocumentPreviewController.php',
	'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
	'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
	@@ -2599,7 +2600,6 @@
	'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
	'PhrictionMoveController' => 'applications/phriction/controller/PhrictionMoveController.php',
	'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php',
	- 'PhrictionPHIDTypeDocument' => 'applications/phriction/phid/PhrictionPHIDTypeDocument.php',
	'PhrictionRemarkupRule' => 'applications/phriction/remarkup/PhrictionRemarkupRule.php',
	'PhrictionSearchEngine' => 'applications/phriction/query/PhrictionSearchEngine.php',
	'PhrictionSearchIndexer' => 'applications/phriction/search/PhrictionSearchIndexer.php',
	@@ -2609,6 +2609,7 @@
	'PonderAnswerEditController' => 'applications/ponder/controller/PonderAnswerEditController.php',
	'PonderAnswerEditor' => 'applications/ponder/editor/PonderAnswerEditor.php',
	'PonderAnswerHistoryController' => 'applications/ponder/controller/PonderAnswerHistoryController.php',
	+ 'PonderAnswerPHIDType' => 'applications/ponder/phid/PonderAnswerPHIDType.php',
	'PonderAnswerQuery' => 'applications/ponder/query/PonderAnswerQuery.php',
	'PonderAnswerSaveController' => 'applications/ponder/controller/PonderAnswerSaveController.php',
	'PonderAnswerTransaction' => 'applications/ponder/storage/PonderAnswerTransaction.php',
	@@ -2620,8 +2621,6 @@
	'PonderController' => 'applications/ponder/controller/PonderController.php',
	'PonderDAO' => 'applications/ponder/storage/PonderDAO.php',
	'PonderEditor' => 'applications/ponder/editor/PonderEditor.php',
	- 'PonderPHIDTypeAnswer' => 'applications/ponder/phid/PonderPHIDTypeAnswer.php',
	- 'PonderPHIDTypeQuestion' => 'applications/ponder/phid/PonderPHIDTypeQuestion.php',
	'PonderQuestion' => 'applications/ponder/storage/PonderQuestion.php',
	'PonderQuestionCommentController' => 'applications/ponder/controller/PonderQuestionCommentController.php',
	'PonderQuestionEditController' => 'applications/ponder/controller/PonderQuestionEditController.php',
	@@ -2629,6 +2628,7 @@
	'PonderQuestionHistoryController' => 'applications/ponder/controller/PonderQuestionHistoryController.php',
	'PonderQuestionListController' => 'applications/ponder/controller/PonderQuestionListController.php',
	'PonderQuestionMailReceiver' => 'applications/ponder/mail/PonderQuestionMailReceiver.php',
	+ 'PonderQuestionPHIDType' => 'applications/ponder/phid/PonderQuestionPHIDType.php',
	'PonderQuestionQuery' => 'applications/ponder/query/PonderQuestionQuery.php',
	'PonderQuestionReplyHandler' => 'applications/ponder/mail/PonderQuestionReplyHandler.php',
	'PonderQuestionSearchEngine' => 'applications/ponder/query/PonderQuestionSearchEngine.php',
	@@ -2660,6 +2660,7 @@
	'ReleephBranchEditor' => 'applications/releeph/editor/ReleephBranchEditor.php',
	'ReleephBranchHistoryController' => 'applications/releeph/controller/branch/ReleephBranchHistoryController.php',
	'ReleephBranchNamePreviewController' => 'applications/releeph/controller/branch/ReleephBranchNamePreviewController.php',
	+ 'ReleephBranchPHIDType' => 'applications/releeph/phid/ReleephBranchPHIDType.php',
	'ReleephBranchPreviewView' => 'applications/releeph/view/branch/ReleephBranchPreviewView.php',
	'ReleephBranchQuery' => 'applications/releeph/query/ReleephBranchQuery.php',
	'ReleephBranchSearchEngine' => 'applications/releeph/query/ReleephBranchSearchEngine.php',
	@@ -2683,9 +2684,6 @@
	'ReleephIntentFieldSpecification' => 'applications/releeph/field/specification/ReleephIntentFieldSpecification.php',
	'ReleephLevelFieldSpecification' => 'applications/releeph/field/specification/ReleephLevelFieldSpecification.php',
	'ReleephOriginalCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephOriginalCommitFieldSpecification.php',
	- 'ReleephPHIDTypeBranch' => 'applications/releeph/phid/ReleephPHIDTypeBranch.php',
	- 'ReleephPHIDTypeProduct' => 'applications/releeph/phid/ReleephPHIDTypeProduct.php',
	- 'ReleephPHIDTypeRequest' => 'applications/releeph/phid/ReleephPHIDTypeRequest.php',
	'ReleephProductActionController' => 'applications/releeph/controller/product/ReleephProductActionController.php',
	'ReleephProductController' => 'applications/releeph/controller/product/ReleephProductController.php',
	'ReleephProductCreateController' => 'applications/releeph/controller/product/ReleephProductCreateController.php',
	@@ -2693,6 +2691,7 @@
	'ReleephProductEditor' => 'applications/releeph/editor/ReleephProductEditor.php',
	'ReleephProductHistoryController' => 'applications/releeph/controller/product/ReleephProductHistoryController.php',
	'ReleephProductListController' => 'applications/releeph/controller/product/ReleephProductListController.php',
	+ 'ReleephProductPHIDType' => 'applications/releeph/phid/ReleephProductPHIDType.php',
	'ReleephProductQuery' => 'applications/releeph/query/ReleephProductQuery.php',
	'ReleephProductSearchEngine' => 'applications/releeph/query/ReleephProductSearchEngine.php',
	'ReleephProductTransaction' => 'applications/releeph/storage/ReleephProductTransaction.php',
	@@ -2707,6 +2706,7 @@
	'ReleephRequestDifferentialCreateController' => 'applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php',
	'ReleephRequestEditController' => 'applications/releeph/controller/request/ReleephRequestEditController.php',
	'ReleephRequestMailReceiver' => 'applications/releeph/mail/ReleephRequestMailReceiver.php',
	+ 'ReleephRequestPHIDType' => 'applications/releeph/phid/ReleephRequestPHIDType.php',
	'ReleephRequestQuery' => 'applications/releeph/query/ReleephRequestQuery.php',
	'ReleephRequestReplyHandler' => 'applications/releeph/mail/ReleephRequestReplyHandler.php',
	'ReleephRequestSearchEngine' => 'applications/releeph/query/ReleephRequestSearchEngine.php',
	@@ -3103,6 +3103,7 @@
	'PhabricatorDestructibleInterface',
	),
	'DifferentialDiffCreateController' => 'DifferentialController',
	+ 'DifferentialDiffPHIDType' => 'PhabricatorPHIDType',
	'DifferentialDiffProperty' => 'DifferentialDAO',
	'DifferentialDiffQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialDiffTableOfContentsView' => 'AphrontView',
	@@ -3140,8 +3141,6 @@
	'DifferentialLocalCommitsView' => 'AphrontView',
	'DifferentialMail' => 'PhabricatorMail',
	'DifferentialManiphestTasksField' => 'DifferentialCoreCustomField',
	- 'DifferentialPHIDTypeDiff' => 'PhabricatorPHIDType',
	- 'DifferentialPHIDTypeRevision' => 'PhabricatorPHIDType',
	'DifferentialParseCacheGarbageCollector' => 'PhabricatorGarbageCollector',
	'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
	'DifferentialPathField' => 'DifferentialCustomField',
	@@ -3179,6 +3178,7 @@
	'DifferentialRevisionListController' => 'DifferentialController',
	'DifferentialRevisionListView' => 'AphrontView',
	'DifferentialRevisionMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'DifferentialRevisionPHIDType' => 'PhabricatorPHIDType',
	'DifferentialRevisionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DifferentialRevisionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	@@ -3321,11 +3321,13 @@
	'DivinerAtomCache' => 'DivinerDiskCache',
	'DivinerAtomController' => 'DivinerController',
	'DivinerAtomListController' => 'DivinerController',
	+ 'DivinerAtomPHIDType' => 'PhabricatorPHIDType',
	'DivinerAtomQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DivinerAtomSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DivinerAtomizeWorkflow' => 'DivinerWorkflow',
	'DivinerBookController' => 'DivinerController',
	'DivinerBookItemView' => 'AphrontTagView',
	+ 'DivinerBookPHIDType' => 'PhabricatorPHIDType',
	'DivinerBookQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DivinerController' => 'PhabricatorController',
	'DivinerDAO' => 'PhabricatorLiskDAO',
	@@ -3345,8 +3347,6 @@
	'PhabricatorMarkupInterface',
	),
	'DivinerMainController' => 'DivinerController',
	- 'DivinerPHIDTypeAtom' => 'PhabricatorPHIDType',
	- 'DivinerPHIDTypeBook' => 'PhabricatorPHIDType',
	'DivinerPHPAtomizer' => 'DivinerAtomizer',
	'DivinerParameterTableView' => 'AphrontTagView',
	'DivinerPublishCache' => 'DivinerDiskCache',
	@@ -3387,6 +3387,7 @@
	'DrydockBlueprintEditController' => 'DrydockBlueprintController',
	'DrydockBlueprintEditor' => 'PhabricatorApplicationTransactionEditor',
	'DrydockBlueprintListController' => 'DrydockBlueprintController',
	+ 'DrydockBlueprintPHIDType' => 'PhabricatorPHIDType',
	'DrydockBlueprintQuery' => 'DrydockQuery',
	'DrydockBlueprintSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockBlueprintTransaction' => 'PhabricatorApplicationTransaction',
	@@ -3407,6 +3408,7 @@
	'DrydockLeaseController' => 'DrydockController',
	'DrydockLeaseListController' => 'DrydockLeaseController',
	'DrydockLeaseListView' => 'AphrontView',
	+ 'DrydockLeasePHIDType' => 'PhabricatorPHIDType',
	'DrydockLeaseQuery' => 'DrydockQuery',
	'DrydockLeaseReleaseController' => 'DrydockLeaseController',
	'DrydockLeaseSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -3428,9 +3430,6 @@
	'DrydockManagementLeaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementReleaseWorkflow' => 'DrydockManagementWorkflow',
	'DrydockManagementWorkflow' => 'PhabricatorManagementWorkflow',
	- 'DrydockPHIDTypeBlueprint' => 'PhabricatorPHIDType',
	- 'DrydockPHIDTypeLease' => 'PhabricatorPHIDType',
	- 'DrydockPHIDTypeResource' => 'PhabricatorPHIDType',
	'DrydockPreallocatedHostBlueprintImplementation' => 'DrydockBlueprintImplementation',
	'DrydockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DrydockResource' => array(
	@@ -3441,6 +3440,7 @@
	'DrydockResourceController' => 'DrydockController',
	'DrydockResourceListController' => 'DrydockResourceController',
	'DrydockResourceListView' => 'AphrontView',
	+ 'DrydockResourcePHIDType' => 'PhabricatorPHIDType',
	'DrydockResourceQuery' => 'DrydockQuery',
	'DrydockResourceSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'DrydockResourceStatus' => 'DrydockConstants',
	@@ -3468,17 +3468,20 @@
	'HarbormasterBuildCommand' => 'HarbormasterDAO',
	'HarbormasterBuildEngine' => 'Phobject',
	'HarbormasterBuildItem' => 'HarbormasterDAO',
	+ 'HarbormasterBuildItemPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildItemQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildLog' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'HarbormasterBuildLogPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildMessage' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	'HarbormasterBuildMessageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'HarbormasterBuildPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildPlan' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	@@ -3486,6 +3489,7 @@
	),
	'HarbormasterBuildPlanDatasource' => 'PhabricatorTypeaheadDatasource',
	'HarbormasterBuildPlanEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'HarbormasterBuildPlanPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildPlanQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildPlanSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HarbormasterBuildPlanTransaction' => 'PhabricatorApplicationTransaction',
	@@ -3503,6 +3507,7 @@
	),
	'HarbormasterBuildStepCustomField' => 'PhabricatorCustomField',
	'HarbormasterBuildStepEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'HarbormasterBuildStepPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildStepQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildStepTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildStepTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	@@ -3510,6 +3515,7 @@
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'HarbormasterBuildTargetPHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildTargetQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildTransaction' => 'PhabricatorApplicationTransaction',
	'HarbormasterBuildTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	@@ -3523,6 +3529,7 @@
	),
	'HarbormasterBuildableActionController' => 'HarbormasterController',
	'HarbormasterBuildableListController' => 'HarbormasterController',
	+ 'HarbormasterBuildablePHIDType' => 'PhabricatorPHIDType',
	'HarbormasterBuildableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HarbormasterBuildableSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HarbormasterBuildableTransaction' => 'PhabricatorApplicationTransaction',
	@@ -3539,13 +3546,6 @@
	'HarbormasterManagementUpdateWorkflow' => 'HarbormasterManagementWorkflow',
	'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'HarbormasterObject' => 'HarbormasterDAO',
	- 'HarbormasterPHIDTypeBuild' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildItem' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildLog' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildPlan' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildStep' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildTarget' => 'PhabricatorPHIDType',
	- 'HarbormasterPHIDTypeBuildable' => 'PhabricatorPHIDType',
	'HarbormasterPlanController' => 'HarbormasterController',
	'HarbormasterPlanDisableController' => 'HarbormasterPlanController',
	'HarbormasterPlanEditController' => 'HarbormasterPlanController',
	@@ -3581,7 +3581,6 @@
	'HeraldInvalidFieldException' => 'Exception',
	'HeraldManiphestTaskAdapter' => 'HeraldAdapter',
	'HeraldNewController' => 'HeraldController',
	- 'HeraldPHIDTypeRule' => 'PhabricatorPHIDType',
	'HeraldPholioMockAdapter' => 'HeraldAdapter',
	'HeraldPreCommitAdapter' => 'HeraldAdapter',
	'HeraldPreCommitContentAdapter' => 'HeraldPreCommitAdapter',
	@@ -3600,6 +3599,7 @@
	'HeraldRuleEditHistoryView' => 'AphrontView',
	'HeraldRuleEditor' => 'PhabricatorApplicationTransactionEditor',
	'HeraldRuleListController' => 'HeraldController',
	+ 'HeraldRulePHIDType' => 'PhabricatorPHIDType',
	'HeraldRuleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'HeraldRuleSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'HeraldRuleTransaction' => 'PhabricatorApplicationTransaction',
	@@ -3702,7 +3702,6 @@
	'ManiphestHovercardEventListener' => 'PhabricatorEventListener',
	'ManiphestNameIndex' => 'ManiphestDAO',
	'ManiphestNameIndexEventListener' => 'PhabricatorEventListener',
	- 'ManiphestPHIDTypeTask' => 'PhabricatorPHIDType',
	'ManiphestRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ManiphestReportController' => 'ManiphestController',
	@@ -3730,6 +3729,7 @@
	'ManiphestTaskListView' => 'ManiphestView',
	'ManiphestTaskMailReceiver' => 'PhabricatorObjectMailReceiver',
	'ManiphestTaskOwner' => 'ManiphestConstants',
	+ 'ManiphestTaskPHIDType' => 'PhabricatorPHIDType',
	'ManiphestTaskPriority' => 'ManiphestConstants',
	'ManiphestTaskPriorityDatasource' => 'PhabricatorTypeaheadDatasource',
	'ManiphestTaskQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	@@ -3760,15 +3760,12 @@
	),
	'NuanceItemEditController' => 'NuanceController',
	'NuanceItemEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'NuanceItemPHIDType' => 'PhabricatorPHIDType',
	'NuanceItemQuery' => 'NuanceQuery',
	'NuanceItemTransaction' => 'NuanceTransaction',
	'NuanceItemTransactionComment' => 'PhabricatorApplicationTransactionComment',
	'NuanceItemTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceItemViewController' => 'NuanceController',
	- 'NuancePHIDTypeItem' => 'PhabricatorPHIDType',
	- 'NuancePHIDTypeQueue' => 'PhabricatorPHIDType',
	- 'NuancePHIDTypeRequestor' => 'PhabricatorPHIDType',
	- 'NuancePHIDTypeSource' => 'PhabricatorPHIDType',
	'NuancePhabricatorFormSourceDefinition' => 'NuanceSourceDefinition',
	'NuanceQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'NuanceQueue' => array(
	@@ -3778,6 +3775,7 @@
	'NuanceQueueEditController' => 'NuanceController',
	'NuanceQueueEditor' => 'PhabricatorApplicationTransactionEditor',
	'NuanceQueueItem' => 'NuanceDAO',
	+ 'NuanceQueuePHIDType' => 'PhabricatorPHIDType',
	'NuanceQueueQuery' => 'NuanceQuery',
	'NuanceQueueTransaction' => 'NuanceTransaction',
	'NuanceQueueTransactionComment' => 'PhabricatorApplicationTransactionComment',
	@@ -3786,6 +3784,7 @@
	'NuanceRequestor' => 'NuanceDAO',
	'NuanceRequestorEditController' => 'NuanceController',
	'NuanceRequestorEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'NuanceRequestorPHIDType' => 'PhabricatorPHIDType',
	'NuanceRequestorQuery' => 'NuanceQuery',
	'NuanceRequestorSource' => 'NuanceDAO',
	'NuanceRequestorTransaction' => 'NuanceTransaction',
	@@ -3799,6 +3798,7 @@
	'NuanceSourceDefinition' => 'Phobject',
	'NuanceSourceEditController' => 'NuanceController',
	'NuanceSourceEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'NuanceSourcePHIDType' => 'PhabricatorPHIDType',
	'NuanceSourceQuery' => 'NuanceQuery',
	'NuanceSourceTransaction' => 'NuanceTransaction',
	'NuanceSourceTransactionComment' => 'PhabricatorApplicationTransactionComment',
	@@ -3877,6 +3877,7 @@
	'PassphraseCredentialEditController' => 'PassphraseController',
	'PassphraseCredentialListController' => 'PassphraseController',
	'PassphraseCredentialLockController' => 'PassphraseController',
	+ 'PassphraseCredentialPHIDType' => 'PhabricatorPHIDType',
	'PassphraseCredentialPublicController' => 'PassphraseController',
	'PassphraseCredentialQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PassphraseCredentialRevealController' => 'PassphraseController',
	@@ -3892,7 +3893,6 @@
	'PassphraseCredentialTypeSSHPrivateKeyText' => 'PassphraseCredentialTypeSSHPrivateKey',
	'PassphraseCredentialViewController' => 'PassphraseController',
	'PassphraseDAO' => 'PhabricatorLiskDAO',
	- 'PassphrasePHIDTypeCredential' => 'PhabricatorPHIDType',
	'PassphrasePasswordKey' => 'PassphraseAbstractKey',
	'PassphraseRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'PassphraseSSHKey' => 'PassphraseAbstractKey',
	@@ -3924,12 +3924,12 @@
	'PhabricatorAphrontViewTestCase' => 'PhabricatorTestCase',
	'PhabricatorAppSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorApplication' => 'PhabricatorPolicyInterface',
	+ 'PhabricatorApplicationApplicationPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorApplicationConfigOptions' => 'Phobject',
	'PhabricatorApplicationDatasource' => 'PhabricatorTypeaheadDatasource',
	'PhabricatorApplicationDetailViewController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationEditController' => 'PhabricatorApplicationsController',
	'PhabricatorApplicationLaunchView' => 'AphrontTagView',
	- 'PhabricatorApplicationPHIDTypeApplication' => 'PhabricatorPHIDType',
	'PhabricatorApplicationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorApplicationSearchController' => 'PhabricatorSearchBaseController',
	'PhabricatorApplicationStatusView' => 'AphrontView',
	@@ -3957,11 +3957,11 @@
	'PhabricatorApplicationTransactionFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorApplicationTransactionNoEffectException' => 'Exception',
	'PhabricatorApplicationTransactionNoEffectResponse' => 'AphrontProxyResponse',
	- 'PhabricatorApplicationTransactionPHIDTypeTransaction' => 'PhabricatorPHIDType',
	'PhabricatorApplicationTransactionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorApplicationTransactionResponse' => 'AphrontProxyResponse',
	'PhabricatorApplicationTransactionStructureException' => 'Exception',
	'PhabricatorApplicationTransactionTextDiffDetailView' => 'AphrontView',
	+ 'PhabricatorApplicationTransactionTransactionPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorApplicationTransactionValidationError' => 'Phobject',
	'PhabricatorApplicationTransactionValidationException' => 'Exception',
	'PhabricatorApplicationTransactionValueController' => 'PhabricatorApplicationTransactionController',
	@@ -3994,6 +3994,7 @@
	'PhabricatorAuditReplyHandler' => 'PhabricatorMailReplyHandler',
	'PhabricatorAuthAccountView' => 'AphrontView',
	'PhabricatorAuthApplication' => 'PhabricatorApplication',
	+ 'PhabricatorAuthAuthFactorPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorAuthConfirmLinkController' => 'PhabricatorAuthController',
	'PhabricatorAuthController' => 'PhabricatorController',
	'PhabricatorAuthDAO' => 'PhabricatorLiskDAO',
	@@ -4020,7 +4021,6 @@
	'PhabricatorAuthNewController' => 'PhabricatorAuthProviderConfigController',
	'PhabricatorAuthOldOAuthRedirectController' => 'PhabricatorAuthController',
	'PhabricatorAuthOneTimeLoginController' => 'PhabricatorAuthController',
	- 'PhabricatorAuthPHIDTypeAuthFactor' => 'PhabricatorPHIDType',
	'PhabricatorAuthProviderConfig' => array(
	'PhabricatorAuthDAO',
	'PhabricatorPolicyInterface',
	@@ -4088,12 +4088,12 @@
	'PhabricatorCalendarEventEditController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarEventInvalidEpochException' => 'Exception',
	'PhabricatorCalendarEventListController' => 'PhabricatorCalendarController',
	+ 'PhabricatorCalendarEventPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorCalendarEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorCalendarEventSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorCalendarEventViewController' => 'PhabricatorCalendarController',
	'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
	'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
	- 'PhabricatorCalendarPHIDTypeEvent' => 'PhabricatorPHIDType',
	'PhabricatorCalendarViewController' => 'PhabricatorCalendarController',
	'PhabricatorCampfireProtocolAdapter' => 'PhabricatorBotBaseStreamingProtocolAdapter',
	'PhabricatorChangeParserTestCase' => 'PhabricatorWorkingCopyTestCase',
	@@ -4139,6 +4139,7 @@
	'PhabricatorConduitTokenController' => 'PhabricatorConduitController',
	'PhabricatorConfigAllController' => 'PhabricatorConfigController',
	'PhabricatorConfigApplication' => 'PhabricatorApplication',
	+ 'PhabricatorConfigConfigPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorConfigController' => 'PhabricatorController',
	'PhabricatorConfigDatabaseSource' => 'PhabricatorConfigProxySource',
	'PhabricatorConfigDefaultSource' => 'PhabricatorConfigProxySource',
	@@ -4168,7 +4169,6 @@
	'Phobject',
	'PhabricatorMarkupInterface',
	),
	- 'PhabricatorConfigPHIDTypeConfig' => 'PhabricatorPHIDType',
	'PhabricatorConfigProxySource' => 'PhabricatorConfigSource',
	'PhabricatorConfigResponse' => 'AphrontHTMLResponse',
	'PhabricatorConfigStackSource' => 'PhabricatorConfigSource',
	@@ -4177,7 +4177,7 @@
	'PhabricatorConfigValidationException' => 'Exception',
	'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController',
	'PhabricatorConpherenceApplication' => 'PhabricatorApplication',
	- 'PhabricatorConpherencePHIDTypeThread' => 'PhabricatorPHIDType',
	+ 'PhabricatorConpherenceThreadPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorContentSourceView' => 'AphrontView',
	'PhabricatorController' => 'AphrontController',
	'PhabricatorCookies' => 'Phobject',
	@@ -4189,11 +4189,11 @@
	'PhabricatorCountdownApplication' => 'PhabricatorApplication',
	'PhabricatorCountdownCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	'PhabricatorCountdownController' => 'PhabricatorController',
	+ 'PhabricatorCountdownCountdownPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorCountdownDAO' => 'PhabricatorLiskDAO',
	'PhabricatorCountdownDeleteController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownEditController' => 'PhabricatorCountdownController',
	'PhabricatorCountdownListController' => 'PhabricatorCountdownController',
	- 'PhabricatorCountdownPHIDTypeCountdown' => 'PhabricatorPHIDType',
	'PhabricatorCountdownQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorCountdownRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'PhabricatorCountdownSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -4252,6 +4252,7 @@
	'PhabricatorDashboardController' => 'PhabricatorController',
	'PhabricatorDashboardCopyController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardDAO' => 'PhabricatorLiskDAO',
	+ 'PhabricatorDashboardDashboardPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorDashboardEditController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardHistoryController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardInstall' => 'PhabricatorDashboardDAO',
	@@ -4259,8 +4260,6 @@
	'PhabricatorDashboardListController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardManageController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardMovePanelController' => 'PhabricatorDashboardController',
	- 'PhabricatorDashboardPHIDTypeDashboard' => 'PhabricatorPHIDType',
	- 'PhabricatorDashboardPHIDTypePanel' => 'PhabricatorPHIDType',
	'PhabricatorDashboardPanel' => array(
	'PhabricatorDashboardDAO',
	'PhabricatorPolicyInterface',
	@@ -4274,6 +4273,7 @@
	'PhabricatorDashboardPanelCustomField' => 'PhabricatorCustomField',
	'PhabricatorDashboardPanelEditController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelListController' => 'PhabricatorDashboardController',
	+ 'PhabricatorDashboardPanelPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorDashboardPanelQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorDashboardPanelRenderController' => 'PhabricatorDashboardController',
	'PhabricatorDashboardPanelRenderingEngine' => 'Phobject',
	@@ -4401,6 +4401,7 @@
	'PhabricatorFileDeleteController' => 'PhabricatorFileController',
	'PhabricatorFileDropUploadController' => 'PhabricatorFileController',
	'PhabricatorFileEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'PhabricatorFileFilePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorFileImageMacro' => array(
	'PhabricatorFileDAO',
	'PhabricatorSubscribableInterface',
	@@ -4412,7 +4413,6 @@
	'PhabricatorFileLinkListView' => 'AphrontView',
	'PhabricatorFileLinkView' => 'AphrontView',
	'PhabricatorFileListController' => 'PhabricatorFileController',
	- 'PhabricatorFilePHIDTypeFile' => 'PhabricatorPHIDType',
	'PhabricatorFileQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorFileSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorFileShortcutController' => 'PhabricatorFileController',
	@@ -4494,7 +4494,7 @@
	'PhabricatorLegacyEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorLegalpadApplication' => 'PhabricatorApplication',
	'PhabricatorLegalpadConfigOptions' => 'PhabricatorApplicationConfigOptions',
	- 'PhabricatorLegalpadPHIDTypeDocument' => 'PhabricatorPHIDType',
	+ 'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorLipsumGenerateWorkflow' => 'PhabricatorLipsumManagementWorkflow',
	'PhabricatorLipsumManagementWorkflow' => 'PhabricatorManagementWorkflow',
	'PhabricatorLipsumMondrianArtist' => 'PhabricatorLipsumArtist',
	@@ -4513,10 +4513,10 @@
	'PhabricatorMacroEditController' => 'PhabricatorMacroController',
	'PhabricatorMacroEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorMacroListController' => 'PhabricatorMacroController',
	+ 'PhabricatorMacroMacroPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMacroMailReceiver' => 'PhabricatorObjectMailReceiver',
	'PhabricatorMacroMemeController' => 'PhabricatorMacroController',
	'PhabricatorMacroMemeDialogController' => 'PhabricatorMacroController',
	- 'PhabricatorMacroPHIDTypeMacro' => 'PhabricatorPHIDType',
	'PhabricatorMacroQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorMacroReplyHandler' => 'PhabricatorMailReplyHandler',
	'PhabricatorMacroSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -4541,7 +4541,7 @@
	'PhabricatorMailReceiverTestCase' => 'PhabricatorTestCase',
	'PhabricatorMailgunConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorMailingListDatasource' => 'PhabricatorTypeaheadDatasource',
	- 'PhabricatorMailingListPHIDTypeList' => 'PhabricatorPHIDType',
	+ 'PhabricatorMailingListListPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorMailingListQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorMailingListSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorMailingListsApplication' => 'PhabricatorApplication',
	@@ -4630,12 +4630,12 @@
	'PhabricatorOAuthServerDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhabricatorOAuthServerClientAuthorizationPHIDType' => 'PhabricatorPHIDType',
	+ 'PhabricatorOAuthServerClientPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorOAuthServerClientQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOAuthServerClientSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorOAuthServerController' => 'PhabricatorController',
	'PhabricatorOAuthServerDAO' => 'PhabricatorLiskDAO',
	- 'PhabricatorOAuthServerPHIDTypeClient' => 'PhabricatorPHIDType',
	- 'PhabricatorOAuthServerPHIDTypeClientAuthorization' => 'PhabricatorPHIDType',
	'PhabricatorOAuthServerTestCase' => 'PhabricatorTestCase',
	'PhabricatorOAuthServerTestController' => 'PhabricatorOAuthServerController',
	'PhabricatorOAuthServerTokenController' => 'PhabricatorAuthController',
	@@ -4655,12 +4655,12 @@
	'PhabricatorOwnersEditController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersListController' => 'PhabricatorOwnersController',
	'PhabricatorOwnersOwner' => 'PhabricatorOwnersDAO',
	- 'PhabricatorOwnersPHIDTypePackage' => 'PhabricatorPHIDType',
	'PhabricatorOwnersPackage' => array(
	'PhabricatorOwnersDAO',
	'PhabricatorPolicyInterface',
	),
	'PhabricatorOwnersPackageDatasource' => 'PhabricatorTypeaheadDatasource',
	+ 'PhabricatorOwnersPackagePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorOwnersPackageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorOwnersPackageTestCase' => 'PhabricatorTestCase',
	'PhabricatorOwnersPath' => 'PhabricatorOwnersDAO',
	@@ -4689,7 +4689,7 @@
	'PhabricatorPasteEditController' => 'PhabricatorPasteController',
	'PhabricatorPasteEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorPasteListController' => 'PhabricatorPasteController',
	- 'PhabricatorPastePHIDTypePaste' => 'PhabricatorPHIDType',
	+ 'PhabricatorPastePastePHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPasteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorPasteRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'PhabricatorPasteSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -4707,6 +4707,7 @@
	'PhabricatorPeopleDeleteController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleDisableController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleEmpowerController' => 'PhabricatorPeopleController',
	+ 'PhabricatorPeopleExternalPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPeopleHovercardEventListener' => 'PhabricatorEventListener',
	'PhabricatorPeopleLdapController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleListController' => 'PhabricatorPeopleController',
	@@ -4714,8 +4715,6 @@
	'PhabricatorPeopleLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPeopleLogsController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleNewController' => 'PhabricatorPeopleController',
	- 'PhabricatorPeoplePHIDTypeExternal' => 'PhabricatorPHIDType',
	- 'PhabricatorPeoplePHIDTypeUser' => 'PhabricatorPHIDType',
	'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfileEditController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleProfilePictureController' => 'PhabricatorPeopleController',
	@@ -4723,12 +4722,13 @@
	'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
	'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
	+ 'PhabricatorPeopleUserPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController',
	'PhabricatorPersonaAuthProvider' => 'PhabricatorAuthProvider',
	'PhabricatorPhameApplication' => 'PhabricatorApplication',
	+ 'PhabricatorPhameBlogPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
	- 'PhabricatorPhamePHIDTypeBlog' => 'PhabricatorPHIDType',
	- 'PhabricatorPhamePHIDTypePost' => 'PhabricatorPHIDType',
	+ 'PhabricatorPhamePostPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorPhluxApplication' => 'PhabricatorApplication',
	'PhabricatorPholioApplication' => 'PhabricatorApplication',
	'PhabricatorPholioConfigOptions' => 'PhabricatorApplicationConfigOptions',
	@@ -4795,6 +4795,7 @@
	'PhabricatorDestructibleInterface',
	),
	'PhabricatorProjectColumnDetailController' => 'PhabricatorProjectBoardController',
	+ 'PhabricatorProjectColumnPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorProjectColumnQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectColumnTransaction' => 'PhabricatorApplicationTransaction',
	'PhabricatorProjectColumnTransactionEditor' => 'PhabricatorApplicationTransactionEditor',
	@@ -4826,10 +4827,9 @@
	'PhabricatorProjectNameCollisionException' => 'Exception',
	'PhabricatorProjectObjectHasProjectEdgeType' => 'PhabricatorEdgeType',
	'PhabricatorProjectOrUserDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	- 'PhabricatorProjectPHIDTypeColumn' => 'PhabricatorPHIDType',
	- 'PhabricatorProjectPHIDTypeProject' => 'PhabricatorPHIDType',
	'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
	'PhabricatorProjectProjectHasObjectEdgeType' => 'PhabricatorEdgeType',
	+ 'PhabricatorProjectProjectPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorProjectSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorProjectSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	@@ -4881,6 +4881,7 @@
	),
	'PhabricatorRepositoryArcanistProjectDeleteController' => 'PhabricatorRepositoryController',
	'PhabricatorRepositoryArcanistProjectEditController' => 'PhabricatorRepositoryController',
	+ 'PhabricatorRepositoryArcanistProjectPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryArcanistProjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryAuditRequest' => array(
	'PhabricatorRepositoryDAO',
	@@ -4900,6 +4901,7 @@
	'PhabricatorRepositoryCommitHeraldWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitMessageParserWorker' => 'PhabricatorRepositoryCommitParserWorker',
	'PhabricatorRepositoryCommitOwnersWorker' => 'PhabricatorRepositoryCommitParserWorker',
	+ 'PhabricatorRepositoryCommitPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryCommitParserWorker' => 'PhabricatorWorker',
	'PhabricatorRepositoryCommitSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	'PhabricatorRepositoryConfigOptions' => 'PhabricatorApplicationConfigOptions',
	@@ -4931,13 +4933,8 @@
	'PhabricatorPolicyInterface',
	),
	'PhabricatorRepositoryMirrorEngine' => 'PhabricatorRepositoryEngine',
	+ 'PhabricatorRepositoryMirrorPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryMirrorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	- 'PhabricatorRepositoryPHIDTypeArcanistProject' => 'PhabricatorPHIDType',
	- 'PhabricatorRepositoryPHIDTypeCommit' => 'PhabricatorPHIDType',
	- 'PhabricatorRepositoryPHIDTypeMirror' => 'PhabricatorPHIDType',
	- 'PhabricatorRepositoryPHIDTypePushEvent' => 'PhabricatorPHIDType',
	- 'PhabricatorRepositoryPHIDTypePushLog' => 'PhabricatorPHIDType',
	- 'PhabricatorRepositoryPHIDTypeRepository' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryParsedChange' => 'Phobject',
	'PhabricatorRepositoryPullEngine' => 'PhabricatorRepositoryEngine',
	'PhabricatorRepositoryPullLocalDaemon' => 'PhabricatorDaemon',
	@@ -4945,11 +4942,13 @@
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhabricatorRepositoryPushEventPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryPushEventQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryPushLog' => array(
	'PhabricatorRepositoryDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhabricatorRepositoryPushLogPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositoryPushLogQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryPushLogSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorRepositoryPushMailWorker' => 'PhabricatorWorker',
	@@ -4961,6 +4960,7 @@
	),
	'PhabricatorRepositoryRefCursorQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorRepositoryRefEngine' => 'PhabricatorRepositoryEngine',
	+ 'PhabricatorRepositoryRepositoryPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorRepositorySearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorRepositoryStatusMessage' => 'PhabricatorRepositoryDAO',
	'PhabricatorRepositorySvnCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
	@@ -5077,7 +5077,6 @@
	'PhabricatorSlowvoteEditor' => 'PhabricatorApplicationTransactionEditor',
	'PhabricatorSlowvoteListController' => 'PhabricatorSlowvoteController',
	'PhabricatorSlowvoteOption' => 'PhabricatorSlowvoteDAO',
	- 'PhabricatorSlowvotePHIDTypePoll' => 'PhabricatorPHIDType',
	'PhabricatorSlowvotePoll' => array(
	'PhabricatorSlowvoteDAO',
	'PhabricatorPolicyInterface',
	@@ -5087,6 +5086,7 @@
	'PhabricatorProjectInterface',
	),
	'PhabricatorSlowvotePollController' => 'PhabricatorSlowvoteController',
	+ 'PhabricatorSlowvotePollPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorSlowvoteQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorSlowvoteSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhabricatorSlowvoteTransaction' => 'PhabricatorApplicationTransaction',
	@@ -5164,9 +5164,9 @@
	'PhabricatorTokenGivenFeedStory' => 'PhabricatorFeedStory',
	'PhabricatorTokenGivenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorTokenLeaderController' => 'PhabricatorTokenController',
	- 'PhabricatorTokenPHIDTypeToken' => 'PhabricatorPHIDType',
	'PhabricatorTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhabricatorTokenReceiverQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhabricatorTokenTokenPHIDType' => 'PhabricatorPHIDType',
	'PhabricatorTokenUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorTokensApplication' => 'PhabricatorApplication',
	'PhabricatorTransactionView' => 'AphrontView',
	@@ -5310,7 +5310,6 @@
	'PhluxDAO' => 'PhabricatorLiskDAO',
	'PhluxEditController' => 'PhluxController',
	'PhluxListController' => 'PhluxController',
	- 'PhluxPHIDTypeVariable' => 'PhabricatorPHIDType',
	'PhluxTransaction' => 'PhabricatorApplicationTransaction',
	'PhluxTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'PhluxVariable' => array(
	@@ -5319,6 +5318,7 @@
	'PhabricatorPolicyInterface',
	),
	'PhluxVariableEditor' => 'PhabricatorApplicationTransactionEditor',
	+ 'PhluxVariablePHIDType' => 'PhabricatorPHIDType',
	'PhluxVariableQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhluxViewController' => 'PhluxController',
	'PholioActionMenuEventListener' => 'PhabricatorEventListener',
	@@ -5331,6 +5331,7 @@
	'PhabricatorMarkupInterface',
	'PhabricatorPolicyInterface',
	),
	+ 'PholioImagePHIDType' => 'PhabricatorPHIDType',
	'PholioImageQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PholioImageUploadController' => 'PholioController',
	'PholioInlineController' => 'PholioController',
	@@ -5354,12 +5355,11 @@
	'PholioMockImagesView' => 'AphrontView',
	'PholioMockListController' => 'PholioController',
	'PholioMockMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'PholioMockPHIDType' => 'PhabricatorPHIDType',
	'PholioMockQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PholioMockSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PholioMockThumbGridView' => 'AphrontView',
	'PholioMockViewController' => 'PholioController',
	- 'PholioPHIDTypeImage' => 'PhabricatorPHIDType',
	- 'PholioPHIDTypeMock' => 'PhabricatorPHIDType',
	'PholioRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'PholioReplyHandler' => 'PhabricatorMailReplyHandler',
	'PholioSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	@@ -5443,16 +5443,15 @@
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhragmentFragmentPHIDType' => 'PhabricatorPHIDType',
	'PhragmentFragmentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentFragmentVersion' => array(
	'PhragmentDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'PhragmentFragmentVersionPHIDType' => 'PhabricatorPHIDType',
	'PhragmentFragmentVersionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentHistoryController' => 'PhragmentController',
	- 'PhragmentPHIDTypeFragment' => 'PhabricatorPHIDType',
	- 'PhragmentPHIDTypeFragmentVersion' => 'PhabricatorPHIDType',
	- 'PhragmentPHIDTypeSnapshot' => 'PhabricatorPHIDType',
	'PhragmentPatchController' => 'PhragmentController',
	'PhragmentPatchUtil' => 'Phobject',
	'PhragmentPolicyController' => 'PhragmentController',
	@@ -5468,6 +5467,7 @@
	'PhragmentSnapshotChildQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentSnapshotCreateController' => 'PhragmentController',
	'PhragmentSnapshotDeleteController' => 'PhragmentController',
	+ 'PhragmentSnapshotPHIDType' => 'PhabricatorPHIDType',
	'PhragmentSnapshotPromoteController' => 'PhragmentController',
	'PhragmentSnapshotQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhragmentSnapshotViewController' => 'PhragmentController',
	@@ -5510,6 +5510,7 @@
	),
	'PhrictionDocumentController' => 'PhrictionController',
	'PhrictionDocumentEditor' => 'PhabricatorEditor',
	+ 'PhrictionDocumentPHIDType' => 'PhabricatorPHIDType',
	'PhrictionDocumentPreviewController' => 'PhrictionController',
	'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhrictionDocumentStatus' => 'PhrictionConstants',
	@@ -5519,7 +5520,6 @@
	'PhrictionListController' => 'PhrictionController',
	'PhrictionMoveController' => 'PhrictionController',
	'PhrictionNewController' => 'PhrictionController',
	- 'PhrictionPHIDTypeDocument' => 'PhabricatorPHIDType',
	'PhrictionRemarkupRule' => 'PhutilRemarkupRule',
	'PhrictionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhrictionSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	@@ -5537,6 +5537,7 @@
	'PonderAnswerEditController' => 'PonderController',
	'PonderAnswerEditor' => 'PonderEditor',
	'PonderAnswerHistoryController' => 'PonderController',
	+ 'PonderAnswerPHIDType' => 'PhabricatorPHIDType',
	'PonderAnswerQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PonderAnswerSaveController' => 'PonderController',
	'PonderAnswerTransaction' => 'PhabricatorApplicationTransaction',
	@@ -5550,8 +5551,6 @@
	'PonderController' => 'PhabricatorController',
	'PonderDAO' => 'PhabricatorLiskDAO',
	'PonderEditor' => 'PhabricatorApplicationTransactionEditor',
	- 'PonderPHIDTypeAnswer' => 'PhabricatorPHIDType',
	- 'PonderPHIDTypeQuestion' => 'PhabricatorPHIDType',
	'PonderQuestion' => array(
	'PonderDAO',
	'PhabricatorMarkupInterface',
	@@ -5568,6 +5567,7 @@
	'PonderQuestionHistoryController' => 'PonderController',
	'PonderQuestionListController' => 'PonderController',
	'PonderQuestionMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'PonderQuestionPHIDType' => 'PhabricatorPHIDType',
	'PonderQuestionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PonderQuestionReplyHandler' => 'PhabricatorMailReplyHandler',
	'PonderQuestionSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -5600,6 +5600,7 @@
	'ReleephBranchEditor' => 'PhabricatorEditor',
	'ReleephBranchHistoryController' => 'ReleephBranchController',
	'ReleephBranchNamePreviewController' => 'ReleephController',
	+ 'ReleephBranchPHIDType' => 'PhabricatorPHIDType',
	'ReleephBranchPreviewView' => 'AphrontFormControl',
	'ReleephBranchQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephBranchSearchEngine' => 'PhabricatorApplicationSearchEngine',
	@@ -5626,9 +5627,6 @@
	'ReleephIntentFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephLevelFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephOriginalCommitFieldSpecification' => 'ReleephFieldSpecification',
	- 'ReleephPHIDTypeBranch' => 'PhabricatorPHIDType',
	- 'ReleephPHIDTypeProduct' => 'PhabricatorPHIDType',
	- 'ReleephPHIDTypeRequest' => 'PhabricatorPHIDType',
	'ReleephProductActionController' => 'ReleephProductController',
	'ReleephProductController' => 'ReleephController',
	'ReleephProductCreateController' => 'ReleephProductController',
	@@ -5636,6 +5634,7 @@
	'ReleephProductEditor' => 'PhabricatorApplicationTransactionEditor',
	'ReleephProductHistoryController' => 'ReleephProductController',
	'ReleephProductListController' => 'ReleephController',
	+ 'ReleephProductPHIDType' => 'PhabricatorPHIDType',
	'ReleephProductQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephProductSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'ReleephProductTransaction' => 'PhabricatorApplicationTransaction',
	@@ -5660,6 +5659,7 @@
	'ReleephRequestDifferentialCreateController' => 'ReleephController',
	'ReleephRequestEditController' => 'ReleephBranchController',
	'ReleephRequestMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'ReleephRequestPHIDType' => 'PhabricatorPHIDType',
	'ReleephRequestQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'ReleephRequestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ReleephRequestSearchEngine' => 'PhabricatorApplicationSearchEngine',
	diff --git a/src/applications/auth/phid/PhabricatorAuthPHIDTypeAuthFactor.php b/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
	rename from src/applications/auth/phid/PhabricatorAuthPHIDTypeAuthFactor.php
	rename to src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
	--- a/src/applications/auth/phid/PhabricatorAuthPHIDTypeAuthFactor.php
	+++ b/src/applications/auth/phid/PhabricatorAuthAuthFactorPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorAuthPHIDTypeAuthFactor extends PhabricatorPHIDType {
	+final class PhabricatorAuthAuthFactorPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'AFTR';

	diff --git a/src/applications/auth/storage/PhabricatorAuthFactorConfig.php b/src/applications/auth/storage/PhabricatorAuthFactorConfig.php
	--- a/src/applications/auth/storage/PhabricatorAuthFactorConfig.php
	+++ b/src/applications/auth/storage/PhabricatorAuthFactorConfig.php
	@@ -19,7 +19,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorAuthPHIDTypeAuthFactor::TYPECONST);
	+ PhabricatorAuthAuthFactorPHIDType::TYPECONST);
	}

	public function getImplementation() {
	diff --git a/src/applications/calendar/phid/PhabricatorCalendarPHIDTypeEvent.php b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
	rename from src/applications/calendar/phid/PhabricatorCalendarPHIDTypeEvent.php
	rename to src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
	--- a/src/applications/calendar/phid/PhabricatorCalendarPHIDTypeEvent.php
	+++ b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorCalendarPHIDTypeEvent extends PhabricatorPHIDType {
	+final class PhabricatorCalendarEventPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CEVT';

	diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	--- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	+++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
	@@ -42,7 +42,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorCalendarPHIDTypeEvent::TYPECONST);
	+ PhabricatorCalendarEventPHIDType::TYPECONST);
	}

	public function getTerseSummary(PhabricatorUser $viewer) {
	diff --git a/src/applications/config/phid/PhabricatorConfigPHIDTypeConfig.php b/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
	rename from src/applications/config/phid/PhabricatorConfigPHIDTypeConfig.php
	rename to src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
	--- a/src/applications/config/phid/PhabricatorConfigPHIDTypeConfig.php
	+++ b/src/applications/config/phid/PhabricatorConfigConfigPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorConfigPHIDTypeConfig extends PhabricatorPHIDType {
	+final class PhabricatorConfigConfigPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CONF';

	diff --git a/src/applications/config/storage/PhabricatorConfigEntry.php b/src/applications/config/storage/PhabricatorConfigEntry.php
	--- a/src/applications/config/storage/PhabricatorConfigEntry.php
	+++ b/src/applications/config/storage/PhabricatorConfigEntry.php
	@@ -19,7 +19,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorConfigPHIDTypeConfig::TYPECONST);
	+ PhabricatorConfigConfigPHIDType::TYPECONST);
	}

	public static function loadConfigEntry($key) {
	diff --git a/src/applications/config/storage/PhabricatorConfigTransaction.php b/src/applications/config/storage/PhabricatorConfigTransaction.php
	--- a/src/applications/config/storage/PhabricatorConfigTransaction.php
	+++ b/src/applications/config/storage/PhabricatorConfigTransaction.php
	@@ -10,7 +10,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorConfigPHIDTypeConfig::TYPECONST;
	+ return PhabricatorConfigConfigPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php b/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
	rename from src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php
	rename to src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
	--- a/src/applications/conpherence/phid/PhabricatorConpherencePHIDTypeThread.php
	+++ b/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorConpherencePHIDTypeThread extends PhabricatorPHIDType {
	+final class PhabricatorConpherenceThreadPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CONP';

	diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
	--- a/src/applications/conpherence/storage/ConpherenceThread.php
	+++ b/src/applications/conpherence/storage/ConpherenceThread.php
	@@ -32,7 +32,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorConpherencePHIDTypeThread::TYPECONST);
	+ PhabricatorConpherenceThreadPHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/conpherence/storage/ConpherenceTransaction.php b/src/applications/conpherence/storage/ConpherenceTransaction.php
	--- a/src/applications/conpherence/storage/ConpherenceTransaction.php
	+++ b/src/applications/conpherence/storage/ConpherenceTransaction.php
	@@ -7,7 +7,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorConpherencePHIDTypeThread::TYPECONST;
	+ return PhabricatorConpherenceThreadPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/countdown/phid/PhabricatorCountdownPHIDTypeCountdown.php b/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
	rename from src/applications/countdown/phid/PhabricatorCountdownPHIDTypeCountdown.php
	rename to src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
	--- a/src/applications/countdown/phid/PhabricatorCountdownPHIDTypeCountdown.php
	+++ b/src/applications/countdown/phid/PhabricatorCountdownCountdownPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorCountdownPHIDTypeCountdown extends PhabricatorPHIDType {
	+final class PhabricatorCountdownCountdownPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CDWN';

	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
	@@ -32,7 +32,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorCountdownPHIDTypeCountdown::TYPECONST);
	+ PhabricatorCountdownCountdownPHIDType::TYPECONST);
	}


	diff --git a/src/applications/dashboard/phid/PhabricatorDashboardPHIDTypeDashboard.php b/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
	rename from src/applications/dashboard/phid/PhabricatorDashboardPHIDTypeDashboard.php
	rename to src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
	--- a/src/applications/dashboard/phid/PhabricatorDashboardPHIDTypeDashboard.php
	+++ b/src/applications/dashboard/phid/PhabricatorDashboardDashboardPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorDashboardPHIDTypeDashboard extends PhabricatorPHIDType {
	+final class PhabricatorDashboardDashboardPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DSHB';

	diff --git a/src/applications/dashboard/phid/PhabricatorDashboardPHIDTypePanel.php b/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
	rename from src/applications/dashboard/phid/PhabricatorDashboardPHIDTypePanel.php
	rename to src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
	--- a/src/applications/dashboard/phid/PhabricatorDashboardPHIDTypePanel.php
	+++ b/src/applications/dashboard/phid/PhabricatorDashboardPanelPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorDashboardPHIDTypePanel extends PhabricatorPHIDType {
	+final class PhabricatorDashboardPanelPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DSHP';

	diff --git a/src/applications/dashboard/storage/PhabricatorDashboard.php b/src/applications/dashboard/storage/PhabricatorDashboard.php
	--- a/src/applications/dashboard/storage/PhabricatorDashboard.php
	+++ b/src/applications/dashboard/storage/PhabricatorDashboard.php
	@@ -43,7 +43,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorDashboardPHIDTypeDashboard::TYPECONST);
	+ PhabricatorDashboardDashboardPHIDType::TYPECONST);
	}

	public function getLayoutConfigObject() {
	diff --git a/src/applications/dashboard/storage/PhabricatorDashboardPanel.php b/src/applications/dashboard/storage/PhabricatorDashboardPanel.php
	--- a/src/applications/dashboard/storage/PhabricatorDashboardPanel.php
	+++ b/src/applications/dashboard/storage/PhabricatorDashboardPanel.php
	@@ -47,7 +47,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorDashboardPHIDTypePanel::TYPECONST);
	+ PhabricatorDashboardPanelPHIDType::TYPECONST);
	}

	public function getProperty($key, $default = null) {
	diff --git a/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php b/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php
	--- a/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php
	+++ b/src/applications/dashboard/storage/PhabricatorDashboardPanelTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorDashboardPHIDTypePanel::TYPECONST;
	+ return PhabricatorDashboardPanelPHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php b/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php
	--- a/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php
	+++ b/src/applications/dashboard/storage/PhabricatorDashboardTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorDashboardPHIDTypeDashboard::TYPECONST;
	+ return PhabricatorDashboardDashboardPHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/differential/customfield/DifferentialAuditorsField.php b/src/applications/differential/customfield/DifferentialAuditorsField.php
	--- a/src/applications/differential/customfield/DifferentialAuditorsField.php
	+++ b/src/applications/differential/customfield/DifferentialAuditorsField.php
	@@ -48,8 +48,8 @@
	return $this->parseObjectList(
	$value,
	array(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	));
	}

	@@ -57,5 +57,4 @@
	return $this->renderObjectList($handles);
	}

	-
	}
	diff --git a/src/applications/differential/customfield/DifferentialManiphestTasksField.php b/src/applications/differential/customfield/DifferentialManiphestTasksField.php
	--- a/src/applications/differential/customfield/DifferentialManiphestTasksField.php
	+++ b/src/applications/differential/customfield/DifferentialManiphestTasksField.php
	@@ -91,7 +91,7 @@
	return $this->parseObjectList(
	$value,
	array(
	- ManiphestPHIDTypeTask::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST,
	));
	}

	diff --git a/src/applications/differential/customfield/DifferentialProjectsField.php b/src/applications/differential/customfield/DifferentialProjectsField.php
	--- a/src/applications/differential/customfield/DifferentialProjectsField.php
	+++ b/src/applications/differential/customfield/DifferentialProjectsField.php
	@@ -106,7 +106,7 @@
	return $this->parseObjectList(
	$value,
	array(
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	));
	}

	diff --git a/src/applications/differential/customfield/DifferentialReviewedByField.php b/src/applications/differential/customfield/DifferentialReviewedByField.php
	--- a/src/applications/differential/customfield/DifferentialReviewedByField.php
	+++ b/src/applications/differential/customfield/DifferentialReviewedByField.php
	@@ -55,8 +55,8 @@
	return $this->parseObjectList(
	$value,
	array(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	),
	$allow_partial = true);
	}
	diff --git a/src/applications/differential/customfield/DifferentialReviewersField.php b/src/applications/differential/customfield/DifferentialReviewersField.php
	--- a/src/applications/differential/customfield/DifferentialReviewersField.php
	+++ b/src/applications/differential/customfield/DifferentialReviewersField.php
	@@ -142,8 +142,8 @@
	return $this->parseObjectList(
	$value,
	array(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	));
	}

	diff --git a/src/applications/differential/customfield/DifferentialSubscribersField.php b/src/applications/differential/customfield/DifferentialSubscribersField.php
	--- a/src/applications/differential/customfield/DifferentialSubscribersField.php
	+++ b/src/applications/differential/customfield/DifferentialSubscribersField.php
	@@ -79,9 +79,9 @@
	return $this->parseObjectList(
	$value,
	array(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	- PhabricatorMailingListPHIDTypeList::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	+ PhabricatorMailingListListPHIDType::TYPECONST,
	));
	}

	diff --git a/src/applications/differential/phid/DifferentialPHIDTypeDiff.php b/src/applications/differential/phid/DifferentialDiffPHIDType.php
	rename from src/applications/differential/phid/DifferentialPHIDTypeDiff.php
	rename to src/applications/differential/phid/DifferentialDiffPHIDType.php
	--- a/src/applications/differential/phid/DifferentialPHIDTypeDiff.php
	+++ b/src/applications/differential/phid/DifferentialDiffPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DifferentialPHIDTypeDiff extends PhabricatorPHIDType {
	+final class DifferentialDiffPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DIFF';

	diff --git a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
	rename from src/applications/differential/phid/DifferentialPHIDTypeRevision.php
	rename to src/applications/differential/phid/DifferentialRevisionPHIDType.php
	--- a/src/applications/differential/phid/DifferentialPHIDTypeRevision.php
	+++ b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DifferentialPHIDTypeRevision extends PhabricatorPHIDType {
	+final class DifferentialRevisionPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DREV';

	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
	@@ -1124,7 +1124,7 @@

	// Find all the project reviewers which the user may have authority over.
	$project_phids = array();
	- $project_type = PhabricatorProjectPHIDTypeProject::TYPECONST;
	+ $project_type = PhabricatorProjectProjectPHIDType::TYPECONST;
	$edge_type = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
	foreach ($edges as $src => $types) {
	if (!$allow_self) {
	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
	@@ -35,7 +35,7 @@
	$request,
	'reviewers',
	array(
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	)));

	$saved->setParameter(
	diff --git a/src/applications/differential/search/DifferentialSearchIndexer.php b/src/applications/differential/search/DifferentialSearchIndexer.php
	--- a/src/applications/differential/search/DifferentialSearchIndexer.php
	+++ b/src/applications/differential/search/DifferentialSearchIndexer.php
	@@ -24,7 +24,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($rev->getPHID());
	- $doc->setDocumentType(DifferentialPHIDTypeRevision::TYPECONST);
	+ $doc->setDocumentType(DifferentialRevisionPHIDType::TYPECONST);
	$doc->setDocumentTitle($rev->getTitle());
	$doc->setDocumentCreated($rev->getDateCreated());
	$doc->setDocumentModified($rev->getDateModified());
	@@ -32,7 +32,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$rev->getAuthorPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$rev->getDateCreated());

	$doc->addRelationship(
	@@ -40,7 +40,7 @@
	? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	: PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	$rev->getPHID(),
	- DifferentialPHIDTypeRevision::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST,
	time());

	$this->indexTransactions(
	@@ -58,14 +58,14 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	$phid,
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$rev->getDateModified()); // Bogus timestamp.
	}
	} else {
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_UNOWNED,
	$rev->getPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$rev->getDateModified()); // Bogus timestamp.
	}
	} else {
	diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
	--- a/src/applications/differential/storage/DifferentialDiff.php
	+++ b/src/applications/differential/storage/DifferentialDiff.php
	@@ -47,7 +47,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- DifferentialPHIDTypeDiff::TYPECONST);
	+ DifferentialDiffPHIDType::TYPECONST);
	}

	public function addUnsavedChangeset(DifferentialChangeset $changeset) {
	diff --git a/src/applications/differential/storage/DifferentialInlineComment.php b/src/applications/differential/storage/DifferentialInlineComment.php
	--- a/src/applications/differential/storage/DifferentialInlineComment.php
	+++ b/src/applications/differential/storage/DifferentialInlineComment.php
	@@ -184,8 +184,8 @@
	public function setCommentID($id) {
	$this->proxy->setTransactionPHID(
	PhabricatorPHID::generateNewPHID(
	- PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST,
	- DifferentialPHIDTypeRevision::TYPECONST));
	+ PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST));
	return $this;
	}

	diff --git a/src/applications/differential/storage/DifferentialReviewer.php b/src/applications/differential/storage/DifferentialReviewer.php
	--- a/src/applications/differential/storage/DifferentialReviewer.php
	+++ b/src/applications/differential/storage/DifferentialReviewer.php
	@@ -26,7 +26,7 @@
	}

	public function isUser() {
	- $user_type = PhabricatorPeoplePHIDTypeUser::TYPECONST;
	+ $user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
	return (phid_get_type($this->getReviewerPHID()) == $user_type);
	}

	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
	@@ -160,7 +160,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- DifferentialPHIDTypeRevision::TYPECONST);
	+ DifferentialRevisionPHIDType::TYPECONST);
	}

	public function loadActiveDiff() {
	diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
	--- a/src/applications/differential/storage/DifferentialTransaction.php
	+++ b/src/applications/differential/storage/DifferentialTransaction.php
	@@ -24,7 +24,7 @@
	}

	public function getApplicationTransactionType() {
	- return DifferentialPHIDTypeRevision::TYPECONST;
	+ return DifferentialRevisionPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	@@ -42,7 +42,7 @@
	// the new value is a PHID, indicating that this is a newer style
	// transaction.
	if ($old === null) {
	- if (phid_get_type($new) == DifferentialPHIDTypeDiff::TYPECONST) {
	+ if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
	return true;
	}
	}
	@@ -218,7 +218,7 @@
	case self::TYPE_UPDATE:
	if ($new) {
	// TODO: Migrate to PHIDs and use handles here?
	- if (phid_get_type($new) == DifferentialPHIDTypeDiff::TYPECONST) {
	+ if (phid_get_type($new) == DifferentialDiffPHIDType::TYPECONST) {
	return pht(
	'%s updated this revision to %s.',
	$author_handle,
	diff --git a/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php b/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php
	--- a/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php
	+++ b/src/applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php
	@@ -1,7 +1,6 @@
	<?php

	-final class DiffusionCommitRemarkupRule
	- extends PhabricatorRemarkupRuleObject {
	+final class DiffusionCommitRemarkupRule extends PhabricatorRemarkupRuleObject {

	protected function getObjectNamePrefix() {
	return '';
	@@ -12,7 +11,7 @@
	}

	protected function getObjectIDPattern() {
	- return PhabricatorRepositoryPHIDTypeCommit::getCommitObjectNamePattern();
	+ return PhabricatorRepositoryCommitPHIDType::getCommitObjectNamePattern();
	}

	protected function loadObjects(array $ids) {
	diff --git a/src/applications/diviner/phid/DivinerPHIDTypeAtom.php b/src/applications/diviner/phid/DivinerAtomPHIDType.php
	rename from src/applications/diviner/phid/DivinerPHIDTypeAtom.php
	rename to src/applications/diviner/phid/DivinerAtomPHIDType.php
	--- a/src/applications/diviner/phid/DivinerPHIDTypeAtom.php
	+++ b/src/applications/diviner/phid/DivinerAtomPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DivinerPHIDTypeAtom extends PhabricatorPHIDType {
	+final class DivinerAtomPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'ATOM';

	diff --git a/src/applications/diviner/phid/DivinerPHIDTypeBook.php b/src/applications/diviner/phid/DivinerBookPHIDType.php
	rename from src/applications/diviner/phid/DivinerPHIDTypeBook.php
	rename to src/applications/diviner/phid/DivinerBookPHIDType.php
	--- a/src/applications/diviner/phid/DivinerPHIDTypeBook.php
	+++ b/src/applications/diviner/phid/DivinerBookPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DivinerPHIDTypeBook extends PhabricatorPHIDType {
	+final class DivinerBookPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'BOOK';

	diff --git a/src/applications/diviner/storage/DivinerLiveBook.php b/src/applications/diviner/storage/DivinerLiveBook.php
	--- a/src/applications/diviner/storage/DivinerLiveBook.php
	+++ b/src/applications/diviner/storage/DivinerLiveBook.php
	@@ -27,7 +27,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- DivinerPHIDTypeBook::TYPECONST);
	+ DivinerBookPHIDType::TYPECONST);
	}

	public function getTitle() {
	diff --git a/src/applications/diviner/storage/DivinerLiveSymbol.php b/src/applications/diviner/storage/DivinerLiveSymbol.php
	--- a/src/applications/diviner/storage/DivinerLiveSymbol.php
	+++ b/src/applications/diviner/storage/DivinerLiveSymbol.php
	@@ -31,8 +31,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(
	- DivinerPHIDTypeAtom::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(DivinerAtomPHIDType::TYPECONST);
	}

	public function getBook() {
	diff --git a/src/applications/drydock/phid/DrydockPHIDTypeBlueprint.php b/src/applications/drydock/phid/DrydockBlueprintPHIDType.php
	rename from src/applications/drydock/phid/DrydockPHIDTypeBlueprint.php
	rename to src/applications/drydock/phid/DrydockBlueprintPHIDType.php
	--- a/src/applications/drydock/phid/DrydockPHIDTypeBlueprint.php
	+++ b/src/applications/drydock/phid/DrydockBlueprintPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DrydockPHIDTypeBlueprint extends PhabricatorPHIDType {
	+final class DrydockBlueprintPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DRYB';

	diff --git a/src/applications/drydock/phid/DrydockPHIDTypeLease.php b/src/applications/drydock/phid/DrydockLeasePHIDType.php
	rename from src/applications/drydock/phid/DrydockPHIDTypeLease.php
	rename to src/applications/drydock/phid/DrydockLeasePHIDType.php
	--- a/src/applications/drydock/phid/DrydockPHIDTypeLease.php
	+++ b/src/applications/drydock/phid/DrydockLeasePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DrydockPHIDTypeLease extends PhabricatorPHIDType {
	+final class DrydockLeasePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DRYL';

	diff --git a/src/applications/drydock/phid/DrydockPHIDTypeResource.php b/src/applications/drydock/phid/DrydockResourcePHIDType.php
	rename from src/applications/drydock/phid/DrydockPHIDTypeResource.php
	rename to src/applications/drydock/phid/DrydockResourcePHIDType.php
	--- a/src/applications/drydock/phid/DrydockPHIDTypeResource.php
	+++ b/src/applications/drydock/phid/DrydockResourcePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class DrydockPHIDTypeResource extends PhabricatorPHIDType {
	+final class DrydockResourcePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'DRYR';

	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
	@@ -39,7 +39,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- DrydockPHIDTypeBlueprint::TYPECONST);
	+ DrydockBlueprintPHIDType::TYPECONST);
	}

	public function getImplementation() {
	diff --git a/src/applications/drydock/storage/DrydockBlueprintTransaction.php b/src/applications/drydock/storage/DrydockBlueprintTransaction.php
	--- a/src/applications/drydock/storage/DrydockBlueprintTransaction.php
	+++ b/src/applications/drydock/storage/DrydockBlueprintTransaction.php
	@@ -10,7 +10,7 @@
	}

	public function getApplicationTransactionType() {
	- return DrydockPHIDTypeBlueprint::TYPECONST;
	+ return DrydockBlueprintPHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/drydock/storage/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
	--- a/src/applications/drydock/storage/DrydockLease.php
	+++ b/src/applications/drydock/storage/DrydockLease.php
	@@ -56,7 +56,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(DrydockPHIDTypeLease::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(DrydockLeasePHIDType::TYPECONST);
	}

	public function getInterface($type) {
	diff --git a/src/applications/drydock/storage/DrydockResource.php b/src/applications/drydock/storage/DrydockResource.php
	--- a/src/applications/drydock/storage/DrydockResource.php
	+++ b/src/applications/drydock/storage/DrydockResource.php
	@@ -27,7 +27,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(DrydockPHIDTypeResource::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(DrydockResourcePHIDType::TYPECONST);
	}

	public function getAttribute($key, $default = null) {
	diff --git a/src/applications/feed/story/PhabricatorFeedStory.php b/src/applications/feed/story/PhabricatorFeedStory.php
	--- a/src/applications/feed/story/PhabricatorFeedStory.php
	+++ b/src/applications/feed/story/PhabricatorFeedStory.php
	@@ -277,7 +277,7 @@
	// the '_top' target for framed feeds.

	$class = null;
	- if ($handle->getType() == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	+ if ($handle->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
	$class = 'phui-link-person';
	}

	diff --git a/src/applications/files/management/PhabricatorFilesManagementWorkflow.php b/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
	--- a/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
	+++ b/src/applications/files/management/PhabricatorFilesManagementWorkflow.php
	@@ -18,7 +18,7 @@
	$query = id(new PhabricatorObjectQuery())
	->setViewer($this->getViewer())
	->withNames($names)
	- ->withTypes(array(PhabricatorFilePHIDTypeFile::TYPECONST));
	+ ->withTypes(array(PhabricatorFileFilePHIDType::TYPECONST));

	$query->execute();
	$files = $query->getNamedResults();
	diff --git a/src/applications/files/phid/PhabricatorFilePHIDTypeFile.php b/src/applications/files/phid/PhabricatorFileFilePHIDType.php
	rename from src/applications/files/phid/PhabricatorFilePHIDTypeFile.php
	rename to src/applications/files/phid/PhabricatorFileFilePHIDType.php
	--- a/src/applications/files/phid/PhabricatorFilePHIDTypeFile.php
	+++ b/src/applications/files/phid/PhabricatorFileFilePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorFilePHIDTypeFile extends PhabricatorPHIDType {
	+final class PhabricatorFileFilePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'FILE';

	diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
	--- a/src/applications/files/storage/PhabricatorFile.php
	+++ b/src/applications/files/storage/PhabricatorFile.php
	@@ -43,7 +43,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorFilePHIDTypeFile::TYPECONST);
	+ PhabricatorFileFilePHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/files/storage/PhabricatorFileTransaction.php b/src/applications/files/storage/PhabricatorFileTransaction.php
	--- a/src/applications/files/storage/PhabricatorFileTransaction.php
	+++ b/src/applications/files/storage/PhabricatorFileTransaction.php
	@@ -8,7 +8,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorFilePHIDTypeFile::TYPECONST;
	+ return PhabricatorFileFilePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildItem.php b/src/applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildItem.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildItem.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildItemPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildItem extends PhabricatorPHIDType {
	+final class HarbormasterBuildItemPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMBI';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildLog.php b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildLog.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildLog.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildLogPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildLog extends PhabricatorPHIDType {
	+final class HarbormasterBuildLogPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMCL';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuild.php b/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuild.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuild.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuild extends PhabricatorPHIDType {
	+final class HarbormasterBuildPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMBD';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildPlan.php b/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildPlan.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildPlan.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildPlanPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildPlan extends PhabricatorPHIDType {
	+final class HarbormasterBuildPlanPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMCP';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildStep.php b/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildStep.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildStep.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildStepPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildStep extends PhabricatorPHIDType {
	+final class HarbormasterBuildStepPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMCS';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildTarget.php b/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildTarget.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildTarget.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildTargetPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildTarget extends PhabricatorPHIDType {
	+final class HarbormasterBuildTargetPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMBT';

	diff --git a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildable.php b/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
	rename from src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildable.php
	rename to src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
	--- a/src/applications/harbormaster/phid/HarbormasterPHIDTypeBuildable.php
	+++ b/src/applications/harbormaster/phid/HarbormasterBuildablePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HarbormasterPHIDTypeBuildable extends PhabricatorPHIDType {
	+final class HarbormasterBuildablePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HMBB';

	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
	@@ -18,14 +18,14 @@
	$request,
	'revisions',
	array(
	- DifferentialPHIDTypeRevision::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST,
	));

	$repositories = $this->readPHIDsFromRequest(
	$request,
	'repositories',
	array(
	- PhabricatorRepositoryPHIDTypeRepository::TYPECONST,
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	));

	$container_phids = array_merge($revisions, $repositories);
	@@ -35,7 +35,7 @@
	$request,
	'commits',
	array(
	- PhabricatorRepositoryPHIDTypeCommit::TYPECONST,
	+ PhabricatorRepositoryCommitPHIDType::TYPECONST,
	));

	$diffs = $this->readListFromRequest($request, 'diffs');
	diff --git a/src/applications/harbormaster/storage/HarbormasterBuildTransaction.php b/src/applications/harbormaster/storage/HarbormasterBuildTransaction.php
	--- a/src/applications/harbormaster/storage/HarbormasterBuildTransaction.php
	+++ b/src/applications/harbormaster/storage/HarbormasterBuildTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return HarbormasterPHIDTypeBuild::TYPECONST;
	+ return HarbormasterBuildPHIDType::TYPECONST;
	}

	public function getTitle() {
	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
	@@ -160,7 +160,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildable::TYPECONST);
	+ HarbormasterBuildablePHIDType::TYPECONST);
	}

	public function attachBuildableObject($buildable_object) {
	diff --git a/src/applications/harbormaster/storage/HarbormasterBuildableTransaction.php b/src/applications/harbormaster/storage/HarbormasterBuildableTransaction.php
	--- a/src/applications/harbormaster/storage/HarbormasterBuildableTransaction.php
	+++ b/src/applications/harbormaster/storage/HarbormasterBuildableTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return HarbormasterPHIDTypeBuildable::TYPECONST;
	+ return HarbormasterBuildablePHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuild.php b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuild.php
	@@ -136,7 +136,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuild::TYPECONST);
	+ HarbormasterBuildPHIDType::TYPECONST);
	}

	public function attachBuildable(HarbormasterBuildable $buildable) {
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildItem.php b/src/applications/harbormaster/storage/build/HarbormasterBuildItem.php
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuildItem.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildItem.php
	@@ -12,7 +12,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildItem::TYPECONST);
	+ HarbormasterBuildItemPHIDType::TYPECONST);
	}

	}
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildLog.php
	@@ -35,7 +35,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildLog::TYPECONST);
	+ HarbormasterBuildLogPHIDType::TYPECONST);
	}

	public function attachBuildTarget(HarbormasterBuildTarget $build_target) {
	diff --git a/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php b/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
	--- a/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
	+++ b/src/applications/harbormaster/storage/build/HarbormasterBuildTarget.php
	@@ -47,7 +47,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildTarget::TYPECONST);
	+ HarbormasterBuildTargetPHIDType::TYPECONST);
	}

	public function attachBuild(HarbormasterBuild $build) {
	diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php
	--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php
	+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlan.php
	@@ -26,7 +26,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildPlan::TYPECONST);
	+ HarbormasterBuildPlanPHIDType::TYPECONST);
	}

	public function attachBuildSteps(array $steps) {
	diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
	--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
	+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return HarbormasterPHIDTypeBuildPlan::TYPECONST;
	+ return HarbormasterBuildPlanPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
	--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
	+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php
	@@ -30,7 +30,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- HarbormasterPHIDTypeBuildStep::TYPECONST);
	+ HarbormasterBuildStepPHIDType::TYPECONST);
	}

	public function attachBuildPlan(HarbormasterBuildPlan $plan) {
	diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
	--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
	+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return HarbormasterPHIDTypeBuildStep::TYPECONST;
	+ return HarbormasterBuildStepPHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
	--- a/src/applications/herald/controller/HeraldTranscriptController.php
	+++ b/src/applications/herald/controller/HeraldTranscriptController.php
	@@ -297,7 +297,7 @@
	$object_xscript = $xscript->getObjectTranscript();
	$handle = $handles[$object_xscript->getPHID()];
	if ($handle->getType() ==
	- PhabricatorRepositoryPHIDTypeCommit::TYPECONST) {
	+ PhabricatorRepositoryCommitPHIDType::TYPECONST) {
	$commit = id(new DiffusionCommitQuery())
	->setViewer($request->getUser())
	->withPHIDs(array($handle->getPHID()))
	diff --git a/src/applications/herald/phid/HeraldPHIDTypeRule.php b/src/applications/herald/phid/HeraldRulePHIDType.php
	rename from src/applications/herald/phid/HeraldPHIDTypeRule.php
	rename to src/applications/herald/phid/HeraldRulePHIDType.php
	--- a/src/applications/herald/phid/HeraldPHIDTypeRule.php
	+++ b/src/applications/herald/phid/HeraldRulePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class HeraldPHIDTypeRule extends PhabricatorPHIDType {
	+final class HeraldRulePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'HRUL';

	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
	@@ -35,7 +35,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(HeraldPHIDTypeRule::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(HeraldRulePHIDType::TYPECONST);
	}

	public function getRuleApplied($phid) {
	diff --git a/src/applications/herald/storage/HeraldRuleTransaction.php b/src/applications/herald/storage/HeraldRuleTransaction.php
	--- a/src/applications/herald/storage/HeraldRuleTransaction.php
	+++ b/src/applications/herald/storage/HeraldRuleTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return HeraldPHIDTypeRule::TYPECONST;
	+ return HeraldRulePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php b/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
	rename from src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php
	rename to src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
	--- a/src/applications/legalpad/phid/PhabricatorLegalpadPHIDTypeDocument.php
	+++ b/src/applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorLegalpadPHIDTypeDocument extends PhabricatorPHIDType {
	+final class PhabricatorLegalpadDocumentPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'LEGD';

	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
	@@ -31,7 +31,7 @@
	$request,
	'documents',
	array(
	- PhabricatorLegalpadPHIDTypeDocument::TYPECONST,
	+ PhabricatorLegalpadDocumentPHIDType::TYPECONST,
	)));

	$saved->setParameter('nameContains', $request->getStr('nameContains'));
	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
	@@ -59,7 +59,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorLegalpadPHIDTypeDocument::TYPECONST);
	+ PhabricatorLegalpadDocumentPHIDType::TYPECONST);
	}

	public function getDocumentBody() {
	diff --git a/src/applications/legalpad/storage/LegalpadTransaction.php b/src/applications/legalpad/storage/LegalpadTransaction.php
	--- a/src/applications/legalpad/storage/LegalpadTransaction.php
	+++ b/src/applications/legalpad/storage/LegalpadTransaction.php
	@@ -7,7 +7,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorLegalpadPHIDTypeDocument::TYPECONST;
	+ return PhabricatorLegalpadDocumentPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php b/src/applications/macro/phid/PhabricatorMacroMacroPHIDType.php
	rename from src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php
	rename to src/applications/macro/phid/PhabricatorMacroMacroPHIDType.php
	--- a/src/applications/macro/phid/PhabricatorMacroPHIDTypeMacro.php
	+++ b/src/applications/macro/phid/PhabricatorMacroMacroPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorMacroPHIDTypeMacro extends PhabricatorPHIDType {
	+final class PhabricatorMacroMacroPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'MCRO';

	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
	@@ -175,7 +175,7 @@
	}
	$flags = id(new PhabricatorFlagQuery())
	->withOwnerPHIDs(array($this->getViewer()->getPHID()))
	- ->withTypes(array(PhabricatorMacroPHIDTypeMacro::TYPECONST))
	+ ->withTypes(array(PhabricatorMacroMacroPHIDType::TYPECONST))
	->withColors($flag_colors)
	->setViewer($this->getViewer())
	->execute();
	diff --git a/src/applications/macro/storage/PhabricatorFileImageMacro.php b/src/applications/macro/storage/PhabricatorFileImageMacro.php
	--- a/src/applications/macro/storage/PhabricatorFileImageMacro.php
	+++ b/src/applications/macro/storage/PhabricatorFileImageMacro.php
	@@ -48,7 +48,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorMacroPHIDTypeMacro::TYPECONST);
	+ PhabricatorMacroMacroPHIDType::TYPECONST);
	}


	diff --git a/src/applications/macro/storage/PhabricatorMacroTransaction.php b/src/applications/macro/storage/PhabricatorMacroTransaction.php
	--- a/src/applications/macro/storage/PhabricatorMacroTransaction.php
	+++ b/src/applications/macro/storage/PhabricatorMacroTransaction.php
	@@ -12,7 +12,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorMacroPHIDTypeMacro::TYPECONST;
	+ return PhabricatorMacroMacroPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php b/src/applications/mailinglists/phid/PhabricatorMailingListListPHIDType.php
	rename from src/applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php
	rename to src/applications/mailinglists/phid/PhabricatorMailingListListPHIDType.php
	--- a/src/applications/mailinglists/phid/PhabricatorMailingListPHIDTypeList.php
	+++ b/src/applications/mailinglists/phid/PhabricatorMailingListListPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorMailingListPHIDTypeList extends PhabricatorPHIDType {
	+final class PhabricatorMailingListListPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'MLST';

	diff --git a/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php b/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
	--- a/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
	+++ b/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
	@@ -11,7 +11,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorMailingListPHIDTypeList::TYPECONST);
	+ PhabricatorMailingListListPHIDType::TYPECONST);
	}

	public function getConfiguration() {
	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
	@@ -102,7 +102,7 @@
	if ($owner_phid !== null) {
	$this->validatePHIDList(
	array($owner_phid),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	'ownerPHID');
	$changes[ManiphestTransaction::TYPE_OWNER] = $owner_phid;
	}
	@@ -111,7 +111,7 @@
	if ($ccs !== null) {
	$this->validatePHIDList(
	$ccs,
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	'ccPHIDS');
	$changes[ManiphestTransaction::TYPE_CCS] = $ccs;
	}
	@@ -122,7 +122,7 @@
	if ($project_phids !== null) {
	$this->validatePHIDList(
	$project_phids,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	'projectPHIDS');

	$project_type = PhabricatorProjectObjectHasProjectEdgeType::EDGECONST;
	diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
	@@ -647,7 +647,7 @@
	$attached = array();
	}

	- $file_infos = idx($attached, PhabricatorFilePHIDTypeFile::TYPECONST);
	+ $file_infos = idx($attached, PhabricatorFileFilePHIDType::TYPECONST);
	if ($file_infos) {
	$file_phids = array_keys($file_infos);

	diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	--- a/src/applications/maniphest/controller/ManiphestTaskEditController.php
	+++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php
	@@ -58,7 +58,7 @@
	if ($projects) {
	$tokens = $request->getStrList('projects');

	- $type_project = PhabricatorProjectPHIDTypeProject::TYPECONST;
	+ $type_project = PhabricatorProjectProjectPHIDType::TYPECONST;
	foreach ($tokens as $key => $token) {
	if (phid_get_type($token) == $type_project) {
	// If this is formatted like a PHID, leave it as-is.
	diff --git a/src/applications/maniphest/event/ManiphestNameIndexEventListener.php b/src/applications/maniphest/event/ManiphestNameIndexEventListener.php
	--- a/src/applications/maniphest/event/ManiphestNameIndexEventListener.php
	+++ b/src/applications/maniphest/event/ManiphestNameIndexEventListener.php
	@@ -11,7 +11,7 @@
	$type = phid_get_type($phid);

	// For now, we only index projects.
	- if ($type != PhabricatorProjectPHIDTypeProject::TYPECONST) {
	+ if ($type != PhabricatorProjectProjectPHIDType::TYPECONST) {
	return;
	}

	diff --git a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php b/src/applications/maniphest/phid/ManiphestTaskPHIDType.php
	rename from src/applications/maniphest/phid/ManiphestPHIDTypeTask.php
	rename to src/applications/maniphest/phid/ManiphestTaskPHIDType.php
	--- a/src/applications/maniphest/phid/ManiphestPHIDTypeTask.php
	+++ b/src/applications/maniphest/phid/ManiphestTaskPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ManiphestPHIDTypeTask extends PhabricatorPHIDType {
	+final class ManiphestTaskPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'TASK';

	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
	@@ -482,7 +482,7 @@
	// NOTE: Setting this to something larger than 2^53 will raise errors in
	// ElasticSearch, and billions of results won't fit in memory anyway.
	$fulltext_query->setParameter('limit', 100000);
	- $fulltext_query->setParameter('type', ManiphestPHIDTypeTask::TYPECONST);
	+ $fulltext_query->setParameter('type', ManiphestTaskPHIDType::TYPECONST);

	$engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
	$fulltext_results = $engine->executeSearch($fulltext_query);
	diff --git a/src/applications/maniphest/search/ManiphestSearchIndexer.php b/src/applications/maniphest/search/ManiphestSearchIndexer.php
	--- a/src/applications/maniphest/search/ManiphestSearchIndexer.php
	+++ b/src/applications/maniphest/search/ManiphestSearchIndexer.php
	@@ -11,7 +11,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($task->getPHID());
	- $doc->setDocumentType(ManiphestPHIDTypeTask::TYPECONST);
	+ $doc->setDocumentType(ManiphestTaskPHIDType::TYPECONST);
	$doc->setDocumentTitle($task->getTitle());
	$doc->setDocumentCreated($task->getDateCreated());
	$doc->setDocumentModified($task->getDateModified());
	@@ -23,7 +23,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$task->getAuthorPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$task->getDateCreated());

	$doc->addRelationship(
	@@ -31,7 +31,7 @@
	? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	: PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	$task->getPHID(),
	- ManiphestPHIDTypeTask::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST,
	time());

	$this->indexTransactions(
	@@ -43,7 +43,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
	$phid,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	$task->getDateModified()); // Bogus.
	}

	@@ -52,7 +52,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_OWNER,
	$owner,
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	time());
	} else {
	$doc->addRelationship(
	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
	@@ -85,7 +85,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(ManiphestPHIDTypeTask::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(ManiphestTaskPHIDType::TYPECONST);
	}

	public function getCCPHIDs() {
	diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
	--- a/src/applications/maniphest/storage/ManiphestTransaction.php
	+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
	@@ -25,7 +25,7 @@
	}

	public function getApplicationTransactionType() {
	- return ManiphestPHIDTypeTask::TYPECONST;
	+ return ManiphestTaskPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php b/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
	rename from src/applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php
	rename to src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
	--- a/src/applications/meta/phid/PhabricatorApplicationPHIDTypeApplication.php
	+++ b/src/applications/meta/phid/PhabricatorApplicationApplicationPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorApplicationPHIDTypeApplication
	+final class PhabricatorApplicationApplicationPHIDType
	extends PhabricatorPHIDType {

	const TYPECONST = 'APPS';
	diff --git a/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
	--- a/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
	+++ b/src/applications/metamta/query/PhabricatorMetaMTAActorQuery.php
	@@ -33,13 +33,13 @@

	foreach ($type_map as $type => $phids) {
	switch ($type) {
	- case PhabricatorPeoplePHIDTypeUser::TYPECONST:
	+ case PhabricatorPeopleUserPHIDType::TYPECONST:
	$this->loadUserActors($actors, $phids);
	break;
	- case PhabricatorPeoplePHIDTypeExternal::TYPECONST:
	+ case PhabricatorPeopleExternalPHIDType::TYPECONST:
	$this->loadExternalUserActors($actors, $phids);
	break;
	- case PhabricatorMailingListPHIDTypeList::TYPECONST:
	+ case PhabricatorMailingListListPHIDType::TYPECONST:
	$this->loadMailingListActors($actors, $phids);
	break;
	default:
	diff --git a/src/applications/metamta/query/PhabricatorMetaMTAMemberQuery.php b/src/applications/metamta/query/PhabricatorMetaMTAMemberQuery.php
	--- a/src/applications/metamta/query/PhabricatorMetaMTAMemberQuery.php
	+++ b/src/applications/metamta/query/PhabricatorMetaMTAMemberQuery.php
	@@ -36,7 +36,7 @@
	$results = array();
	foreach ($type_map as $type => $phids) {
	switch ($type) {
	- case PhabricatorProjectPHIDTypeProject::TYPECONST:
	+ case PhabricatorProjectProjectPHIDType::TYPECONST:
	// NOTE: We're loading the projects here in order to respect policies.

	$projects = id(new PhabricatorProjectQuery())
	diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	@@ -247,7 +247,7 @@
	PhabricatorObjectHandle $handle,
	$prefix) {

	- if ($handle->getType() != PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	+ if ($handle->getType() != PhabricatorPeopleUserPHIDType::TYPECONST) {
	// You must be a real user to get a private reply handler address.
	return null;
	}
	diff --git a/src/applications/nuance/phid/NuancePHIDTypeItem.php b/src/applications/nuance/phid/NuanceItemPHIDType.php
	rename from src/applications/nuance/phid/NuancePHIDTypeItem.php
	rename to src/applications/nuance/phid/NuanceItemPHIDType.php
	--- a/src/applications/nuance/phid/NuancePHIDTypeItem.php
	+++ b/src/applications/nuance/phid/NuanceItemPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class NuancePHIDTypeItem extends PhabricatorPHIDType {
	+final class NuanceItemPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'NUAI';

	diff --git a/src/applications/nuance/phid/NuancePHIDTypeQueue.php b/src/applications/nuance/phid/NuanceQueuePHIDType.php
	rename from src/applications/nuance/phid/NuancePHIDTypeQueue.php
	rename to src/applications/nuance/phid/NuanceQueuePHIDType.php
	--- a/src/applications/nuance/phid/NuancePHIDTypeQueue.php
	+++ b/src/applications/nuance/phid/NuanceQueuePHIDType.php
	@@ -1,7 +1,6 @@
	<?php

	-final class NuancePHIDTypeQueue
	- extends PhabricatorPHIDType {
	+final class NuanceQueuePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'NUAQ';

	diff --git a/src/applications/nuance/phid/NuancePHIDTypeRequestor.php b/src/applications/nuance/phid/NuanceRequestorPHIDType.php
	rename from src/applications/nuance/phid/NuancePHIDTypeRequestor.php
	rename to src/applications/nuance/phid/NuanceRequestorPHIDType.php
	--- a/src/applications/nuance/phid/NuancePHIDTypeRequestor.php
	+++ b/src/applications/nuance/phid/NuanceRequestorPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class NuancePHIDTypeRequestor extends PhabricatorPHIDType {
	+final class NuanceRequestorPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'NUAR';

	diff --git a/src/applications/nuance/phid/NuancePHIDTypeSource.php b/src/applications/nuance/phid/NuanceSourcePHIDType.php
	rename from src/applications/nuance/phid/NuancePHIDTypeSource.php
	rename to src/applications/nuance/phid/NuanceSourcePHIDType.php
	--- a/src/applications/nuance/phid/NuancePHIDTypeSource.php
	+++ b/src/applications/nuance/phid/NuanceSourcePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class NuancePHIDTypeSource extends PhabricatorPHIDType {
	+final class NuanceSourcePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'NUAS';

	diff --git a/src/applications/nuance/storage/NuanceItem.php b/src/applications/nuance/storage/NuanceItem.php
	--- a/src/applications/nuance/storage/NuanceItem.php
	+++ b/src/applications/nuance/storage/NuanceItem.php
	@@ -33,7 +33,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- NuancePHIDTypeItem::TYPECONST);
	+ NuanceItemPHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/nuance/storage/NuanceItemTransaction.php b/src/applications/nuance/storage/NuanceItemTransaction.php
	--- a/src/applications/nuance/storage/NuanceItemTransaction.php
	+++ b/src/applications/nuance/storage/NuanceItemTransaction.php
	@@ -8,7 +8,7 @@
	const TYPE_SOURCE = 'item-source';

	public function getApplicationTransactionType() {
	- return NuancePHIDTypeItem::TYPECONST;
	+ return NuanceItemPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/nuance/storage/NuanceQueue.php b/src/applications/nuance/storage/NuanceQueue.php
	--- a/src/applications/nuance/storage/NuanceQueue.php
	+++ b/src/applications/nuance/storage/NuanceQueue.php
	@@ -17,7 +17,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- NuancePHIDTypeQueue::TYPECONST);
	+ NuanceQueuePHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/nuance/storage/NuanceQueueTransaction.php b/src/applications/nuance/storage/NuanceQueueTransaction.php
	--- a/src/applications/nuance/storage/NuanceQueueTransaction.php
	+++ b/src/applications/nuance/storage/NuanceQueueTransaction.php
	@@ -1,10 +1,9 @@
	<?php

	-final class NuanceQueueTransaction
	- extends NuanceTransaction {
	+final class NuanceQueueTransaction extends NuanceTransaction {

	public function getApplicationTransactionType() {
	- return NuancePHIDTypeQueue::TYPECONST;
	+ return NuanceQueuePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/nuance/storage/NuanceRequestor.php b/src/applications/nuance/storage/NuanceRequestor.php
	--- a/src/applications/nuance/storage/NuanceRequestor.php
	+++ b/src/applications/nuance/storage/NuanceRequestor.php
	@@ -16,7 +16,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- NuancePHIDTypeRequestor::TYPECONST);
	+ NuanceRequestorPHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/nuance/storage/NuanceRequestorTransaction.php b/src/applications/nuance/storage/NuanceRequestorTransaction.php
	--- a/src/applications/nuance/storage/NuanceRequestorTransaction.php
	+++ b/src/applications/nuance/storage/NuanceRequestorTransaction.php
	@@ -4,7 +4,7 @@
	extends NuanceTransaction {

	public function getApplicationTransactionType() {
	- return NuancePHIDTypeRequestor::TYPECONST;
	+ return NuanceRequestorPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	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
	@@ -20,7 +20,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(NuancePHIDTypeSource::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(NuanceSourcePHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/nuance/storage/NuanceSourceTransaction.php b/src/applications/nuance/storage/NuanceSourceTransaction.php
	--- a/src/applications/nuance/storage/NuanceSourceTransaction.php
	+++ b/src/applications/nuance/storage/NuanceSourceTransaction.php
	@@ -6,7 +6,7 @@
	const TYPE_NAME = 'name-source';

	public function getApplicationTransactionType() {
	- return NuancePHIDTypeSource::TYPECONST;
	+ return NuanceSourcePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClientAuthorization.php b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
	rename from src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClientAuthorization.php
	rename to src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
	--- a/src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClientAuthorization.php
	+++ b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientAuthorizationPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorOAuthServerPHIDTypeClientAuthorization
	+final class PhabricatorOAuthServerClientAuthorizationPHIDType
	extends PhabricatorPHIDType {

	const TYPECONST = 'OASA';
	diff --git a/src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClient.php b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
	rename from src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClient.php
	rename to src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
	--- a/src/applications/oauthserver/phid/PhabricatorOAuthServerPHIDTypeClient.php
	+++ b/src/applications/oauthserver/phid/PhabricatorOAuthServerClientPHIDType.php
	@@ -1,7 +1,6 @@
	<?php

	-final class PhabricatorOAuthServerPHIDTypeClient
	- extends PhabricatorPHIDType {
	+final class PhabricatorOAuthServerClientPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'OASC';

	diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php b/src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php
	--- a/src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php
	+++ b/src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php
	@@ -28,7 +28,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorOAuthServerPHIDTypeClientAuthorization::TYPECONST);
	+ PhabricatorOAuthServerClientAuthorizationPHIDType::TYPECONST);
	}

	public function getClient() {
	diff --git a/src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php
	--- a/src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php
	+++ b/src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php
	@@ -35,7 +35,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorOAuthServerPHIDTypeClient::TYPECONST);
	+ PhabricatorOAuthServerClientPHIDType::TYPECONST);
	}


	diff --git a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	--- a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	+++ b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	@@ -39,8 +39,8 @@

	protected static function queryByOwner($owner) {
	$is_valid_phid =
	- phid_get_type($owner) == PhabricatorPeoplePHIDTypeUser::TYPECONST \|\|
	- phid_get_type($owner) == PhabricatorProjectPHIDTypeProject::TYPECONST;
	+ phid_get_type($owner) == PhabricatorPeopleUserPHIDType::TYPECONST \|\|
	+ phid_get_type($owner) == PhabricatorProjectProjectPHIDType::TYPECONST;

	if (!$is_valid_phid) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	diff --git a/src/applications/owners/phid/PhabricatorOwnersPHIDTypePackage.php b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
	rename from src/applications/owners/phid/PhabricatorOwnersPHIDTypePackage.php
	rename to src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
	--- a/src/applications/owners/phid/PhabricatorOwnersPHIDTypePackage.php
	+++ b/src/applications/owners/phid/PhabricatorOwnersPackagePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorOwnersPHIDTypePackage extends PhabricatorPHIDType {
	+final class PhabricatorOwnersPackagePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'OPKG';

	diff --git a/src/applications/owners/storage/PhabricatorOwnersOwner.php b/src/applications/owners/storage/PhabricatorOwnersOwner.php
	--- a/src/applications/owners/storage/PhabricatorOwnersOwner.php
	+++ b/src/applications/owners/storage/PhabricatorOwnersOwner.php
	@@ -38,13 +38,13 @@
	$all_phids = phid_group_by_type(mpull($owners, 'getUserPHID'));

	$user_phids = idx($all_phids,
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	array());

	$users_in_project_phids = array();
	$project_phids = idx(
	$all_phids,
	- PhabricatorProjectPHIDTypeProject::TYPECONST);
	+ PhabricatorProjectProjectPHIDType::TYPECONST);
	if ($project_phids) {
	$query = id(new PhabricatorEdgeQuery())
	->withSourcePHIDs($project_phids)
	diff --git a/src/applications/passphrase/phid/PassphrasePHIDTypeCredential.php b/src/applications/passphrase/phid/PassphraseCredentialPHIDType.php
	rename from src/applications/passphrase/phid/PassphrasePHIDTypeCredential.php
	rename to src/applications/passphrase/phid/PassphraseCredentialPHIDType.php
	--- a/src/applications/passphrase/phid/PassphrasePHIDTypeCredential.php
	+++ b/src/applications/passphrase/phid/PassphraseCredentialPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PassphrasePHIDTypeCredential extends PhabricatorPHIDType {
	+final class PassphraseCredentialPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CDTL';

	diff --git a/src/applications/passphrase/storage/PassphraseCredential.php b/src/applications/passphrase/storage/PassphraseCredential.php
	--- a/src/applications/passphrase/storage/PassphraseCredential.php
	+++ b/src/applications/passphrase/storage/PassphraseCredential.php
	@@ -38,7 +38,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PassphrasePHIDTypeCredential::TYPECONST);
	+ PassphraseCredentialPHIDType::TYPECONST);
	}

	public function attachSecret(PhutilOpaqueEnvelope $secret = null) {
	diff --git a/src/applications/passphrase/storage/PassphraseCredentialTransaction.php b/src/applications/passphrase/storage/PassphraseCredentialTransaction.php
	--- a/src/applications/passphrase/storage/PassphraseCredentialTransaction.php
	+++ b/src/applications/passphrase/storage/PassphraseCredentialTransaction.php
	@@ -16,7 +16,7 @@
	}

	public function getApplicationTransactionType() {
	- return PassphrasePHIDTypeCredential::TYPECONST;
	+ return PassphraseCredentialPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/paste/phid/PhabricatorPastePHIDTypePaste.php b/src/applications/paste/phid/PhabricatorPastePastePHIDType.php
	rename from src/applications/paste/phid/PhabricatorPastePHIDTypePaste.php
	rename to src/applications/paste/phid/PhabricatorPastePastePHIDType.php
	--- a/src/applications/paste/phid/PhabricatorPastePHIDTypePaste.php
	+++ b/src/applications/paste/phid/PhabricatorPastePastePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPastePHIDTypePaste extends PhabricatorPHIDType {
	+final class PhabricatorPastePastePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PSTE';

	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
	@@ -45,7 +45,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorPastePHIDTypePaste::TYPECONST);
	+ PhabricatorPastePastePHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php
	--- a/src/applications/paste/storage/PhabricatorPasteTransaction.php
	+++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php
	@@ -12,7 +12,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorPastePHIDTypePaste::TYPECONST;
	+ return PhabricatorPastePastePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeExternal.php b/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
	rename from src/applications/people/phid/PhabricatorPeoplePHIDTypeExternal.php
	rename to src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
	--- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeExternal.php
	+++ b/src/applications/people/phid/PhabricatorPeopleExternalPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPeoplePHIDTypeExternal extends PhabricatorPHIDType {
	+final class PhabricatorPeopleExternalPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'XUSR';

	diff --git a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	rename from src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
	rename to src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	--- a/src/applications/people/phid/PhabricatorPeoplePHIDTypeUser.php
	+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPeoplePHIDTypeUser extends PhabricatorPHIDType {
	+final class PhabricatorPeopleUserPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'USER';

	@@ -50,7 +50,6 @@
	$handle->setTitle($status->getTerseSummary($query->getViewer()));
	}
	}
	-
	}

	public function canLoadNamedObject($name) {
	diff --git a/src/applications/people/search/PhabricatorUserSearchIndexer.php b/src/applications/people/search/PhabricatorUserSearchIndexer.php
	--- a/src/applications/people/search/PhabricatorUserSearchIndexer.php
	+++ b/src/applications/people/search/PhabricatorUserSearchIndexer.php
	@@ -12,7 +12,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($user->getPHID());
	- $doc->setDocumentType(PhabricatorPeoplePHIDTypeUser::TYPECONST);
	+ $doc->setDocumentType(PhabricatorPeopleUserPHIDType::TYPECONST);
	$doc->setDocumentTitle($user->getFullName());
	$doc->setDocumentCreated($user->getDateCreated());
	$doc->setDocumentModified($user->getDateModified());
	@@ -22,7 +22,7 @@
	? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	: PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	$user->getPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	time());

	return $doc;
	diff --git a/src/applications/people/storage/PhabricatorExternalAccount.php b/src/applications/people/storage/PhabricatorExternalAccount.php
	--- a/src/applications/people/storage/PhabricatorExternalAccount.php
	+++ b/src/applications/people/storage/PhabricatorExternalAccount.php
	@@ -30,7 +30,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorPeoplePHIDTypeExternal::TYPECONST);
	+ PhabricatorPeopleExternalPHIDType::TYPECONST);
	}

	public function getConfiguration() {
	diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
	--- a/src/applications/people/storage/PhabricatorUser.php
	+++ b/src/applications/people/storage/PhabricatorUser.php
	@@ -106,7 +106,7 @@
	* a normal session.
	*/
	public function getIsStandardUser() {
	- $type_user = PhabricatorPeoplePHIDTypeUser::TYPECONST;
	+ $type_user = PhabricatorPeopleUserPHIDType::TYPECONST;
	return $this->getPHID() && (phid_get_type($this->getPHID()) == $type_user);
	}

	@@ -118,7 +118,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST);
	+ PhabricatorPeopleUserPHIDType::TYPECONST);
	}

	public function setPassword(PhutilOpaqueEnvelope $envelope) {
	diff --git a/src/applications/people/storage/PhabricatorUserTransaction.php b/src/applications/people/storage/PhabricatorUserTransaction.php
	--- a/src/applications/people/storage/PhabricatorUserTransaction.php
	+++ b/src/applications/people/storage/PhabricatorUserTransaction.php
	@@ -8,7 +8,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorPeoplePHIDTypeUser::TYPECONST;
	+ return PhabricatorPeopleUserPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php b/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
	rename from src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php
	rename to src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
	--- a/src/applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php
	+++ b/src/applications/phame/phid/PhabricatorPhameBlogPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPhamePHIDTypeBlog extends PhabricatorPHIDType {
	+final class PhabricatorPhameBlogPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'BLOG';

	diff --git a/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php b/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
	rename from src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php
	rename to src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
	--- a/src/applications/phame/phid/PhabricatorPhamePHIDTypePost.php
	+++ b/src/applications/phame/phid/PhabricatorPhamePostPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorPhamePHIDTypePost extends PhabricatorPHIDType {
	+final class PhabricatorPhamePostPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'POST';

	diff --git a/src/applications/phame/storage/PhameBlog.php b/src/applications/phame/storage/PhameBlog.php
	--- a/src/applications/phame/storage/PhameBlog.php
	+++ b/src/applications/phame/storage/PhameBlog.php
	@@ -32,7 +32,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorPhamePHIDTypeBlog::TYPECONST);
	+ PhabricatorPhameBlogPHIDType::TYPECONST);
	}

	public function getSkinRenderer(AphrontRequest $request) {
	diff --git a/src/applications/phame/storage/PhamePost.php b/src/applications/phame/storage/PhamePost.php
	--- a/src/applications/phame/storage/PhamePost.php
	+++ b/src/applications/phame/storage/PhamePost.php
	@@ -93,7 +93,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorPhamePHIDTypePost::TYPECONST);
	+ PhabricatorPhamePostPHIDType::TYPECONST);
	}

	public function toDictionary() {
	diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
	--- a/src/applications/phid/PhabricatorObjectHandle.php
	+++ b/src/applications/phid/PhabricatorObjectHandle.php
	@@ -262,7 +262,7 @@
	$title = pht('Disabled'); // Overwrite status.
	}

	- if ($this->getType() == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	+ if ($this->getType() == PhabricatorPeopleUserPHIDType::TYPECONST) {
	$classes[] = 'phui-link-person';
	}

	@@ -295,7 +295,7 @@

	public function getLinkName() {
	switch ($this->getType()) {
	- case PhabricatorPeoplePHIDTypeUser::TYPECONST:
	+ case PhabricatorPeopleUserPHIDType::TYPECONST:
	$name = $this->getName();
	break;
	default:
	diff --git a/src/applications/phlux/phid/PhluxPHIDTypeVariable.php b/src/applications/phlux/phid/PhluxVariablePHIDType.php
	rename from src/applications/phlux/phid/PhluxPHIDTypeVariable.php
	rename to src/applications/phlux/phid/PhluxVariablePHIDType.php
	--- a/src/applications/phlux/phid/PhluxPHIDTypeVariable.php
	+++ b/src/applications/phlux/phid/PhluxVariablePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhluxPHIDTypeVariable extends PhabricatorPHIDType {
	+final class PhluxVariablePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PVAR';

	diff --git a/src/applications/phlux/storage/PhluxTransaction.php b/src/applications/phlux/storage/PhluxTransaction.php
	--- a/src/applications/phlux/storage/PhluxTransaction.php
	+++ b/src/applications/phlux/storage/PhluxTransaction.php
	@@ -10,7 +10,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhluxPHIDTypeVariable::TYPECONST;
	+ return PhluxVariablePHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/phlux/storage/PhluxVariable.php b/src/applications/phlux/storage/PhluxVariable.php
	--- a/src/applications/phlux/storage/PhluxVariable.php
	+++ b/src/applications/phlux/storage/PhluxVariable.php
	@@ -20,7 +20,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(PhluxPHIDTypeVariable::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(PhluxVariablePHIDType::TYPECONST);
	}


	diff --git a/src/applications/pholio/phid/PholioPHIDTypeImage.php b/src/applications/pholio/phid/PholioImagePHIDType.php
	rename from src/applications/pholio/phid/PholioPHIDTypeImage.php
	rename to src/applications/pholio/phid/PholioImagePHIDType.php
	--- a/src/applications/pholio/phid/PholioPHIDTypeImage.php
	+++ b/src/applications/pholio/phid/PholioImagePHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PholioPHIDTypeImage extends PhabricatorPHIDType {
	+final class PholioImagePHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PIMG';

	diff --git a/src/applications/pholio/phid/PholioPHIDTypeMock.php b/src/applications/pholio/phid/PholioMockPHIDType.php
	rename from src/applications/pholio/phid/PholioPHIDTypeMock.php
	rename to src/applications/pholio/phid/PholioMockPHIDType.php
	--- a/src/applications/pholio/phid/PholioPHIDTypeMock.php
	+++ b/src/applications/pholio/phid/PholioMockPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PholioPHIDTypeMock extends PhabricatorPHIDType {
	+final class PholioMockPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'MOCK';

	diff --git a/src/applications/pholio/search/PholioSearchIndexer.php b/src/applications/pholio/search/PholioSearchIndexer.php
	--- a/src/applications/pholio/search/PholioSearchIndexer.php
	+++ b/src/applications/pholio/search/PholioSearchIndexer.php
	@@ -21,7 +21,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$mock->getAuthorPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$mock->getDateCreated());

	$this->indexTransactions(
	diff --git a/src/applications/pholio/storage/PholioImage.php b/src/applications/pholio/storage/PholioImage.php
	--- a/src/applications/pholio/storage/PholioImage.php
	+++ b/src/applications/pholio/storage/PholioImage.php
	@@ -26,7 +26,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(PholioPHIDTypeImage::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(PholioImagePHIDType::TYPECONST);
	}

	public function attachFile(PhabricatorFile $file) {
	diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
	--- a/src/applications/pholio/storage/PholioTransaction.php
	+++ b/src/applications/pholio/storage/PholioTransaction.php
	@@ -7,7 +7,7 @@
	}

	public function getApplicationTransactionType() {
	- return PholioPHIDTypeMock::TYPECONST;
	+ return PholioMockPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php b/src/applications/phragment/phid/PhragmentFragmentPHIDType.php
	rename from src/applications/phragment/phid/PhragmentPHIDTypeFragment.php
	rename to src/applications/phragment/phid/PhragmentFragmentPHIDType.php
	--- a/src/applications/phragment/phid/PhragmentPHIDTypeFragment.php
	+++ b/src/applications/phragment/phid/PhragmentFragmentPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhragmentPHIDTypeFragment extends PhabricatorPHIDType {
	+final class PhragmentFragmentPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PHRF';

	diff --git a/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php b/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
	rename from src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php
	rename to src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
	--- a/src/applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php
	+++ b/src/applications/phragment/phid/PhragmentFragmentVersionPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhragmentPHIDTypeFragmentVersion extends PhabricatorPHIDType {
	+final class PhragmentFragmentVersionPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PHRV';

	diff --git a/src/applications/phragment/phid/PhragmentPHIDTypeSnapshot.php b/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
	rename from src/applications/phragment/phid/PhragmentPHIDTypeSnapshot.php
	rename to src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
	--- a/src/applications/phragment/phid/PhragmentPHIDTypeSnapshot.php
	+++ b/src/applications/phragment/phid/PhragmentSnapshotPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhragmentPHIDTypeSnapshot extends PhabricatorPHIDType {
	+final class PhragmentSnapshotPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PHRS';

	diff --git a/src/applications/phragment/storage/PhragmentFragment.php b/src/applications/phragment/storage/PhragmentFragment.php
	--- a/src/applications/phragment/storage/PhragmentFragment.php
	+++ b/src/applications/phragment/storage/PhragmentFragment.php
	@@ -19,7 +19,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhragmentPHIDTypeFragment::TYPECONST);
	+ PhragmentFragmentPHIDType::TYPECONST);
	}

	public function getURI() {
	diff --git a/src/applications/phragment/storage/PhragmentFragmentVersion.php b/src/applications/phragment/storage/PhragmentFragmentVersion.php
	--- a/src/applications/phragment/storage/PhragmentFragmentVersion.php
	+++ b/src/applications/phragment/storage/PhragmentFragmentVersion.php
	@@ -18,7 +18,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhragmentPHIDTypeFragmentVersion::TYPECONST);
	+ PhragmentFragmentVersionPHIDType::TYPECONST);
	}

	public function getURI() {
	diff --git a/src/applications/phragment/storage/PhragmentSnapshot.php b/src/applications/phragment/storage/PhragmentSnapshot.php
	--- a/src/applications/phragment/storage/PhragmentSnapshot.php
	+++ b/src/applications/phragment/storage/PhragmentSnapshot.php
	@@ -16,7 +16,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhragmentPHIDTypeSnapshot::TYPECONST);
	+ PhragmentSnapshotPHIDType::TYPECONST);
	}

	public function getURI() {
	diff --git a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php b/src/applications/phriction/phid/PhrictionDocumentPHIDType.php
	rename from src/applications/phriction/phid/PhrictionPHIDTypeDocument.php
	rename to src/applications/phriction/phid/PhrictionDocumentPHIDType.php
	--- a/src/applications/phriction/phid/PhrictionPHIDTypeDocument.php
	+++ b/src/applications/phriction/phid/PhrictionDocumentPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhrictionPHIDTypeDocument extends PhabricatorPHIDType {
	+final class PhrictionDocumentPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'WIKI';

	diff --git a/src/applications/phriction/search/PhrictionSearchIndexer.php b/src/applications/phriction/search/PhrictionSearchIndexer.php
	--- a/src/applications/phriction/search/PhrictionSearchIndexer.php
	+++ b/src/applications/phriction/search/PhrictionSearchIndexer.php
	@@ -17,7 +17,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($document->getPHID());
	- $doc->setDocumentType(PhrictionPHIDTypeDocument::TYPECONST);
	+ $doc->setDocumentType(PhrictionDocumentPHIDType::TYPECONST);
	$doc->setDocumentTitle($content->getTitle());

	// TODO: This isn't precisely correct, denormalize into the Document table?
	@@ -31,7 +31,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$content->getAuthorPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$content->getDateCreated());

	$doc->addRelationship(
	@@ -39,7 +39,7 @@
	? PhabricatorSearchRelationship::RELATIONSHIP_OPEN
	: PhabricatorSearchRelationship::RELATIONSHIP_CLOSED,
	$document->getPHID(),
	- PhrictionPHIDTypeDocument::TYPECONST,
	+ PhrictionDocumentPHIDType::TYPECONST,
	time());

	return $doc;
	diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
	--- a/src/applications/phriction/storage/PhrictionDocument.php
	+++ b/src/applications/phriction/storage/PhrictionDocument.php
	@@ -29,7 +29,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhrictionPHIDTypeDocument::TYPECONST);
	+ PhrictionDocumentPHIDType::TYPECONST);
	}

	public static function getSlugURI($slug, $type = 'document') {
	diff --git a/src/applications/policy/filter/PhabricatorPolicyFilter.php b/src/applications/policy/filter/PhabricatorPolicyFilter.php
	--- a/src/applications/policy/filter/PhabricatorPolicyFilter.php
	+++ b/src/applications/policy/filter/PhabricatorPolicyFilter.php
	@@ -141,7 +141,7 @@

	$policy = $this->getObjectPolicy($object, $capability);
	$type = phid_get_type($policy);
	- if ($type == PhabricatorProjectPHIDTypeProject::TYPECONST) {
	+ if ($type == PhabricatorProjectProjectPHIDType::TYPECONST) {
	$need_projects[$policy] = $policy;
	}

	@@ -266,13 +266,13 @@
	break;
	default:
	$type = phid_get_type($policy);
	- if ($type == PhabricatorProjectPHIDTypeProject::TYPECONST) {
	+ if ($type == PhabricatorProjectProjectPHIDType::TYPECONST) {
	if (!empty($this->userProjects[$viewer->getPHID()][$policy])) {
	return true;
	} else {
	$this->rejectObject($object, $policy, $capability);
	}
	- } else if ($type == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	+ } else if ($type == PhabricatorPeopleUserPHIDType::TYPECONST) {
	if ($viewer->getPHID() == $policy) {
	return true;
	} else {
	diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php
	--- a/src/applications/policy/storage/PhabricatorPolicy.php
	+++ b/src/applications/policy/storage/PhabricatorPolicy.php
	@@ -63,11 +63,11 @@

	$phid_type = phid_get_type($policy_identifier);
	switch ($phid_type) {
	- case PhabricatorProjectPHIDTypeProject::TYPECONST:
	+ case PhabricatorProjectProjectPHIDType::TYPECONST:
	$policy->setType(PhabricatorPolicyType::TYPE_PROJECT);
	$policy->setName($handle->getName());
	break;
	- case PhabricatorPeoplePHIDTypeUser::TYPECONST:
	+ case PhabricatorPeopleUserPHIDType::TYPECONST:
	$policy->setType(PhabricatorPolicyType::TYPE_USER);
	$policy->setName($handle->getFullName());
	break;
	@@ -204,11 +204,11 @@
	->executeOne();

	$type = phid_get_type($policy);
	- if ($type == PhabricatorProjectPHIDTypeProject::TYPECONST) {
	+ if ($type == PhabricatorProjectProjectPHIDType::TYPECONST) {
	return pht(
	'Members of the project "%s" can take this action.',
	$handle->getFullName());
	- } else if ($type == PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	+ } else if ($type == PhabricatorPeopleUserPHIDType::TYPECONST) {
	return pht(
	'%s can take this action.',
	$handle->getFullName());
	diff --git a/src/applications/ponder/phid/PonderPHIDTypeAnswer.php b/src/applications/ponder/phid/PonderAnswerPHIDType.php
	rename from src/applications/ponder/phid/PonderPHIDTypeAnswer.php
	rename to src/applications/ponder/phid/PonderAnswerPHIDType.php
	--- a/src/applications/ponder/phid/PonderPHIDTypeAnswer.php
	+++ b/src/applications/ponder/phid/PonderAnswerPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PonderPHIDTypeAnswer extends PhabricatorPHIDType {
	+final class PonderAnswerPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'ANSW';

	diff --git a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php b/src/applications/ponder/phid/PonderQuestionPHIDType.php
	rename from src/applications/ponder/phid/PonderPHIDTypeQuestion.php
	rename to src/applications/ponder/phid/PonderQuestionPHIDType.php
	--- a/src/applications/ponder/phid/PonderPHIDTypeQuestion.php
	+++ b/src/applications/ponder/phid/PonderQuestionPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PonderPHIDTypeQuestion extends PhabricatorPHIDType {
	+final class PonderQuestionPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'QUES';

	diff --git a/src/applications/ponder/search/PonderSearchIndexer.php b/src/applications/ponder/search/PonderSearchIndexer.php
	--- a/src/applications/ponder/search/PonderSearchIndexer.php
	+++ b/src/applications/ponder/search/PonderSearchIndexer.php
	@@ -22,7 +22,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$question->getAuthorPHID(),
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$question->getDateCreated());

	$answers = id(new PonderAnswerQuery())
	diff --git a/src/applications/ponder/storage/PonderAnswer.php b/src/applications/ponder/storage/PonderAnswer.php
	--- a/src/applications/ponder/storage/PonderAnswer.php
	+++ b/src/applications/ponder/storage/PonderAnswer.php
	@@ -70,8 +70,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(
	- PonderPHIDTypeAnswer::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(PonderAnswerPHIDType::TYPECONST);
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	diff --git a/src/applications/ponder/storage/PonderAnswerTransaction.php b/src/applications/ponder/storage/PonderAnswerTransaction.php
	--- a/src/applications/ponder/storage/PonderAnswerTransaction.php
	+++ b/src/applications/ponder/storage/PonderAnswerTransaction.php
	@@ -14,7 +14,7 @@
	}

	public function getApplicationTransactionType() {
	- return PonderPHIDTypeAnswer::TYPECONST;
	+ return PonderAnswerPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/ponder/storage/PonderQuestion.php b/src/applications/ponder/storage/PonderQuestion.php
	--- a/src/applications/ponder/storage/PonderQuestion.php
	+++ b/src/applications/ponder/storage/PonderQuestion.php
	@@ -36,7 +36,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(PonderPHIDTypeQuestion::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(PonderQuestionPHIDType::TYPECONST);
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php
	--- a/src/applications/ponder/storage/PonderQuestionTransaction.php
	+++ b/src/applications/ponder/storage/PonderQuestionTransaction.php
	@@ -17,7 +17,7 @@
	}

	public function getApplicationTransactionType() {
	- return PonderPHIDTypeQuestion::TYPECONST;
	+ return PonderQuestionPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php b/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
	rename from src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php
	rename to src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
	--- a/src/applications/project/phid/PhabricatorProjectPHIDTypeColumn.php
	+++ b/src/applications/project/phid/PhabricatorProjectColumnPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorProjectPHIDTypeColumn extends PhabricatorPHIDType {
	+final class PhabricatorProjectColumnPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PCOL';

	diff --git a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
	rename from src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php
	rename to src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
	--- a/src/applications/project/phid/PhabricatorProjectPHIDTypeProject.php
	+++ b/src/applications/project/phid/PhabricatorProjectProjectPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorProjectPHIDTypeProject extends PhabricatorPHIDType {
	+final class PhabricatorProjectProjectPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PROJ';

	diff --git a/src/applications/project/remarkup/ProjectRemarkupRule.php b/src/applications/project/remarkup/ProjectRemarkupRule.php
	--- a/src/applications/project/remarkup/ProjectRemarkupRule.php
	+++ b/src/applications/project/remarkup/ProjectRemarkupRule.php
	@@ -28,7 +28,7 @@
	// accept some false negatives -- like `#1` or `#dot.` -- in order to avoid
	// a bunch of false positives on general use of the `#` character.

	- // In other contexts, the PhabricatorProjectPHIDTypeProject pattern is
	+ // In other contexts, the PhabricatorProjectProjectPHIDType pattern is
	// controlling and these names should parse correctly.

	return '[^\s.!,:;{}#][^\s\d!,:;{}#]+(?:[^\s.!,:;{}#][^\s!,:;{}#])*';
	diff --git a/src/applications/project/search/PhabricatorProjectSearchIndexer.php b/src/applications/project/search/PhabricatorProjectSearchIndexer.php
	--- a/src/applications/project/search/PhabricatorProjectSearchIndexer.php
	+++ b/src/applications/project/search/PhabricatorProjectSearchIndexer.php
	@@ -12,7 +12,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($project->getPHID());
	- $doc->setDocumentType(PhabricatorProjectPHIDTypeProject::TYPECONST);
	+ $doc->setDocumentType(PhabricatorProjectProjectPHIDType::TYPECONST);
	$doc->setDocumentTitle($project->getName());
	$doc->setDocumentCreated($project->getDateCreated());
	$doc->setDocumentModified($project->getDateModified());
	@@ -22,7 +22,7 @@
	? PhabricatorSearchRelationship::RELATIONSHIP_CLOSED
	: PhabricatorSearchRelationship::RELATIONSHIP_OPEN,
	$project->getPHID(),
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	time());

	// NOTE: This could be more full-featured, but for now we're mostly
	@@ -30,4 +30,5 @@

	return $doc;
	}
	+
	}
	diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
	--- a/src/applications/project/storage/PhabricatorProject.php
	+++ b/src/applications/project/storage/PhabricatorProject.php
	@@ -124,7 +124,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorProjectPHIDTypeProject::TYPECONST);
	+ PhabricatorProjectProjectPHIDType::TYPECONST);
	}

	public function attachMemberPHIDs(array $phids) {
	diff --git a/src/applications/project/storage/PhabricatorProjectColumn.php b/src/applications/project/storage/PhabricatorProjectColumn.php
	--- a/src/applications/project/storage/PhabricatorProjectColumn.php
	+++ b/src/applications/project/storage/PhabricatorProjectColumn.php
	@@ -30,7 +30,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorProjectPHIDTypeColumn::TYPECONST);
	+ PhabricatorProjectColumnPHIDType::TYPECONST);
	}

	public function attachProject(PhabricatorProject $project) {
	diff --git a/src/applications/project/storage/PhabricatorProjectColumnTransaction.php b/src/applications/project/storage/PhabricatorProjectColumnTransaction.php
	--- a/src/applications/project/storage/PhabricatorProjectColumnTransaction.php
	+++ b/src/applications/project/storage/PhabricatorProjectColumnTransaction.php
	@@ -11,7 +11,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorProjectPHIDTypeColumn::TYPECONST;
	+ return PhabricatorProjectColumnPHIDType::TYPECONST;
	}

	public function getTitle() {
	diff --git a/src/applications/project/storage/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php
	--- a/src/applications/project/storage/PhabricatorProjectTransaction.php
	+++ b/src/applications/project/storage/PhabricatorProjectTransaction.php
	@@ -18,7 +18,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorProjectPHIDTypeProject::TYPECONST;
	+ return PhabricatorProjectProjectPHIDType::TYPECONST;
	}

	public function getRequiredHandlePHIDs() {
	diff --git a/src/applications/releeph/phid/ReleephPHIDTypeBranch.php b/src/applications/releeph/phid/ReleephBranchPHIDType.php
	rename from src/applications/releeph/phid/ReleephPHIDTypeBranch.php
	rename to src/applications/releeph/phid/ReleephBranchPHIDType.php
	--- a/src/applications/releeph/phid/ReleephPHIDTypeBranch.php
	+++ b/src/applications/releeph/phid/ReleephBranchPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ReleephPHIDTypeBranch extends PhabricatorPHIDType {
	+final class ReleephBranchPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'REBR';

	diff --git a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php b/src/applications/releeph/phid/ReleephProductPHIDType.php
	rename from src/applications/releeph/phid/ReleephPHIDTypeProduct.php
	rename to src/applications/releeph/phid/ReleephProductPHIDType.php
	--- a/src/applications/releeph/phid/ReleephPHIDTypeProduct.php
	+++ b/src/applications/releeph/phid/ReleephProductPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ReleephPHIDTypeProduct extends PhabricatorPHIDType {
	+final class ReleephProductPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'REPR';

	diff --git a/src/applications/releeph/phid/ReleephPHIDTypeRequest.php b/src/applications/releeph/phid/ReleephRequestPHIDType.php
	rename from src/applications/releeph/phid/ReleephPHIDTypeRequest.php
	rename to src/applications/releeph/phid/ReleephRequestPHIDType.php
	--- a/src/applications/releeph/phid/ReleephPHIDTypeRequest.php
	+++ b/src/applications/releeph/phid/ReleephRequestPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class ReleephPHIDTypeRequest extends PhabricatorPHIDType {
	+final class ReleephRequestPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'RERQ';

	diff --git a/src/applications/releeph/storage/ReleephBranch.php b/src/applications/releeph/storage/ReleephBranch.php
	--- a/src/applications/releeph/storage/ReleephBranch.php
	+++ b/src/applications/releeph/storage/ReleephBranch.php
	@@ -33,7 +33,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(ReleephPHIDTypeBranch::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(ReleephBranchPHIDType::TYPECONST);
	}

	public function getDetail($key, $default = null) {
	diff --git a/src/applications/releeph/storage/ReleephBranchTransaction.php b/src/applications/releeph/storage/ReleephBranchTransaction.php
	--- a/src/applications/releeph/storage/ReleephBranchTransaction.php
	+++ b/src/applications/releeph/storage/ReleephBranchTransaction.php
	@@ -8,7 +8,7 @@
	}

	public function getApplicationTransactionType() {
	- return ReleephPHIDTypeBranch::TYPECONST;
	+ return ReleephBranchPHIDType::TYPECONST;
	}

	}
	diff --git a/src/applications/releeph/storage/ReleephProductTransaction.php b/src/applications/releeph/storage/ReleephProductTransaction.php
	--- a/src/applications/releeph/storage/ReleephProductTransaction.php
	+++ b/src/applications/releeph/storage/ReleephProductTransaction.php
	@@ -10,7 +10,7 @@
	}

	public function getApplicationTransactionType() {
	- return ReleephPHIDTypeProduct::TYPECONST;
	+ return ReleephProductPHIDType::TYPECONST;
	}

	public function getColor() {
	diff --git a/src/applications/releeph/storage/ReleephProject.php b/src/applications/releeph/storage/ReleephProject.php
	--- a/src/applications/releeph/storage/ReleephProject.php
	+++ b/src/applications/releeph/storage/ReleephProject.php
	@@ -33,7 +33,7 @@
	}

	public function generatePHID() {
	- return PhabricatorPHID::generateNewPHID(ReleephPHIDTypeProduct::TYPECONST);
	+ return PhabricatorPHID::generateNewPHID(ReleephProductPHIDType::TYPECONST);
	}

	public function getDetail($key, $default = null) {
	diff --git a/src/applications/releeph/storage/ReleephRequest.php b/src/applications/releeph/storage/ReleephRequest.php
	--- a/src/applications/releeph/storage/ReleephRequest.php
	+++ b/src/applications/releeph/storage/ReleephRequest.php
	@@ -158,7 +158,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- ReleephPHIDTypeRequest::TYPECONST);
	+ ReleephRequestPHIDType::TYPECONST);
	}

	public function save() {
	diff --git a/src/applications/releeph/storage/ReleephRequestTransaction.php b/src/applications/releeph/storage/ReleephRequestTransaction.php
	--- a/src/applications/releeph/storage/ReleephRequestTransaction.php
	+++ b/src/applications/releeph/storage/ReleephRequestTransaction.php
	@@ -16,7 +16,7 @@
	}

	public function getApplicationTransactionType() {
	- return ReleephPHIDTypeRequest::TYPECONST;
	+ return ReleephRequestPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php b/src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php
	rename to src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeArcanistProject.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryArcanistProjectPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypeArcanistProject
	+final class PhabricatorRepositoryArcanistProjectPHIDType
	extends PhabricatorPHIDType {

	const TYPECONST = 'APRJ';
	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php
	rename to src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeCommit.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypeCommit extends PhabricatorPHIDType {
	+final class PhabricatorRepositoryCommitPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'CMIT';

	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php b/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php
	rename to src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeMirror.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryMirrorPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypeMirror extends PhabricatorPHIDType {
	+final class PhabricatorRepositoryMirrorPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'RMIR';

	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushEvent.php b/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushEvent.php
	rename to src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushEvent.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryPushEventPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypePushEvent extends PhabricatorPHIDType {
	+final class PhabricatorRepositoryPushEventPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PSHE';

	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushLog.php b/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushLog.php
	rename to src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypePushLog.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryPushLogPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypePushLog extends PhabricatorPHIDType {
	+final class PhabricatorRepositoryPushLogPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'PSHL';

	diff --git a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeRepository.php b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
	rename from src/applications/repository/phid/PhabricatorRepositoryPHIDTypeRepository.php
	rename to src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
	--- a/src/applications/repository/phid/PhabricatorRepositoryPHIDTypeRepository.php
	+++ b/src/applications/repository/phid/PhabricatorRepositoryRepositoryPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorRepositoryPHIDTypeRepository
	+final class PhabricatorRepositoryRepositoryPHIDType
	extends PhabricatorPHIDType {

	const TYPECONST = 'REPO';
	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
	@@ -20,7 +20,7 @@
	$request,
	'repositories',
	array(
	- PhabricatorRepositoryPHIDTypeRepository::TYPECONST,
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	)));

	$saved->setParameter(
	diff --git a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
	--- a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
	+++ b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php
	@@ -30,7 +30,7 @@

	$doc = new PhabricatorSearchAbstractDocument();
	$doc->setPHID($commit->getPHID());
	- $doc->setDocumentType(PhabricatorRepositoryPHIDTypeCommit::TYPECONST);
	+ $doc->setDocumentType(PhabricatorRepositoryCommitPHIDType::TYPECONST);
	$doc->setDocumentCreated($date_created);
	$doc->setDocumentModified($date_created);
	$doc->setDocumentTitle($title);
	@@ -43,7 +43,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR,
	$author_phid,
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	$date_created);
	}

	@@ -55,7 +55,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_PROJECT,
	$project_phid,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	$date_created);
	}
	}
	@@ -63,7 +63,7 @@
	$doc->addRelationship(
	PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY,
	$repository->getPHID(),
	- PhabricatorRepositoryPHIDTypeRepository::TYPECONST,
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST,
	$date_created);

	$comments = id(new PhabricatorAuditComment())->loadAllWhere(
	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
	@@ -75,7 +75,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypeRepository::TYPECONST);
	+ PhabricatorRepositoryRepositoryPHIDType::TYPECONST);
	}

	public function toDictionary() {
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
	@@ -27,7 +27,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypeArcanistProject::TYPECONST);
	+ PhabricatorRepositoryArcanistProjectPHIDType::TYPECONST);
	}

	// TODO: Remove. Also, T603.
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
	@@ -21,7 +21,7 @@
	}

	public function isUser() {
	- $user_type = PhabricatorPeoplePHIDTypeUser::TYPECONST;
	+ $user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
	return (phid_get_type($this->getAuditorPHID()) == $user_type);
	}

	diff --git a/src/applications/repository/storage/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
	@@ -68,7 +68,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypeCommit::TYPECONST);
	+ PhabricatorRepositoryCommitPHIDType::TYPECONST);
	}

	public function loadCommitData() {
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryMirror.php b/src/applications/repository/storage/PhabricatorRepositoryMirror.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryMirror.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryMirror.php
	@@ -22,7 +22,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypeMirror::TYPECONST);
	+ PhabricatorRepositoryMirrorPHIDType::TYPECONST);
	}

	public function attachRepository(PhabricatorRepository $repository) {
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryPushEvent.php
	@@ -33,7 +33,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypePushEvent::TYPECONST);
	+ PhabricatorRepositoryPushEventPHIDType::TYPECONST);
	}

	public function attachRepository(PhabricatorRepository $repository) {
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryPushLog.php
	@@ -76,7 +76,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorRepositoryPHIDTypePushLog::TYPECONST);
	+ PhabricatorRepositoryPushLogPHIDType::TYPECONST);
	}

	public function attachPushEvent(PhabricatorRepositoryPushEvent $push_event) {
	diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
	--- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
	+++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
	@@ -37,7 +37,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorRepositoryPHIDTypeRepository::TYPECONST;
	+ return PhabricatorRepositoryRepositoryPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	@@ -304,8 +304,8 @@
	->setAllowPartialResults(true)
	->setAllowedTypes(
	array(
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	- PhabricatorProjectPHIDTypeProject::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	+ PhabricatorProjectProjectPHIDType::TYPECONST,
	))
	->setObjectList($matches[1])
	->execute();
	diff --git a/src/applications/search/controller/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
	--- a/src/applications/search/controller/PhabricatorSearchAttachController.php
	+++ b/src/applications/search/controller/PhabricatorSearchAttachController.php
	@@ -240,19 +240,19 @@

	private function getStrings() {
	switch ($this->type) {
	- case DifferentialPHIDTypeRevision::TYPECONST:
	+ case DifferentialRevisionPHIDType::TYPECONST:
	$noun = 'Revisions';
	$selected = 'created';
	break;
	- case ManiphestPHIDTypeTask::TYPECONST:
	+ case ManiphestTaskPHIDType::TYPECONST:
	$noun = 'Tasks';
	$selected = 'assigned';
	break;
	- case PhabricatorRepositoryPHIDTypeCommit::TYPECONST:
	+ case PhabricatorRepositoryCommitPHIDType::TYPECONST:
	$noun = 'Commits';
	$selected = 'created';
	break;
	- case PholioPHIDTypeMock::TYPECONST:
	+ case PholioMockPHIDType::TYPECONST:
	$noun = 'Mocks';
	$selected = 'created';
	break;
	@@ -299,7 +299,7 @@
	}

	private function getFilters(array $strings) {
	- if ($this->type == PholioPHIDTypeMock::TYPECONST) {
	+ if ($this->type == PholioMockPHIDType::TYPECONST) {
	$filters = array(
	'created' => 'Created By Me',
	'all' => 'All '.$strings['target_plural_noun'],
	@@ -317,10 +317,10 @@
	}

	private function getEdgeType($src_type, $dst_type) {
	- $t_cmit = PhabricatorRepositoryPHIDTypeCommit::TYPECONST;
	- $t_task = ManiphestPHIDTypeTask::TYPECONST;
	- $t_drev = DifferentialPHIDTypeRevision::TYPECONST;
	- $t_mock = PholioPHIDTypeMock::TYPECONST;
	+ $t_cmit = PhabricatorRepositoryCommitPHIDType::TYPECONST;
	+ $t_task = ManiphestTaskPHIDType::TYPECONST;
	+ $t_drev = DifferentialRevisionPHIDType::TYPECONST;
	+ $t_mock = PholioMockPHIDType::TYPECONST;

	$map = array(
	$t_cmit => array(
	diff --git a/src/applications/search/controller/PhabricatorSearchSelectController.php b/src/applications/search/controller/PhabricatorSearchSelectController.php
	--- a/src/applications/search/controller/PhabricatorSearchSelectController.php
	+++ b/src/applications/search/controller/PhabricatorSearchSelectController.php
	@@ -31,7 +31,7 @@
	$query->setParameter('authorPHIDs', array($user->getPHID()));
	// TODO - if / when we allow pholio mocks to be archived, etc
	// update this
	- if ($this->type != PholioPHIDTypeMock::TYPECONST) {
	+ if ($this->type != PholioMockPHIDType::TYPECONST) {
	$query->setParameter('statuses', array($status_open));
	}
	break;
	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
	@@ -189,7 +189,7 @@
	case 'open-tasks':
	return $query
	->setParameter('statuses', array('open'))
	- ->setParameter('types', array(ManiphestPHIDTypeTask::TYPECONST));
	+ ->setParameter('types', array(ManiphestTaskPHIDType::TYPECONST));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	@@ -228,7 +228,7 @@
	$results = array_select_keys(
	$results,
	array(
	- ManiphestPHIDTypeTask::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST,
	)) + $results;

	return $results;
	diff --git a/src/applications/slowvote/phid/PhabricatorSlowvotePHIDTypePoll.php b/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
	rename from src/applications/slowvote/phid/PhabricatorSlowvotePHIDTypePoll.php
	rename to src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
	--- a/src/applications/slowvote/phid/PhabricatorSlowvotePHIDTypePoll.php
	+++ b/src/applications/slowvote/phid/PhabricatorSlowvotePollPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorSlowvotePHIDTypePoll extends PhabricatorPHIDType {
	+final class PhabricatorSlowvotePollPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'POLL';

	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
	@@ -50,7 +50,7 @@

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	- PhabricatorSlowvotePHIDTypePoll::TYPECONST);
	+ PhabricatorSlowvotePollPHIDType::TYPECONST);
	}

	public function getOptions() {
	diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
	--- a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
	+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
	@@ -14,7 +14,7 @@
	}

	public function getApplicationTransactionType() {
	- return PhabricatorSlowvotePHIDTypePoll::TYPECONST;
	+ return PhabricatorSlowvotePollPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	diff --git a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
	--- a/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
	+++ b/src/applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php
	@@ -37,7 +37,7 @@
	->withPHIDs(array($phid))
	->executeOne();

	- if (phid_get_type($phid) == PhabricatorProjectPHIDTypeProject::TYPECONST) {
	+ if (phid_get_type($phid) == PhabricatorProjectProjectPHIDType::TYPECONST) {
	// TODO: This is a big hack, but a weak argument for adding some kind
	// of "load for role" feature to ObjectQuery, and also not a really great
	// argument for adding some kind of "load extra stuff" feature to
	diff --git a/src/applications/tokens/phid/PhabricatorTokenPHIDTypeToken.php b/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
	rename from src/applications/tokens/phid/PhabricatorTokenPHIDTypeToken.php
	rename to src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
	--- a/src/applications/tokens/phid/PhabricatorTokenPHIDTypeToken.php
	+++ b/src/applications/tokens/phid/PhabricatorTokenTokenPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorTokenPHIDTypeToken extends PhabricatorPHIDType {
	+final class PhabricatorTokenTokenPHIDType extends PhabricatorPHIDType {

	const TYPECONST = 'TOKN';

	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
	@@ -45,7 +45,7 @@
	array('misc-4', pht('The World Burns')),
	);

	- $type = PhabricatorTokenPHIDTypeToken::TYPECONST;
	+ $type = PhabricatorTokenTokenPHIDType::TYPECONST;

	$tokens = array();
	foreach ($specs as $id => $spec) {
	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
	@@ -1145,7 +1145,7 @@
	}
	}

	- $project_type = PhabricatorProjectPHIDTypeProject::TYPECONST;
	+ $project_type = PhabricatorProjectProjectPHIDType::TYPECONST;
	foreach ($phids as $key => $phid) {
	if (phid_get_type($phid) != $project_type) {
	unset($phids[$key]);
	diff --git a/src/applications/transactions/phid/PhabricatorApplicationTransactionPHIDTypeTransaction.php b/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
	rename from src/applications/transactions/phid/PhabricatorApplicationTransactionPHIDTypeTransaction.php
	rename to src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
	--- a/src/applications/transactions/phid/PhabricatorApplicationTransactionPHIDTypeTransaction.php
	+++ b/src/applications/transactions/phid/PhabricatorApplicationTransactionTransactionPHIDType.php
	@@ -1,6 +1,6 @@
	<?php

	-final class PhabricatorApplicationTransactionPHIDTypeTransaction
	+final class PhabricatorApplicationTransactionTransactionPHIDType
	extends PhabricatorPHIDType {

	const TYPECONST = 'XACT';
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	@@ -93,7 +93,7 @@
	}

	public function generatePHID() {
	- $type = PhabricatorApplicationTransactionPHIDTypeTransaction::TYPECONST;
	+ $type = PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST;
	$subtype = $this->getApplicationTransactionType();

	return PhabricatorPHID::generateNewPHID($type, $subtype);
	diff --git a/src/applications/uiexample/examples/PhabricatorHovercardExample.php b/src/applications/uiexample/examples/PhabricatorHovercardExample.php
	--- a/src/applications/uiexample/examples/PhabricatorHovercardExample.php
	+++ b/src/applications/uiexample/examples/PhabricatorHovercardExample.php
	@@ -19,7 +19,7 @@

	$diff_handle = $this->createBasicDummyHandle(
	'D123',
	- DifferentialPHIDTypeRevision::TYPECONST,
	+ DifferentialRevisionPHIDType::TYPECONST,
	'Introduce cooler Differential Revisions');

	$panel = $this->createPanel('Differential Hovercard');
	@@ -33,7 +33,7 @@

	$task_handle = $this->createBasicDummyHandle(
	'T123',
	- ManiphestPHIDTypeTask::TYPECONST,
	+ ManiphestTaskPHIDType::TYPECONST,
	'Improve Mobile Experience for Phabricator');

	$tag = id(new PHUITagView())
	@@ -52,7 +52,7 @@

	$user_handle = $this->createBasicDummyHandle(
	'gwashington',
	- PhabricatorPeoplePHIDTypeUser::TYPECONST,
	+ PhabricatorPeopleUserPHIDType::TYPECONST,
	'George Washington');
	$user_handle->setImageURI(
	celerity_get_resource_uri('/rsrc/image/people/washington.png'));
	diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
	--- a/src/view/phui/PHUIFeedStoryView.php
	+++ b/src/view/phui/PHUIFeedStoryView.php
	@@ -255,19 +255,19 @@

	public function setAppIconFromPHID($phid) {
	switch (phid_get_type($phid)) {
	- case PholioPHIDTypeMock::TYPECONST:
	+ case PholioMockPHIDType::TYPECONST:
	$this->setAppIcon('pholio-dark');
	break;
	- case PhabricatorMacroPHIDTypeMacro::TYPECONST:
	+ case PhabricatorMacroMacroPHIDType::TYPECONST:
	$this->setAppIcon('macro-dark');
	break;
	- case ManiphestPHIDTypeTask::TYPECONST:
	+ case ManiphestTaskPHIDType::TYPECONST:
	$this->setAppIcon('maniphest-dark');
	break;
	- case DifferentialPHIDTypeRevision::TYPECONST:
	+ case DifferentialRevisionPHIDType::TYPECONST:
	$this->setAppIcon('differential-dark');
	break;
	- case PhabricatorCalendarPHIDTypeEvent::TYPECONST:
	+ case PhabricatorCalendarEventPHIDType::TYPECONST:
	$this->setAppIcon('calendar-dark');
	break;
	}

File Metadata

Mime Type: text/plain
Expires: Nov 10 2025, 1:20 PM (6 w, 15 h ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/rx/ws/2zk7rdkx4vk4tfz7
Default Alt Text: D9986.id.largetrue.diff (246 KB)

D9986.id.largetrue.diffNo OneTemporaryActions

D9986.id.largetrue.diffView Options

File Metadata

Event Timeline

D9986.id.largetrue.diff
No OneTemporary
Actions

D9986.id.largetrue.diff
View Options