D9991.id24092.largetrue.diff
No OneTemporary
Actions

Size

251 KB

Referenced Files

None

Subscribers

None

D9991.id24092.largetrue.diff
View Options

	diff --git a/.arclint b/.arclint
	--- a/.arclint
	+++ b/.arclint
	@@ -78,7 +78,6 @@
	"16": "advice",
	"34": "error"
	},
	- "xhpast.naminghook": "PhabricatorSymbolNameLinter",
	"xhpast.php-version": "5.2.3",
	"xhpast.php-version.windows": "5.3.0"
	}
	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
	@@ -92,7 +92,11 @@
	'AphrontUsageException' => 'aphront/exception/AphrontUsageException.php',
	'AphrontView' => 'view/AphrontView.php',
	'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php',
	+ 'ArcanistConduitAPIMethod' => 'applications/arcanist/conduit/ArcanistConduitAPIMethod.php',
	+ 'ArcanistProjectInfoConduitAPIMethod' => 'applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php',
	'AuditActionMenuEventListener' => 'applications/audit/events/AuditActionMenuEventListener.php',
	+ 'AuditConduitAPIMethod' => 'applications/audit/conduit/AuditConduitAPIMethod.php',
	+ 'AuditQueryConduitAPIMethod' => 'applications/audit/conduit/AuditQueryConduitAPIMethod.php',
	'CalendarColors' => 'applications/calendar/constants/CalendarColors.php',
	'CalendarConstants' => 'applications/calendar/constants/CalendarConstants.php',
	'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php',
	@@ -112,173 +116,28 @@
	'CelerityResourcesOnDisk' => 'infrastructure/celerity/resources/CelerityResourcesOnDisk.php',
	'CeleritySpriteGenerator' => 'infrastructure/celerity/CeleritySpriteGenerator.php',
	'CelerityStaticResourceResponse' => 'infrastructure/celerity/CelerityStaticResourceResponse.php',
	+ 'ChatLogConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogConduitAPIMethod.php',
	+ 'ChatLogQueryConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php',
	+ 'ChatLogRecordConduitAPIMethod' => 'applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php',
	'ConduitAPIMethod' => 'applications/conduit/method/ConduitAPIMethod.php',
	'ConduitAPIRequest' => 'applications/conduit/protocol/ConduitAPIRequest.php',
	'ConduitAPIResponse' => 'applications/conduit/protocol/ConduitAPIResponse.php',
	- 'ConduitAPI_arcanist_Method' => 'applications/arcanist/conduit/ConduitAPI_arcanist_Method.php',
	- 'ConduitAPI_arcanist_projectinfo_Method' => 'applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php',
	- 'ConduitAPI_audit_Method' => 'applications/audit/conduit/ConduitAPI_audit_Method.php',
	- 'ConduitAPI_audit_query_Method' => 'applications/audit/conduit/ConduitAPI_audit_query_Method.php',
	- 'ConduitAPI_chatlog_Method' => 'applications/chatlog/conduit/ConduitAPI_chatlog_Method.php',
	- 'ConduitAPI_chatlog_query_Method' => 'applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php',
	- 'ConduitAPI_chatlog_record_Method' => 'applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php',
	- 'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/ConduitAPI_conduit_connect_Method.php',
	- 'ConduitAPI_conduit_getcertificate_Method' => 'applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php',
	- 'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/ConduitAPI_conduit_ping_Method.php',
	- 'ConduitAPI_conduit_query_Method' => 'applications/conduit/method/ConduitAPI_conduit_query_Method.php',
	- 'ConduitAPI_conpherence_Method' => 'applications/conpherence/conduit/ConduitAPI_conpherence_Method.php',
	- 'ConduitAPI_conpherence_createthread_Method' => 'applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php',
	- 'ConduitAPI_conpherence_querythread_Method' => 'applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php',
	- 'ConduitAPI_conpherence_querytransaction_Method' => 'applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php',
	- 'ConduitAPI_conpherence_updatethread_Method' => 'applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php',
	- 'ConduitAPI_differential_Method' => 'applications/differential/conduit/ConduitAPI_differential_Method.php',
	- 'ConduitAPI_differential_close_Method' => 'applications/differential/conduit/ConduitAPI_differential_close_Method.php',
	- 'ConduitAPI_differential_createcomment_Method' => 'applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php',
	- 'ConduitAPI_differential_creatediff_Method' => 'applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php',
	- 'ConduitAPI_differential_createinline_Method' => 'applications/differential/conduit/ConduitAPI_differential_createinline_Method.php',
	- 'ConduitAPI_differential_createrawdiff_Method' => 'applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php',
	- 'ConduitAPI_differential_createrevision_Method' => 'applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php',
	- 'ConduitAPI_differential_find_Method' => 'applications/differential/conduit/ConduitAPI_differential_find_Method.php',
	- 'ConduitAPI_differential_finishpostponedlinters_Method' => 'applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php',
	- 'ConduitAPI_differential_getalldiffs_Method' => 'applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php',
	- 'ConduitAPI_differential_getcommitmessage_Method' => 'applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php',
	- 'ConduitAPI_differential_getcommitpaths_Method' => 'applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php',
	- 'ConduitAPI_differential_getdiff_Method' => 'applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php',
	- 'ConduitAPI_differential_getrawdiff_Method' => 'applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php',
	- 'ConduitAPI_differential_getrevision_Method' => 'applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php',
	- 'ConduitAPI_differential_getrevisioncomments_Method' => 'applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php',
	- 'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php',
	- 'ConduitAPI_differential_query_Method' => 'applications/differential/conduit/ConduitAPI_differential_query_Method.php',
	- 'ConduitAPI_differential_querydiffs_Method' => 'applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php',
	- 'ConduitAPI_differential_setdiffproperty_Method' => 'applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php',
	- 'ConduitAPI_differential_updaterevision_Method' => 'applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php',
	- 'ConduitAPI_differential_updateunitresults_Method' => 'applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php',
	- 'ConduitAPI_diffusion_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_Method.php',
	- 'ConduitAPI_diffusion_abstractquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php',
	- 'ConduitAPI_diffusion_branchquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_branchquery_Method.php',
	- 'ConduitAPI_diffusion_browsequery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php',
	- 'ConduitAPI_diffusion_commitparentsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php',
	- 'ConduitAPI_diffusion_createcomment_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php',
	- 'ConduitAPI_diffusion_diffquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php',
	- 'ConduitAPI_diffusion_existsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php',
	- 'ConduitAPI_diffusion_filecontentquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php',
	- 'ConduitAPI_diffusion_findsymbols_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php',
	- 'ConduitAPI_diffusion_getcommits_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php',
	- 'ConduitAPI_diffusion_getlintmessages_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php',
	- 'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php',
	- 'ConduitAPI_diffusion_historyquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php',
	- 'ConduitAPI_diffusion_lastmodifiedquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_lastmodifiedquery_Method.php',
	- 'ConduitAPI_diffusion_looksoon_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_looksoon_Method.php',
	- 'ConduitAPI_diffusion_mergedcommitsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php',
	- 'ConduitAPI_diffusion_querycommits_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_querycommits_Method.php',
	- 'ConduitAPI_diffusion_querypaths_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_querypaths_Method.php',
	- 'ConduitAPI_diffusion_rawdiffquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php',
	- 'ConduitAPI_diffusion_readmequery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_readmequery_Method.php',
	- 'ConduitAPI_diffusion_refsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php',
	- 'ConduitAPI_diffusion_resolverefs_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_resolverefs_Method.php',
	- 'ConduitAPI_diffusion_searchquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php',
	- 'ConduitAPI_diffusion_tagsquery_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_tagsquery_Method.php',
	- 'ConduitAPI_diffusion_updatecoverage_Method' => 'applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php',
	- 'ConduitAPI_feed_Method' => 'applications/feed/conduit/ConduitAPI_feed_Method.php',
	- 'ConduitAPI_feed_publish_Method' => 'applications/feed/conduit/ConduitAPI_feed_publish_Method.php',
	- 'ConduitAPI_feed_query_Method' => 'applications/feed/conduit/ConduitAPI_feed_query_Method.php',
	- 'ConduitAPI_file_Method' => 'applications/files/conduit/ConduitAPI_file_Method.php',
	- 'ConduitAPI_file_download_Method' => 'applications/files/conduit/ConduitAPI_file_download_Method.php',
	- 'ConduitAPI_file_info_Method' => 'applications/files/conduit/ConduitAPI_file_info_Method.php',
	- 'ConduitAPI_file_upload_Method' => 'applications/files/conduit/ConduitAPI_file_upload_Method.php',
	- 'ConduitAPI_file_uploadhash_Method' => 'applications/files/conduit/ConduitAPI_file_uploadhash_Method.php',
	- 'ConduitAPI_flag_Method' => 'applications/flag/conduit/ConduitAPI_flag_Method.php',
	- 'ConduitAPI_flag_delete_Method' => 'applications/flag/conduit/ConduitAPI_flag_delete_Method.php',
	- 'ConduitAPI_flag_edit_Method' => 'applications/flag/conduit/ConduitAPI_flag_edit_Method.php',
	- 'ConduitAPI_flag_query_Method' => 'applications/flag/conduit/ConduitAPI_flag_query_Method.php',
	- 'ConduitAPI_harbormaster_Method' => 'applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php',
	- 'ConduitAPI_harbormaster_querybuildables_Method' => 'applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuildables_Method.php',
	- 'ConduitAPI_harbormaster_querybuilds_Method' => 'applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuilds_Method.php',
	- 'ConduitAPI_harbormaster_sendmessage_Method' => 'applications/harbormaster/conduit/ConduitAPI_harbormaster_sendmessage_Method.php',
	- 'ConduitAPI_macro_Method' => 'applications/macro/conduit/ConduitAPI_macro_Method.php',
	- 'ConduitAPI_macro_creatememe_Method' => 'applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php',
	- 'ConduitAPI_macro_query_Method' => 'applications/macro/conduit/ConduitAPI_macro_query_Method.php',
	- 'ConduitAPI_maniphest_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_Method.php',
	- 'ConduitAPI_maniphest_createtask_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php',
	- 'ConduitAPI_maniphest_find_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php',
	- 'ConduitAPI_maniphest_gettasktransactions_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php',
	- 'ConduitAPI_maniphest_info_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php',
	- 'ConduitAPI_maniphest_query_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php',
	- 'ConduitAPI_maniphest_querystatuses_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php',
	- 'ConduitAPI_maniphest_update_Method' => 'applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php',
	- 'ConduitAPI_nuance_Method' => 'applications/nuance/conduit/ConduitAPI_nuance_Method.php',
	- 'ConduitAPI_nuance_createitem_Method' => 'applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php',
	- 'ConduitAPI_owners_Method' => 'applications/owners/conduit/ConduitAPI_owners_Method.php',
	- 'ConduitAPI_owners_query_Method' => 'applications/owners/conduit/ConduitAPI_owners_query_Method.php',
	- 'ConduitAPI_paste_Method' => 'applications/paste/conduit/ConduitAPI_paste_Method.php',
	- 'ConduitAPI_paste_create_Method' => 'applications/paste/conduit/ConduitAPI_paste_create_Method.php',
	- 'ConduitAPI_paste_info_Method' => 'applications/paste/conduit/ConduitAPI_paste_info_Method.php',
	- 'ConduitAPI_paste_query_Method' => 'applications/paste/conduit/ConduitAPI_paste_query_Method.php',
	- 'ConduitAPI_phame_Method' => 'applications/phame/conduit/ConduitAPI_phame_Method.php',
	- 'ConduitAPI_phame_createpost_Method' => 'applications/phame/conduit/ConduitAPI_phame_createpost_Method.php',
	- 'ConduitAPI_phame_query_Method' => 'applications/phame/conduit/ConduitAPI_phame_query_Method.php',
	- 'ConduitAPI_phame_queryposts_Method' => 'applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php',
	- 'ConduitAPI_phid_Method' => 'applications/phid/conduit/ConduitAPI_phid_Method.php',
	- 'ConduitAPI_phid_info_Method' => 'applications/phid/conduit/ConduitAPI_phid_info_Method.php',
	- 'ConduitAPI_phid_lookup_Method' => 'applications/phid/conduit/ConduitAPI_phid_lookup_Method.php',
	- 'ConduitAPI_phid_query_Method' => 'applications/phid/conduit/ConduitAPI_phid_query_Method.php',
	- 'ConduitAPI_phragment_Method' => 'applications/phragment/conduit/ConduitAPI_phragment_Method.php',
	- 'ConduitAPI_phragment_getpatch_Method' => 'applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php',
	- 'ConduitAPI_phragment_queryfragments_Method' => 'applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php',
	- 'ConduitAPI_phrequent_Method' => 'applications/phrequent/conduit/ConduitAPI_phrequent_Method.php',
	- 'ConduitAPI_phrequent_pop_Method' => 'applications/phrequent/conduit/ConduitAPI_phrequent_pop_Method.php',
	- 'ConduitAPI_phrequent_push_Method' => 'applications/phrequent/conduit/ConduitAPI_phrequent_push_Method.php',
	- 'ConduitAPI_phrequent_tracking_Method' => 'applications/phrequent/conduit/ConduitAPI_phrequent_tracking_Method.php',
	- 'ConduitAPI_phriction_Method' => 'applications/phriction/conduit/ConduitAPI_phriction_Method.php',
	- 'ConduitAPI_phriction_edit_Method' => 'applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php',
	- 'ConduitAPI_phriction_history_Method' => 'applications/phriction/conduit/ConduitAPI_phriction_history_Method.php',
	- 'ConduitAPI_phriction_info_Method' => 'applications/phriction/conduit/ConduitAPI_phriction_info_Method.php',
	- 'ConduitAPI_project_Method' => 'applications/project/conduit/ConduitAPI_project_Method.php',
	- 'ConduitAPI_project_query_Method' => 'applications/project/conduit/ConduitAPI_project_query_Method.php',
	- 'ConduitAPI_releeph_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_Method.php',
	- 'ConduitAPI_releeph_getbranches_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php',
	- 'ConduitAPI_releeph_projectinfo_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php',
	- 'ConduitAPI_releeph_querybranches_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_querybranches_Method.php',
	- 'ConduitAPI_releeph_queryproducts_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_queryproducts_Method.php',
	- 'ConduitAPI_releeph_queryrequests_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php',
	- 'ConduitAPI_releeph_request_Method' => 'applications/releeph/conduit/ConduitAPI_releeph_request_Method.php',
	- 'ConduitAPI_releephwork_canpush_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php',
	- 'ConduitAPI_releephwork_getauthorinfo_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php',
	- 'ConduitAPI_releephwork_getbranch_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php',
	- 'ConduitAPI_releephwork_getbranchcommitmessage_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php',
	- 'ConduitAPI_releephwork_getcommitmessage_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php',
	- 'ConduitAPI_releephwork_nextrequest_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php',
	- 'ConduitAPI_releephwork_record_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php',
	- 'ConduitAPI_releephwork_recordpickstatus_Method' => 'applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php',
	- 'ConduitAPI_remarkup_process_Method' => 'applications/remarkup/conduit/ConduitAPI_remarkup_process_Method.php',
	- 'ConduitAPI_repository_Method' => 'applications/repository/conduit/ConduitAPI_repository_Method.php',
	- 'ConduitAPI_repository_create_Method' => 'applications/repository/conduit/ConduitAPI_repository_create_Method.php',
	- 'ConduitAPI_repository_query_Method' => 'applications/repository/conduit/ConduitAPI_repository_query_Method.php',
	- 'ConduitAPI_slowvote_Method' => 'applications/slowvote/conduit/ConduitAPI_slowvote_Method.php',
	- 'ConduitAPI_slowvote_info_Method' => 'applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php',
	- 'ConduitAPI_token_Method' => 'applications/tokens/conduit/ConduitAPI_token_Method.php',
	- 'ConduitAPI_token_give_Method' => 'applications/tokens/conduit/ConduitAPI_token_give_Method.php',
	- 'ConduitAPI_token_given_Method' => 'applications/tokens/conduit/ConduitAPI_token_given_Method.php',
	- 'ConduitAPI_token_query_Method' => 'applications/tokens/conduit/ConduitAPI_token_query_Method.php',
	- 'ConduitAPI_user_Method' => 'applications/people/conduit/ConduitAPI_user_Method.php',
	- 'ConduitAPI_user_addstatus_Method' => 'applications/people/conduit/ConduitAPI_user_addstatus_Method.php',
	- 'ConduitAPI_user_disable_Method' => 'applications/people/conduit/ConduitAPI_user_disable_Method.php',
	- 'ConduitAPI_user_enable_Method' => 'applications/people/conduit/ConduitAPI_user_enable_Method.php',
	- 'ConduitAPI_user_find_Method' => 'applications/people/conduit/ConduitAPI_user_find_Method.php',
	- 'ConduitAPI_user_info_Method' => 'applications/people/conduit/ConduitAPI_user_info_Method.php',
	- 'ConduitAPI_user_query_Method' => 'applications/people/conduit/ConduitAPI_user_query_Method.php',
	- 'ConduitAPI_user_removestatus_Method' => 'applications/people/conduit/ConduitAPI_user_removestatus_Method.php',
	- 'ConduitAPI_user_whoami_Method' => 'applications/people/conduit/ConduitAPI_user_whoami_Method.php',
	'ConduitCall' => 'applications/conduit/call/ConduitCall.php',
	'ConduitCallTestCase' => 'applications/conduit/call/__tests__/ConduitCallTestCase.php',
	+ 'ConduitConnectConduitAPIMethod' => 'applications/conduit/method/ConduitConnectConduitAPIMethod.php',
	'ConduitConnectionGarbageCollector' => 'applications/conduit/garbagecollector/ConduitConnectionGarbageCollector.php',
	'ConduitException' => 'applications/conduit/protocol/ConduitException.php',
	+ 'ConduitGetCertificateConduitAPIMethod' => 'applications/conduit/method/ConduitGetCertificateConduitAPIMethod.php',
	'ConduitLogGarbageCollector' => 'applications/conduit/garbagecollector/ConduitLogGarbageCollector.php',
	+ 'ConduitPingConduitAPIMethod' => 'applications/conduit/method/ConduitPingConduitAPIMethod.php',
	+ 'ConduitQueryConduitAPIMethod' => 'applications/conduit/method/ConduitQueryConduitAPIMethod.php',
	'ConduitSSHWorkflow' => 'applications/conduit/ssh/ConduitSSHWorkflow.php',
	'ConpherenceActionMenuEventListener' => 'applications/conpherence/events/ConpherenceActionMenuEventListener.php',
	+ 'ConpherenceConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceConduitAPIMethod.php',
	'ConpherenceConfigOptions' => 'applications/conpherence/config/ConpherenceConfigOptions.php',
	'ConpherenceConstants' => 'applications/conpherence/constants/ConpherenceConstants.php',
	'ConpherenceController' => 'applications/conpherence/controller/ConpherenceController.php',
	+ 'ConpherenceCreateThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php',
	'ConpherenceCreateThreadMailReceiver' => 'applications/conpherence/mail/ConpherenceCreateThreadMailReceiver.php',
	'ConpherenceDAO' => 'applications/conpherence/storage/ConpherenceDAO.php',
	'ConpherenceEditor' => 'applications/conpherence/editor/ConpherenceEditor.php',
	@@ -294,6 +153,8 @@
	'ConpherenceParticipantQuery' => 'applications/conpherence/query/ConpherenceParticipantQuery.php',
	'ConpherenceParticipationStatus' => 'applications/conpherence/constants/ConpherenceParticipationStatus.php',
	'ConpherencePeopleWidgetView' => 'applications/conpherence/view/ConpherencePeopleWidgetView.php',
	+ 'ConpherenceQueryThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php',
	+ 'ConpherenceQueryTransactionConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php',
	'ConpherenceReplyHandler' => 'applications/conpherence/mail/ConpherenceReplyHandler.php',
	'ConpherenceSettings' => 'applications/conpherence/constants/ConpherenceSettings.php',
	'ConpherenceThread' => 'applications/conpherence/storage/ConpherenceThread.php',
	@@ -307,6 +168,7 @@
	'ConpherenceTransactionView' => 'applications/conpherence/view/ConpherenceTransactionView.php',
	'ConpherenceUpdateActions' => 'applications/conpherence/constants/ConpherenceUpdateActions.php',
	'ConpherenceUpdateController' => 'applications/conpherence/controller/ConpherenceUpdateController.php',
	+ 'ConpherenceUpdateThreadConduitAPIMethod' => 'applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php',
	'ConpherenceViewController' => 'applications/conpherence/controller/ConpherenceViewController.php',
	'ConpherenceWidgetController' => 'applications/conpherence/controller/ConpherenceWidgetController.php',
	'ConpherenceWidgetView' => 'applications/conpherence/view/ConpherenceWidgetView.php',
	@@ -353,14 +215,21 @@
	'DifferentialChangesetTwoUpRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpRenderer.php',
	'DifferentialChangesetTwoUpTestRenderer' => 'applications/differential/render/DifferentialChangesetTwoUpTestRenderer.php',
	'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
	+ 'DifferentialCloseConduitAPIMethod' => 'applications/differential/conduit/DifferentialCloseConduitAPIMethod.php',
	'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
	'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
	'DifferentialCommitMessageParser' => 'applications/differential/parser/DifferentialCommitMessageParser.php',
	'DifferentialCommitMessageParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCommitMessageParserTestCase.php',
	'DifferentialCommitsField' => 'applications/differential/customfield/DifferentialCommitsField.php',
	+ 'DifferentialConduitAPIMethod' => 'applications/differential/conduit/DifferentialConduitAPIMethod.php',
	'DifferentialConflictsField' => 'applications/differential/customfield/DifferentialConflictsField.php',
	'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
	'DifferentialCoreCustomField' => 'applications/differential/customfield/DifferentialCoreCustomField.php',
	+ 'DifferentialCreateCommentConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php',
	+ 'DifferentialCreateDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php',
	+ 'DifferentialCreateInlineConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php',
	+ 'DifferentialCreateRawDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php',
	+ 'DifferentialCreateRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialCreateRevisionConduitAPIMethod.php',
	'DifferentialCustomField' => 'applications/differential/customfield/DifferentialCustomField.php',
	'DifferentialCustomFieldDependsOnParser' => 'applications/differential/parser/DifferentialCustomFieldDependsOnParser.php',
	'DifferentialCustomFieldDependsOnParserTestCase' => 'applications/differential/parser/__tests__/DifferentialCustomFieldDependsOnParserTestCase.php',
	@@ -384,6 +253,15 @@
	'DifferentialEditPolicyField' => 'applications/differential/customfield/DifferentialEditPolicyField.php',
	'DifferentialFieldParseException' => 'applications/differential/exception/DifferentialFieldParseException.php',
	'DifferentialFieldValidationException' => 'applications/differential/exception/DifferentialFieldValidationException.php',
	+ 'DifferentialFindConduitAPIMethod' => 'applications/differential/conduit/DifferentialFindConduitAPIMethod.php',
	+ 'DifferentialFinishPostponedLintersConduitAPIMethod' => 'applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php',
	+ 'DifferentialGetAllDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php',
	+ 'DifferentialGetCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php',
	+ 'DifferentialGetCommitPathsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php',
	+ 'DifferentialGetDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetDiffConduitAPIMethod.php',
	+ 'DifferentialGetRawDiffConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRawDiffConduitAPIMethod.php',
	+ 'DifferentialGetRevisionCommentsConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRevisionCommentsConduitAPIMethod.php',
	+ 'DifferentialGetRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php',
	'DifferentialGetWorkingCopy' => 'applications/differential/DifferentialGetWorkingCopy.php',
	'DifferentialGitSVNIDField' => 'applications/differential/customfield/DifferentialGitSVNIDField.php',
	'DifferentialHostField' => 'applications/differential/customfield/DifferentialHostField.php',
	@@ -415,11 +293,14 @@
	'DifferentialPHIDTypeDiff' => 'applications/differential/phid/DifferentialPHIDTypeDiff.php',
	'DifferentialPHIDTypeRevision' => 'applications/differential/phid/DifferentialPHIDTypeRevision.php',
	'DifferentialParseCacheGarbageCollector' => 'applications/differential/garbagecollector/DifferentialParseCacheGarbageCollector.php',
	+ 'DifferentialParseCommitMessageConduitAPIMethod' => 'applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php',
	'DifferentialParseRenderTestCase' => 'applications/differential/__tests__/DifferentialParseRenderTestCase.php',
	'DifferentialPathField' => 'applications/differential/customfield/DifferentialPathField.php',
	'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php',
	'DifferentialProjectReviewersField' => 'applications/differential/customfield/DifferentialProjectReviewersField.php',
	'DifferentialProjectsField' => 'applications/differential/customfield/DifferentialProjectsField.php',
	+ 'DifferentialQueryConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryConduitAPIMethod.php',
	+ 'DifferentialQueryDiffsConduitAPIMethod' => 'applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php',
	'DifferentialRawDiffRenderer' => 'applications/differential/render/DifferentialRawDiffRenderer.php',
	'DifferentialReleephRequestFieldSpecification' => 'applications/releeph/differential/DifferentialReleephRequestFieldSpecification.php',
	'DifferentialRemarkupRule' => 'applications/differential/remarkup/DifferentialRemarkupRule.php',
	@@ -450,6 +331,7 @@
	'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
	'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
	'DifferentialSearchIndexer' => 'applications/differential/search/DifferentialSearchIndexer.php',
	+ 'DifferentialSetDiffPropertyConduitAPIMethod' => 'applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php',
	'DifferentialStoredCustomField' => 'applications/differential/customfield/DifferentialStoredCustomField.php',
	'DifferentialSubscribersField' => 'applications/differential/customfield/DifferentialSubscribersField.php',
	'DifferentialSummaryField' => 'applications/differential/customfield/DifferentialSummaryField.php',
	@@ -463,15 +345,19 @@
	'DifferentialUnitField' => 'applications/differential/customfield/DifferentialUnitField.php',
	'DifferentialUnitStatus' => 'applications/differential/constants/DifferentialUnitStatus.php',
	'DifferentialUnitTestResult' => 'applications/differential/constants/DifferentialUnitTestResult.php',
	+ 'DifferentialUpdateRevisionConduitAPIMethod' => 'applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php',
	+ 'DifferentialUpdateUnitResultsConduitAPIMethod' => 'applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php',
	'DifferentialViewPolicyField' => 'applications/differential/customfield/DifferentialViewPolicyField.php',
	'DiffusionArcanistProjectDatasource' => 'applications/diffusion/typeahead/DiffusionArcanistProjectDatasource.php',
	'DiffusionAuditorDatasource' => 'applications/diffusion/typeahead/DiffusionAuditorDatasource.php',
	+ 'DiffusionBranchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php',
	'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php',
	'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php',
	'DiffusionBrowseController' => 'applications/diffusion/controller/DiffusionBrowseController.php',
	'DiffusionBrowseDirectoryController' => 'applications/diffusion/controller/DiffusionBrowseDirectoryController.php',
	'DiffusionBrowseFileController' => 'applications/diffusion/controller/DiffusionBrowseFileController.php',
	'DiffusionBrowseMainController' => 'applications/diffusion/controller/DiffusionBrowseMainController.php',
	+ 'DiffusionBrowseQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php',
	'DiffusionBrowseResultSet' => 'applications/diffusion/data/DiffusionBrowseResultSet.php',
	'DiffusionBrowseSearchController' => 'applications/diffusion/controller/DiffusionBrowseSearchController.php',
	'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
	@@ -491,17 +377,27 @@
	'DiffusionCommitHash' => 'applications/diffusion/data/DiffusionCommitHash.php',
	'DiffusionCommitHookEngine' => 'applications/diffusion/engine/DiffusionCommitHookEngine.php',
	'DiffusionCommitHookRejectException' => 'applications/diffusion/exception/DiffusionCommitHookRejectException.php',
	+ 'DiffusionCommitParentsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php',
	'DiffusionCommitQuery' => 'applications/diffusion/query/DiffusionCommitQuery.php',
	'DiffusionCommitRef' => 'applications/diffusion/data/DiffusionCommitRef.php',
	'DiffusionCommitRemarkupRule' => 'applications/diffusion/remarkup/DiffusionCommitRemarkupRule.php',
	'DiffusionCommitTagsController' => 'applications/diffusion/controller/DiffusionCommitTagsController.php',
	+ 'DiffusionConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionConduitAPIMethod.php',
	'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
	+ 'DiffusionCreateCommentConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php',
	'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
	+ 'DiffusionDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
	'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
	+ 'DiffusionExistsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php',
	'DiffusionExternalController' => 'applications/diffusion/controller/DiffusionExternalController.php',
	'DiffusionFileContent' => 'applications/diffusion/data/DiffusionFileContent.php',
	'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionFileContentQuery.php',
	+ 'DiffusionFileContentQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php',
	+ 'DiffusionFindSymbolsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionFindSymbolsConduitAPIMethod.php',
	+ 'DiffusionGetCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php',
	+ 'DiffusionGetLintMessagesConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php',
	+ 'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php',
	'DiffusionGitBranch' => 'applications/diffusion/data/DiffusionGitBranch.php',
	'DiffusionGitBranchTestCase' => 'applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php',
	'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
	@@ -510,15 +406,18 @@
	'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
	'DiffusionGitResponse' => 'applications/diffusion/response/DiffusionGitResponse.php',
	'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
	+ 'DiffusionHistoryQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionHistoryConduitAPIMethod.php',
	'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
	'DiffusionHovercardEventListener' => 'applications/diffusion/events/DiffusionHovercardEventListener.php',
	'DiffusionInlineCommentController' => 'applications/diffusion/controller/DiffusionInlineCommentController.php',
	'DiffusionInlineCommentPreviewController' => 'applications/diffusion/controller/DiffusionInlineCommentPreviewController.php',
	'DiffusionLastModifiedController' => 'applications/diffusion/controller/DiffusionLastModifiedController.php',
	+ 'DiffusionLastModifiedQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php',
	'DiffusionLintController' => 'applications/diffusion/controller/DiffusionLintController.php',
	'DiffusionLintCountQuery' => 'applications/diffusion/query/DiffusionLintCountQuery.php',
	'DiffusionLintDetailsController' => 'applications/diffusion/controller/DiffusionLintDetailsController.php',
	'DiffusionLintSaveRunner' => 'applications/diffusion/DiffusionLintSaveRunner.php',
	+ 'DiffusionLookSoonConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php',
	'DiffusionLowLevelCommitFieldsQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitFieldsQuery.php',
	'DiffusionLowLevelCommitQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelCommitQuery.php',
	'DiffusionLowLevelGitRefQuery' => 'applications/diffusion/query/lowlevel/DiffusionLowLevelGitRefQuery.php',
	@@ -531,6 +430,7 @@
	'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
	'DiffusionMercurialResponse' => 'applications/diffusion/response/DiffusionMercurialResponse.php',
	'DiffusionMercurialWireProtocol' => 'applications/diffusion/protocol/DiffusionMercurialWireProtocol.php',
	+ 'DiffusionMergedCommitsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php',
	'DiffusionMirrorDeleteController' => 'applications/diffusion/controller/DiffusionMirrorDeleteController.php',
	'DiffusionMirrorEditController' => 'applications/diffusion/controller/DiffusionMirrorEditController.php',
	'DiffusionPathChange' => 'applications/diffusion/data/DiffusionPathChange.php',
	@@ -546,8 +446,14 @@
	'DiffusionPushLogListController' => 'applications/diffusion/controller/DiffusionPushLogListController.php',
	'DiffusionPushLogListView' => 'applications/diffusion/view/DiffusionPushLogListView.php',
	'DiffusionQuery' => 'applications/diffusion/query/DiffusionQuery.php',
	+ 'DiffusionQueryCommitsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php',
	+ 'DiffusionQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php',
	+ 'DiffusionQueryPathsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php',
	'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
	+ 'DiffusionRawDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php',
	+ 'DiffusionReadmeQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionReadmeQueryConduitAPIMethod.php',
	'DiffusionRefNotFoundException' => 'applications/diffusion/exception/DiffusionRefNotFoundException.php',
	+ 'DiffusionRefsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php',
	'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/DiffusionRenameHistoryQuery.php',
	'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php',
	'DiffusionRepositoryCreateController' => 'applications/diffusion/controller/DiffusionRepositoryCreateController.php',
	@@ -572,6 +478,7 @@
	'DiffusionRepositoryRemarkupRule' => 'applications/diffusion/remarkup/DiffusionRepositoryRemarkupRule.php',
	'DiffusionRepositoryTag' => 'applications/diffusion/data/DiffusionRepositoryTag.php',
	'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php',
	+ 'DiffusionResolveRefsConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php',
	'DiffusionResolveUserQuery' => 'applications/diffusion/query/DiffusionResolveUserQuery.php',
	'DiffusionSSHGitReceivePackWorkflow' => 'applications/diffusion/ssh/DiffusionSSHGitReceivePackWorkflow.php',
	'DiffusionSSHGitUploadPackWorkflow' => 'applications/diffusion/ssh/DiffusionSSHGitUploadPackWorkflow.php',
	@@ -583,6 +490,7 @@
	'DiffusionSSHSubversionServeWorkflow' => 'applications/diffusion/ssh/DiffusionSSHSubversionServeWorkflow.php',
	'DiffusionSSHSubversionWorkflow' => 'applications/diffusion/ssh/DiffusionSSHSubversionWorkflow.php',
	'DiffusionSSHWorkflow' => 'applications/diffusion/ssh/DiffusionSSHWorkflow.php',
	+ 'DiffusionSearchQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php',
	'DiffusionServeController' => 'applications/diffusion/controller/DiffusionServeController.php',
	'DiffusionSetPasswordPanel' => 'applications/diffusion/panel/DiffusionSetPasswordPanel.php',
	'DiffusionSetupException' => 'applications/diffusion/exception/DiffusionSetupException.php',
	@@ -596,7 +504,9 @@
	'DiffusionSymbolQuery' => 'applications/diffusion/query/DiffusionSymbolQuery.php',
	'DiffusionTagListController' => 'applications/diffusion/controller/DiffusionTagListController.php',
	'DiffusionTagListView' => 'applications/diffusion/view/DiffusionTagListView.php',
	+ 'DiffusionTagsQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php',
	'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php',
	+ 'DiffusionUpdateCoverageConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php',
	'DiffusionView' => 'applications/diffusion/view/DiffusionView.php',
	'DivinerArticleAtomizer' => 'applications/diviner/atomizer/DivinerArticleAtomizer.php',
	'DivinerAtom' => 'applications/diviner/atom/DivinerAtom.php',
	@@ -719,12 +629,24 @@
	'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/DrydockSSHCommandInterface.php',
	'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/DrydockWebrootInterface.php',
	'DrydockWorkingCopyBlueprintImplementation' => 'applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php',
	+ 'FeedConduitAPIMethod' => 'applications/feed/conduit/FeedConduitAPIMethod.php',
	+ 'FeedPublishConduitAPIMethod' => 'applications/feed/conduit/FeedPublishConduitAPIMethod.php',
	'FeedPublisherHTTPWorker' => 'applications/feed/worker/FeedPublisherHTTPWorker.php',
	'FeedPublisherWorker' => 'applications/feed/worker/FeedPublisherWorker.php',
	'FeedPushWorker' => 'applications/feed/worker/FeedPushWorker.php',
	+ 'FeedQueryConduitAPIMethod' => 'applications/feed/conduit/FeedQueryConduitAPIMethod.php',
	+ 'FileConduitAPIMethod' => 'applications/files/conduit/FileConduitAPIMethod.php',
	'FileCreateMailReceiver' => 'applications/files/mail/FileCreateMailReceiver.php',
	+ 'FileDownloadConduitAPIMethod' => 'applications/files/conduit/FileDownloadConduitAPIMethod.php',
	+ 'FileInfoConduitAPIMethod' => 'applications/files/conduit/FileInfoConduitAPIMethod.php',
	'FileMailReceiver' => 'applications/files/mail/FileMailReceiver.php',
	'FileReplyHandler' => 'applications/files/mail/FileReplyHandler.php',
	+ 'FileUploadConduitAPIMethod' => 'applications/files/conduit/FileUploadConduitAPIMethod.php',
	+ 'FileUploadHashConduitAPIMethod' => 'applications/files/conduit/FileUploadHashConduitAPIMethod.php',
	+ 'FlagConduitAPIMethod' => 'applications/flag/conduit/FlagConduitAPIMethod.php',
	+ 'FlagDeleteConduitAPIMethod' => 'applications/flag/conduit/FlagDeleteConduitAPIMethod.php',
	+ 'FlagEditConduitAPIMethod' => 'applications/flag/conduit/FlagEditConduitAPIMethod.php',
	+ 'FlagQueryConduitAPIMethod' => 'applications/flag/conduit/FlagQueryConduitAPIMethod.php',
	'HarbormasterBuild' => 'applications/harbormaster/storage/build/HarbormasterBuild.php',
	'HarbormasterBuildActionController' => 'applications/harbormaster/controller/HarbormasterBuildActionController.php',
	'HarbormasterBuildArtifact' => 'applications/harbormaster/storage/build/HarbormasterBuildArtifact.php',
	@@ -773,6 +695,7 @@
	'HarbormasterBuildableViewController' => 'applications/harbormaster/controller/HarbormasterBuildableViewController.php',
	'HarbormasterCapabilityManagePlans' => 'applications/harbormaster/capability/HarbormasterCapabilityManagePlans.php',
	'HarbormasterCommandBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterCommandBuildStepImplementation.php',
	+ 'HarbormasterConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php',
	'HarbormasterController' => 'applications/harbormaster/controller/HarbormasterController.php',
	'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php',
	@@ -796,8 +719,11 @@
	'HarbormasterPlanRunController' => 'applications/harbormaster/controller/HarbormasterPlanRunController.php',
	'HarbormasterPlanViewController' => 'applications/harbormaster/controller/HarbormasterPlanViewController.php',
	'HarbormasterPublishFragmentBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterPublishFragmentBuildStepImplementation.php',
	+ 'HarbormasterQueryBuildablesConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php',
	+ 'HarbormasterQueryBuildsConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php',
	'HarbormasterRemarkupRule' => 'applications/harbormaster/remarkup/HarbormasterRemarkupRule.php',
	'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
	+ 'HarbormasterSendMessageConduitAPIMethod' => 'applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php',
	'HarbormasterSleepBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterSleepBuildStepImplementation.php',
	'HarbormasterStepAddController' => 'applications/harbormaster/controller/HarbormasterStepAddController.php',
	'HarbormasterStepDeleteController' => 'applications/harbormaster/controller/HarbormasterStepDeleteController.php',
	@@ -909,6 +835,9 @@
	'LiskIsolationTestDAOException' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php',
	'LiskMigrationIterator' => 'infrastructure/storage/lisk/LiskMigrationIterator.php',
	'LiskRawMigrationIterator' => 'infrastructure/storage/lisk/LiskRawMigrationIterator.php',
	+ 'MacroConduitAPIMethod' => 'applications/macro/conduit/MacroConduitAPIMethod.php',
	+ 'MacroCreateMemeConduitAPIMethod' => 'applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php',
	+ 'MacroQueryConduitAPIMethod' => 'applications/macro/conduit/MacroQueryConduitAPIMethod.php',
	'ManiphestActionMenuEventListener' => 'applications/maniphest/event/ManiphestActionMenuEventListener.php',
	'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
	'ManiphestCapabilityBulkEdit' => 'applications/maniphest/capability/ManiphestCapabilityBulkEdit.php',
	@@ -919,10 +848,12 @@
	'ManiphestCapabilityEditPriority' => 'applications/maniphest/capability/ManiphestCapabilityEditPriority.php',
	'ManiphestCapabilityEditProjects' => 'applications/maniphest/capability/ManiphestCapabilityEditProjects.php',
	'ManiphestCapabilityEditStatus' => 'applications/maniphest/capability/ManiphestCapabilityEditStatus.php',
	+ 'ManiphestConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestConduitAPIMethod.php',
	'ManiphestConfiguredCustomField' => 'applications/maniphest/field/ManiphestConfiguredCustomField.php',
	'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
	'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
	'ManiphestCreateMailReceiver' => 'applications/maniphest/mail/ManiphestCreateMailReceiver.php',
	+ 'ManiphestCreateTaskConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestCreateTaskConduitAPIMethod.php',
	'ManiphestCustomField' => 'applications/maniphest/field/ManiphestCustomField.php',
	'ManiphestCustomFieldNumericIndex' => 'applications/maniphest/storage/ManiphestCustomFieldNumericIndex.php',
	'ManiphestCustomFieldStatusParser' => 'applications/maniphest/field/parser/ManiphestCustomFieldStatusParser.php',
	@@ -933,10 +864,15 @@
	'ManiphestExcelDefaultFormat' => 'applications/maniphest/export/ManiphestExcelDefaultFormat.php',
	'ManiphestExcelFormat' => 'applications/maniphest/export/ManiphestExcelFormat.php',
	'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
	+ 'ManiphestFindConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestFindConduitAPIMethod.php',
	+ 'ManiphestGetTaskTransactionsConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php',
	'ManiphestHovercardEventListener' => 'applications/maniphest/event/ManiphestHovercardEventListener.php',
	+ 'ManiphestInfoConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php',
	'ManiphestNameIndex' => 'applications/maniphest/storage/ManiphestNameIndex.php',
	'ManiphestNameIndexEventListener' => 'applications/maniphest/event/ManiphestNameIndexEventListener.php',
	'ManiphestPHIDTypeTask' => 'applications/maniphest/phid/ManiphestPHIDTypeTask.php',
	+ 'ManiphestQueryConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php',
	+ 'ManiphestQueryStatusesConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php',
	'ManiphestRemarkupRule' => 'applications/maniphest/remarkup/ManiphestRemarkupRule.php',
	'ManiphestReplyHandler' => 'applications/maniphest/mail/ManiphestReplyHandler.php',
	'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php',
	@@ -968,6 +904,7 @@
	'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/ManiphestTransactionPreviewController.php',
	'ManiphestTransactionQuery' => 'applications/maniphest/query/ManiphestTransactionQuery.php',
	'ManiphestTransactionSaveController' => 'applications/maniphest/controller/ManiphestTransactionSaveController.php',
	+ 'ManiphestUpdateConduitAPIMethod' => 'applications/maniphest/conduit/ManiphestUpdateConduitAPIMethod.php',
	'ManiphestView' => 'applications/maniphest/view/ManiphestView.php',
	'MetaMTAConstants' => 'applications/metamta/constants/MetaMTAConstants.php',
	'MetaMTAMailReceivedGarbageCollector' => 'applications/metamta/garbagecollector/MetaMTAMailReceivedGarbageCollector.php',
	@@ -977,8 +914,10 @@
	'NuanceCapabilitySourceDefaultEdit' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultEdit.php',
	'NuanceCapabilitySourceDefaultView' => 'applications/nuance/capability/NuanceCapabilitySourceDefaultView.php',
	'NuanceCapabilitySourceManage' => 'applications/nuance/capability/NuanceCapabilitySourceManage.php',
	+ 'NuanceConduitAPIMethod' => 'applications/nuance/conduit/NuanceConduitAPIMethod.php',
	'NuanceConstants' => 'applications/nuance/constants/NuanceConstants.php',
	'NuanceController' => 'applications/nuance/controller/NuanceController.php',
	+ 'NuanceCreateItemConduitAPIMethod' => 'applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php',
	'NuanceDAO' => 'applications/nuance/storage/NuanceDAO.php',
	'NuanceItem' => 'applications/nuance/storage/NuanceItem.php',
	'NuanceItemEditController' => 'applications/nuance/controller/NuanceItemEditController.php',
	@@ -1022,7 +961,13 @@
	'NuanceSourceTransactionQuery' => 'applications/nuance/query/NuanceSourceTransactionQuery.php',
	'NuanceSourceViewController' => 'applications/nuance/controller/NuanceSourceViewController.php',
	'NuanceTransaction' => 'applications/nuance/storage/NuanceTransaction.php',
	+ 'OwnersConduitAPIMethod' => 'applications/owners/conduit/OwnersConduitAPIMethod.php',
	'OwnersPackageReplyHandler' => 'applications/owners/mail/OwnersPackageReplyHandler.php',
	+ 'OwnersQueryConduitAPIMethod' => 'applications/owners/conduit/OwnersQueryConduitAPIMethod.php',
	+ 'PHIDConduitAPIMethod' => 'applications/phid/conduit/PHIDConduitAPIMethod.php',
	+ 'PHIDInfoConduitAPIMethod' => 'applications/phid/conduit/PHIDInfoConduitAPIMethod.php',
	+ 'PHIDLookupConduitAPIMethod' => 'applications/phid/conduit/PHIDLookupConduitAPIMethod.php',
	+ 'PHIDQueryConduitAPIMethod' => 'applications/phid/conduit/PHIDQueryConduitAPIMethod.php',
	'PHUI' => 'view/phui/PHUI.php',
	'PHUIActionHeaderExample' => 'applications/uiexample/examples/PHUIActionHeaderExample.php',
	'PHUIActionHeaderView' => 'view/phui/PHUIActionHeaderView.php',
	@@ -1113,9 +1058,13 @@
	'PassphraseSSHKey' => 'applications/passphrase/keys/PassphraseSSHKey.php',
	'PassphraseSecret' => 'applications/passphrase/storage/PassphraseSecret.php',
	'PasteCapabilityDefaultView' => 'applications/paste/capability/PasteCapabilityDefaultView.php',
	+ 'PasteConduitAPIMethod' => 'applications/paste/conduit/PasteConduitAPIMethod.php',
	+ 'PasteCreateConduitAPIMethod' => 'applications/paste/conduit/PasteCreateConduitAPIMethod.php',
	'PasteCreateMailReceiver' => 'applications/paste/mail/PasteCreateMailReceiver.php',
	'PasteEmbedView' => 'applications/paste/view/PasteEmbedView.php',
	+ 'PasteInfoConduitAPIMethod' => 'applications/paste/conduit/PasteInfoConduitAPIMethod.php',
	'PasteMockMailReceiver' => 'applications/paste/mail/PasteMockMailReceiver.php',
	+ 'PasteQueryConduitAPIMethod' => 'applications/paste/conduit/PasteQueryConduitAPIMethod.php',
	'PasteReplyHandler' => 'applications/paste/mail/PasteReplyHandler.php',
	'PeopleCapabilityBrowseUserDirectory' => 'applications/people/capability/PeopleCapabilityBrowseUserDirectory.php',
	'PeopleUserLogGarbageCollector' => 'applications/people/garbagecollector/PeopleUserLogGarbageCollector.php',
	@@ -2274,7 +2223,6 @@
	'PhabricatorSubscriptionsTransactionController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsTransactionController.php',
	'PhabricatorSubscriptionsUIEventListener' => 'applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php',
	'PhabricatorSupportApplication' => 'applications/support/application/PhabricatorSupportApplication.php',
	- 'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
	'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php',
	'PhabricatorSyntaxHighlightingConfigOptions' => 'applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php',
	'PhabricatorSystemAction' => 'applications/system/action/PhabricatorSystemAction.php',
	@@ -2424,7 +2372,9 @@
	'PhameBlogSkin' => 'applications/phame/skins/PhameBlogSkin.php',
	'PhameBlogViewController' => 'applications/phame/controller/blog/PhameBlogViewController.php',
	'PhameCelerityResources' => 'applications/phame/celerity/PhameCelerityResources.php',
	+ 'PhameConduitAPIMethod' => 'applications/phame/conduit/PhameConduitAPIMethod.php',
	'PhameController' => 'applications/phame/controller/PhameController.php',
	+ 'PhameCreatePostConduitAPIMethod' => 'applications/phame/conduit/PhameCreatePostConduitAPIMethod.php',
	'PhameDAO' => 'applications/phame/storage/PhameDAO.php',
	'PhamePost' => 'applications/phame/storage/PhamePost.php',
	'PhamePostDeleteController' => 'applications/phame/controller/post/PhamePostDeleteController.php',
	@@ -2439,6 +2389,8 @@
	'PhamePostUnpublishController' => 'applications/phame/controller/post/PhamePostUnpublishController.php',
	'PhamePostView' => 'applications/phame/view/PhamePostView.php',
	'PhamePostViewController' => 'applications/phame/controller/post/PhamePostViewController.php',
	+ 'PhameQueryConduitAPIMethod' => 'applications/phame/conduit/PhameQueryConduitAPIMethod.php',
	+ 'PhameQueryPostsConduitAPIMethod' => 'applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php',
	'PhameResourceController' => 'applications/phame/controller/PhameResourceController.php',
	'PhameSkinSpecification' => 'applications/phame/skins/PhameSkinSpecification.php',
	'PhluxController' => 'applications/phlux/controller/PhluxController.php',
	@@ -2533,6 +2485,7 @@
	'PhortuneWePayPaymentProvider' => 'applications/phortune/provider/PhortuneWePayPaymentProvider.php',
	'PhragmentBrowseController' => 'applications/phragment/controller/PhragmentBrowseController.php',
	'PhragmentCapabilityCanCreate' => 'applications/phragment/capability/PhragmentCapabilityCanCreate.php',
	+ 'PhragmentConduitAPIMethod' => 'applications/phragment/conduit/PhragmentConduitAPIMethod.php',
	'PhragmentController' => 'applications/phragment/controller/PhragmentController.php',
	'PhragmentCreateController' => 'applications/phragment/controller/PhragmentCreateController.php',
	'PhragmentDAO' => 'applications/phragment/storage/PhragmentDAO.php',
	@@ -2540,6 +2493,7 @@
	'PhragmentFragmentQuery' => 'applications/phragment/query/PhragmentFragmentQuery.php',
	'PhragmentFragmentVersion' => 'applications/phragment/storage/PhragmentFragmentVersion.php',
	'PhragmentFragmentVersionQuery' => 'applications/phragment/query/PhragmentFragmentVersionQuery.php',
	+ 'PhragmentGetPatchConduitAPIMethod' => 'applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php',
	'PhragmentHistoryController' => 'applications/phragment/controller/PhragmentHistoryController.php',
	'PhragmentPHIDTypeFragment' => 'applications/phragment/phid/PhragmentPHIDTypeFragment.php',
	'PhragmentPHIDTypeFragmentVersion' => 'applications/phragment/phid/PhragmentPHIDTypeFragmentVersion.php',
	@@ -2547,6 +2501,7 @@
	'PhragmentPatchController' => 'applications/phragment/controller/PhragmentPatchController.php',
	'PhragmentPatchUtil' => 'applications/phragment/util/PhragmentPatchUtil.php',
	'PhragmentPolicyController' => 'applications/phragment/controller/PhragmentPolicyController.php',
	+ 'PhragmentQueryFragmentsConduitAPIMethod' => 'applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php',
	'PhragmentRevertController' => 'applications/phragment/controller/PhragmentRevertController.php',
	'PhragmentSnapshot' => 'applications/phragment/storage/PhragmentSnapshot.php',
	'PhragmentSnapshotChild' => 'applications/phragment/storage/PhragmentSnapshotChild.php',
	@@ -2559,15 +2514,19 @@
	'PhragmentUpdateController' => 'applications/phragment/controller/PhragmentUpdateController.php',
	'PhragmentVersionController' => 'applications/phragment/controller/PhragmentVersionController.php',
	'PhragmentZIPController' => 'applications/phragment/controller/PhragmentZIPController.php',
	+ 'PhrequentConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentConduitAPIMethod.php',
	'PhrequentController' => 'applications/phrequent/controller/PhrequentController.php',
	'PhrequentDAO' => 'applications/phrequent/storage/PhrequentDAO.php',
	'PhrequentListController' => 'applications/phrequent/controller/PhrequentListController.php',
	+ 'PhrequentPopConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php',
	+ 'PhrequentPushConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php',
	'PhrequentSearchEngine' => 'applications/phrequent/query/PhrequentSearchEngine.php',
	'PhrequentTimeBlock' => 'applications/phrequent/storage/PhrequentTimeBlock.php',
	'PhrequentTimeBlockTestCase' => 'applications/phrequent/storage/__tests__/PhrequentTimeBlockTestCase.php',
	'PhrequentTimeSlices' => 'applications/phrequent/storage/PhrequentTimeSlices.php',
	'PhrequentTrackController' => 'applications/phrequent/controller/PhrequentTrackController.php',
	'PhrequentTrackableInterface' => 'applications/phrequent/interface/PhrequentTrackableInterface.php',
	+ 'PhrequentTrackingConduitAPIMethod' => 'applications/phrequent/conduit/PhrequentTrackingConduitAPIMethod.php',
	'PhrequentTrackingEditor' => 'applications/phrequent/editor/PhrequentTrackingEditor.php',
	'PhrequentUIEventListener' => 'applications/phrequent/event/PhrequentUIEventListener.php',
	'PhrequentUserTime' => 'applications/phrequent/storage/PhrequentUserTime.php',
	@@ -2575,6 +2534,7 @@
	'PhrictionActionConstants' => 'applications/phriction/constants/PhrictionActionConstants.php',
	'PhrictionActionMenuEventListener' => 'applications/phriction/event/PhrictionActionMenuEventListener.php',
	'PhrictionChangeType' => 'applications/phriction/constants/PhrictionChangeType.php',
	+ 'PhrictionConduitAPIMethod' => 'applications/phriction/conduit/PhrictionConduitAPIMethod.php',
	'PhrictionConstants' => 'applications/phriction/constants/PhrictionConstants.php',
	'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
	'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
	@@ -2588,8 +2548,11 @@
	'PhrictionDocumentQuery' => 'applications/phriction/query/PhrictionDocumentQuery.php',
	'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
	'PhrictionDocumentTestCase' => 'applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php',
	+ 'PhrictionEditConduitAPIMethod' => 'applications/phriction/conduit/PhrictionEditConduitAPIMethod.php',
	'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
	+ 'PhrictionHistoryConduitAPIMethod' => 'applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php',
	'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
	+ 'PhrictionInfoConduitAPIMethod' => 'applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php',
	'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
	'PhrictionMoveController' => 'applications/phriction/controller/PhrictionMoveController.php',
	'PhrictionNewController' => 'applications/phriction/controller/PhrictionNewController.php',
	@@ -2642,6 +2605,8 @@
	'PonderVoteSaveController' => 'applications/ponder/controller/PonderVoteSaveController.php',
	'ProjectBoardTaskCard' => 'applications/project/view/ProjectBoardTaskCard.php',
	'ProjectCapabilityCreateProjects' => 'applications/project/capability/ProjectCapabilityCreateProjects.php',
	+ 'ProjectConduitAPIMethod' => 'applications/project/conduit/ProjectConduitAPIMethod.php',
	+ 'ProjectQueryConduitAPIMethod' => 'applications/project/conduit/ProjectQueryConduitAPIMethod.php',
	'ProjectRemarkupRule' => 'applications/project/remarkup/ProjectRemarkupRule.php',
	'QueryFormattingTestCase' => 'infrastructure/storage/__tests__/QueryFormattingTestCase.php',
	'ReleephAuthorFieldSpecification' => 'applications/releeph/field/specification/ReleephAuthorFieldSpecification.php',
	@@ -2664,6 +2629,7 @@
	'ReleephCommitFinder' => 'applications/releeph/commitfinder/ReleephCommitFinder.php',
	'ReleephCommitFinderException' => 'applications/releeph/commitfinder/ReleephCommitFinderException.php',
	'ReleephCommitMessageFieldSpecification' => 'applications/releeph/field/specification/ReleephCommitMessageFieldSpecification.php',
	+ 'ReleephConduitAPIMethod' => 'applications/releeph/conduit/ReleephConduitAPIMethod.php',
	'ReleephController' => 'applications/releeph/controller/ReleephController.php',
	'ReleephDAO' => 'applications/releeph/storage/ReleephDAO.php',
	'ReleephDefaultFieldSelector' => 'applications/releeph/field/selector/ReleephDefaultFieldSelector.php',
	@@ -2674,6 +2640,7 @@
	'ReleephFieldParseException' => 'applications/releeph/field/exception/ReleephFieldParseException.php',
	'ReleephFieldSelector' => 'applications/releeph/field/selector/ReleephFieldSelector.php',
	'ReleephFieldSpecification' => 'applications/releeph/field/specification/ReleephFieldSpecification.php',
	+ 'ReleephGetBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php',
	'ReleephIntentFieldSpecification' => 'applications/releeph/field/specification/ReleephIntentFieldSpecification.php',
	'ReleephLevelFieldSpecification' => 'applications/releeph/field/specification/ReleephLevelFieldSpecification.php',
	'ReleephOriginalCommitFieldSpecification' => 'applications/releeph/field/specification/ReleephOriginalCommitFieldSpecification.php',
	@@ -2693,10 +2660,15 @@
	'ReleephProductTransactionQuery' => 'applications/releeph/query/ReleephProductTransactionQuery.php',
	'ReleephProductViewController' => 'applications/releeph/controller/product/ReleephProductViewController.php',
	'ReleephProject' => 'applications/releeph/storage/ReleephProject.php',
	+ 'ReleephProjectInfoConduitAPIMethod' => 'applications/releeph/conduit/ReleephProjectInfoConduitAPIMethod.php',
	+ 'ReleephQueryBranchesConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php',
	+ 'ReleephQueryProductsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryProdutsConduitAPIMethod.php',
	+ 'ReleephQueryRequestsConduitAPIMethod' => 'applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php',
	'ReleephReasonFieldSpecification' => 'applications/releeph/field/specification/ReleephReasonFieldSpecification.php',
	'ReleephRequest' => 'applications/releeph/storage/ReleephRequest.php',
	'ReleephRequestActionController' => 'applications/releeph/controller/request/ReleephRequestActionController.php',
	'ReleephRequestCommentController' => 'applications/releeph/controller/request/ReleephRequestCommentController.php',
	+ 'ReleephRequestConduitAPIMethod' => 'applications/releeph/conduit/ReleephRequestConduitAPIMethod.php',
	'ReleephRequestController' => 'applications/releeph/controller/request/ReleephRequestController.php',
	'ReleephRequestDifferentialCreateController' => 'applications/releeph/controller/request/ReleephRequestDifferentialCreateController.php',
	'ReleephRequestEditController' => 'applications/releeph/controller/request/ReleephRequestEditController.php',
	@@ -2717,11 +2689,38 @@
	'ReleephRevisionFieldSpecification' => 'applications/releeph/field/specification/ReleephRevisionFieldSpecification.php',
	'ReleephSeverityFieldSpecification' => 'applications/releeph/field/specification/ReleephSeverityFieldSpecification.php',
	'ReleephSummaryFieldSpecification' => 'applications/releeph/field/specification/ReleephSummaryFieldSpecification.php',
	+ 'ReleephWorkCanPushConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php',
	+ 'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php',
	+ 'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php',
	+ 'ReleephWorkGetBranchConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php',
	+ 'ReleephWorkGetCommitMessageConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php',
	+ 'ReleephWorkNextRequestConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php',
	+ 'ReleephWorkRecordConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php',
	+ 'ReleephWorkRecordPickStatusConduitAPIMethod' => 'applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php',
	+ 'RemarkupProcessConduitAPIMethod' => 'applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php',
	+ 'RepositoryConduitAPIMethod' => 'applications/repository/conduit/RepositoryConduitAPIMethod.php',
	+ 'RepositoryCreateConduitAPIMethod' => 'applications/repository/conduit/RepositoryCreateConduitAPIMethod.php',
	+ 'RepositoryQueryConduitAPIMethod' => 'applications/repository/conduit/RepositoryQueryConduitAPIMethod.php',
	'ShellLogView' => 'applications/harbormaster/view/ShellLogView.php',
	+ 'SlowvoteConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteConduitAPIMethod.php',
	'SlowvoteEmbedView' => 'applications/slowvote/view/SlowvoteEmbedView.php',
	+ 'SlowvoteInfoConduitAPIMethod' => 'applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php',
	'SlowvoteRemarkupRule' => 'applications/slowvote/remarkup/SlowvoteRemarkupRule.php',
	'SubscriptionListDialogBuilder' => 'applications/subscriptions/view/SubscriptionListDialogBuilder.php',
	'SubscriptionListStringBuilder' => 'applications/subscriptions/view/SubscriptionListStringBuilder.php',
	+ 'TokenConduitAPIMethod' => 'applications/tokens/conduit/TokenConduitAPIMethod.php',
	+ 'TokenGiveConduitAPIMethod' => 'applications/tokens/conduit/TokenGiveConduitAPIMethod.php',
	+ 'TokenGivenConduitAPIMethod' => 'applications/tokens/conduit/TokenGivenConduitAPIMethod.php',
	+ 'TokenQueryConduitAPIMethod' => 'applications/tokens/conduit/TokenQueryConduitAPIMethod.php',
	+ 'UserAddStatusConduitAPIMethod' => 'applications/people/conduit/UserAddStatusConduitAPIMethod.php',
	+ 'UserConduitAPIMethod' => 'applications/people/conduit/UserConduitAPIMethod.php',
	+ 'UserDisableConduitAPIMethod' => 'applications/people/conduit/UserDisableConduitAPIMethod.php',
	+ 'UserEnableConduitAPIMethod' => 'applications/people/conduit/UserEnableConduitAPIMethod.php',
	+ 'UserFindConduitAPIMethod' => 'applications/people/conduit/UserFindConduitAPIMethod.php',
	+ 'UserInfoConduitAPIMethod' => 'applications/people/conduit/UserInfpConduitAPIMethod.php',
	+ 'UserQueryConduitAPIMethod' => 'applications/people/conduit/UserQueryConduitAPIMethod.php',
	+ 'UserRemoveStatusConduitAPIMethod' => 'applications/people/conduit/UserRemoveStatusConduitAPIMethod.php',
	+ 'UserWhoAmIConduitAPIMethod' => 'applications/people/conduit/UserWhoAmIConduitAPIMethod.php',
	),
	'function' => array(
	'_phabricator_time_format' => 'view/viewutils.php',
	@@ -2823,7 +2822,11 @@
	'PhutilSafeHTMLProducerInterface',
	),
	'AphrontWebpageResponse' => 'AphrontHTMLResponse',
	+ 'ArcanistConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ArcanistProjectInfoConduitAPIMethod' => 'ArcanistConduitAPIMethod',
	'AuditActionMenuEventListener' => 'PhabricatorEventListener',
	+ 'AuditConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'AuditQueryConduitAPIMethod' => 'AuditConduitAPIMethod',
	'CalendarColors' => 'CalendarConstants',
	'CalendarTimeUtilTestCase' => 'PhabricatorTestCase',
	'CelerityManagementMapWorkflow' => 'CelerityManagementWorkflow',
	@@ -2835,172 +2838,27 @@
	'CelerityResourceGraph' => 'AbstractDirectedGraph',
	'CelerityResourceTransformerTestCase' => 'PhabricatorTestCase',
	'CelerityResourcesOnDisk' => 'CelerityPhysicalResources',
	+ 'ChatLogConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ChatLogQueryConduitAPIMethod' => 'ChatLogConduitAPIMethod',
	+ 'ChatLogRecordConduitAPIMethod' => 'ChatLogConduitAPIMethod',
	'ConduitAPIMethod' => array(
	'Phobject',
	'PhabricatorPolicyInterface',
	),
	- 'ConduitAPI_arcanist_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_arcanist_projectinfo_Method' => 'ConduitAPI_arcanist_Method',
	- 'ConduitAPI_audit_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_audit_query_Method' => 'ConduitAPI_audit_Method',
	- 'ConduitAPI_chatlog_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_chatlog_query_Method' => 'ConduitAPI_chatlog_Method',
	- 'ConduitAPI_chatlog_record_Method' => 'ConduitAPI_chatlog_Method',
	- 'ConduitAPI_conduit_connect_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_conduit_getcertificate_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_conduit_ping_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_conduit_query_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_conpherence_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_conpherence_createthread_Method' => 'ConduitAPI_conpherence_Method',
	- 'ConduitAPI_conpherence_querythread_Method' => 'ConduitAPI_conpherence_Method',
	- 'ConduitAPI_conpherence_querytransaction_Method' => 'ConduitAPI_conpherence_Method',
	- 'ConduitAPI_conpherence_updatethread_Method' => 'ConduitAPI_conpherence_Method',
	- 'ConduitAPI_differential_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_differential_close_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_createcomment_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_creatediff_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_createinline_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_createrawdiff_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_createrevision_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_find_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_finishpostponedlinters_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getalldiffs_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getcommitmessage_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getcommitpaths_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getdiff_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getrawdiff_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getrevision_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_getrevisioncomments_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_parsecommitmessage_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_query_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_querydiffs_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_setdiffproperty_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_updaterevision_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_differential_updateunitresults_Method' => 'ConduitAPI_differential_Method',
	- 'ConduitAPI_diffusion_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_diffusion_abstractquery_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_branchquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_browsequery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_commitparentsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_createcomment_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_diffquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_existsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_filecontentquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_findsymbols_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_getcommits_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_getlintmessages_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_historyquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_lastmodifiedquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_looksoon_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_mergedcommitsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_querycommits_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_diffusion_querypaths_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_rawdiffquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_readmequery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_refsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_resolverefs_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_searchquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_tagsquery_Method' => 'ConduitAPI_diffusion_abstractquery_Method',
	- 'ConduitAPI_diffusion_updatecoverage_Method' => 'ConduitAPI_diffusion_Method',
	- 'ConduitAPI_feed_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_feed_publish_Method' => 'ConduitAPI_feed_Method',
	- 'ConduitAPI_feed_query_Method' => 'ConduitAPI_feed_Method',
	- 'ConduitAPI_file_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_file_download_Method' => 'ConduitAPI_file_Method',
	- 'ConduitAPI_file_info_Method' => 'ConduitAPI_file_Method',
	- 'ConduitAPI_file_upload_Method' => 'ConduitAPI_file_Method',
	- 'ConduitAPI_file_uploadhash_Method' => 'ConduitAPI_file_Method',
	- 'ConduitAPI_flag_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_flag_delete_Method' => 'ConduitAPI_flag_Method',
	- 'ConduitAPI_flag_edit_Method' => 'ConduitAPI_flag_Method',
	- 'ConduitAPI_flag_query_Method' => 'ConduitAPI_flag_Method',
	- 'ConduitAPI_harbormaster_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_harbormaster_querybuildables_Method' => 'ConduitAPI_harbormaster_Method',
	- 'ConduitAPI_harbormaster_querybuilds_Method' => 'ConduitAPI_harbormaster_Method',
	- 'ConduitAPI_harbormaster_sendmessage_Method' => 'ConduitAPI_harbormaster_Method',
	- 'ConduitAPI_macro_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_macro_creatememe_Method' => 'ConduitAPI_macro_Method',
	- 'ConduitAPI_macro_query_Method' => 'ConduitAPI_macro_Method',
	- 'ConduitAPI_maniphest_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_maniphest_createtask_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_maniphest_find_Method' => 'ConduitAPI_maniphest_query_Method',
	- 'ConduitAPI_maniphest_gettasktransactions_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_maniphest_info_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_maniphest_query_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_maniphest_querystatuses_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_maniphest_update_Method' => 'ConduitAPI_maniphest_Method',
	- 'ConduitAPI_nuance_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_nuance_createitem_Method' => 'ConduitAPI_nuance_Method',
	- 'ConduitAPI_owners_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_owners_query_Method' => 'ConduitAPI_owners_Method',
	- 'ConduitAPI_paste_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_paste_create_Method' => 'ConduitAPI_paste_Method',
	- 'ConduitAPI_paste_info_Method' => 'ConduitAPI_paste_Method',
	- 'ConduitAPI_paste_query_Method' => 'ConduitAPI_paste_Method',
	- 'ConduitAPI_phame_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_phame_createpost_Method' => 'ConduitAPI_phame_Method',
	- 'ConduitAPI_phame_query_Method' => 'ConduitAPI_phame_Method',
	- 'ConduitAPI_phame_queryposts_Method' => 'ConduitAPI_phame_Method',
	- 'ConduitAPI_phid_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_phid_info_Method' => 'ConduitAPI_phid_Method',
	- 'ConduitAPI_phid_lookup_Method' => 'ConduitAPI_phid_Method',
	- 'ConduitAPI_phid_query_Method' => 'ConduitAPI_phid_Method',
	- 'ConduitAPI_phragment_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_phragment_getpatch_Method' => 'ConduitAPI_phragment_Method',
	- 'ConduitAPI_phragment_queryfragments_Method' => 'ConduitAPI_phragment_Method',
	- 'ConduitAPI_phrequent_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_phrequent_pop_Method' => 'ConduitAPI_phrequent_Method',
	- 'ConduitAPI_phrequent_push_Method' => 'ConduitAPI_phrequent_Method',
	- 'ConduitAPI_phrequent_tracking_Method' => 'ConduitAPI_phrequent_Method',
	- 'ConduitAPI_phriction_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_phriction_edit_Method' => 'ConduitAPI_phriction_Method',
	- 'ConduitAPI_phriction_history_Method' => 'ConduitAPI_phriction_Method',
	- 'ConduitAPI_phriction_info_Method' => 'ConduitAPI_phriction_Method',
	- 'ConduitAPI_project_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_project_query_Method' => 'ConduitAPI_project_Method',
	- 'ConduitAPI_releeph_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_releeph_getbranches_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releeph_projectinfo_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releeph_querybranches_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releeph_queryproducts_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releeph_queryrequests_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releeph_request_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_canpush_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_getauthorinfo_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_getbranch_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_getbranchcommitmessage_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_getcommitmessage_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_nextrequest_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_record_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_releephwork_recordpickstatus_Method' => 'ConduitAPI_releeph_Method',
	- 'ConduitAPI_remarkup_process_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_repository_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_repository_create_Method' => 'ConduitAPI_repository_Method',
	- 'ConduitAPI_repository_query_Method' => 'ConduitAPI_repository_Method',
	- 'ConduitAPI_slowvote_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_slowvote_info_Method' => 'ConduitAPI_slowvote_Method',
	- 'ConduitAPI_token_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_token_give_Method' => 'ConduitAPI_token_Method',
	- 'ConduitAPI_token_given_Method' => 'ConduitAPI_token_Method',
	- 'ConduitAPI_token_query_Method' => 'ConduitAPI_token_Method',
	- 'ConduitAPI_user_Method' => 'ConduitAPIMethod',
	- 'ConduitAPI_user_addstatus_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_disable_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_enable_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_find_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_info_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_query_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_removestatus_Method' => 'ConduitAPI_user_Method',
	- 'ConduitAPI_user_whoami_Method' => 'ConduitAPI_user_Method',
	'ConduitCallTestCase' => 'PhabricatorTestCase',
	+ 'ConduitConnectConduitAPIMethod' => 'ConduitAPIMethod',
	'ConduitConnectionGarbageCollector' => 'PhabricatorGarbageCollector',
	'ConduitException' => 'Exception',
	+ 'ConduitGetCertificateConduitAPIMethod' => 'ConduitAPIMethod',
	'ConduitLogGarbageCollector' => 'PhabricatorGarbageCollector',
	+ 'ConduitPingConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ConduitQueryConduitAPIMethod' => 'ConduitAPIMethod',
	'ConduitSSHWorkflow' => 'PhabricatorSSHWorkflow',
	'ConpherenceActionMenuEventListener' => 'PhabricatorEventListener',
	+ 'ConpherenceConduitAPIMethod' => 'ConduitAPIMethod',
	'ConpherenceConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'ConpherenceController' => 'PhabricatorController',
	+ 'ConpherenceCreateThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceCreateThreadMailReceiver' => 'PhabricatorMailReceiver',
	'ConpherenceDAO' => 'PhabricatorLiskDAO',
	'ConpherenceEditor' => 'PhabricatorApplicationTransactionEditor',
	@@ -3016,6 +2874,8 @@
	'ConpherenceParticipantQuery' => 'PhabricatorOffsetPagedQuery',
	'ConpherenceParticipationStatus' => 'ConpherenceConstants',
	'ConpherencePeopleWidgetView' => 'ConpherenceWidgetView',
	+ 'ConpherenceQueryThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	+ 'ConpherenceQueryTransactionConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceReplyHandler' => 'PhabricatorMailReplyHandler',
	'ConpherenceSettings' => 'ConpherenceConstants',
	'ConpherenceThread' => array(
	@@ -3032,6 +2892,7 @@
	'ConpherenceTransactionView' => 'AphrontView',
	'ConpherenceUpdateActions' => 'ConpherenceConstants',
	'ConpherenceUpdateController' => 'ConpherenceController',
	+ 'ConpherenceUpdateThreadConduitAPIMethod' => 'ConpherenceConduitAPIMethod',
	'ConpherenceViewController' => 'ConpherenceController',
	'ConpherenceWidgetController' => 'ConpherenceController',
	'ConpherenceWidgetView' => 'AphrontView',
	@@ -3071,13 +2932,20 @@
	'DifferentialChangesetTwoUpRenderer' => 'DifferentialChangesetHTMLRenderer',
	'DifferentialChangesetTwoUpTestRenderer' => 'DifferentialChangesetTestRenderer',
	'DifferentialChangesetViewController' => 'DifferentialController',
	+ 'DifferentialCloseConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCommentPreviewController' => 'DifferentialController',
	'DifferentialCommentSaveController' => 'DifferentialController',
	'DifferentialCommitMessageParserTestCase' => 'PhabricatorTestCase',
	'DifferentialCommitsField' => 'DifferentialCustomField',
	+ 'DifferentialConduitAPIMethod' => 'ConduitAPIMethod',
	'DifferentialConflictsField' => 'DifferentialCustomField',
	'DifferentialController' => 'PhabricatorController',
	'DifferentialCoreCustomField' => 'DifferentialCustomField',
	+ 'DifferentialCreateCommentConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialCreateDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialCreateInlineConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialCreateRawDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialCreateRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialCustomField' => 'PhabricatorCustomField',
	'DifferentialCustomFieldDependsOnParser' => 'PhabricatorCustomFieldMonogramParser',
	'DifferentialCustomFieldDependsOnParserTestCase' => 'PhabricatorTestCase',
	@@ -3107,6 +2975,15 @@
	'DifferentialEditPolicyField' => 'DifferentialCoreCustomField',
	'DifferentialFieldParseException' => 'Exception',
	'DifferentialFieldValidationException' => 'Exception',
	+ 'DifferentialFindConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialFinishPostponedLintersConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetAllDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetCommitPathsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetRawDiffConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetRevisionCommentsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialGetRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialGitSVNIDField' => 'DifferentialCustomField',
	'DifferentialHostField' => 'DifferentialCustomField',
	'DifferentialHovercardEventListener' => 'PhabricatorEventListener',
	@@ -3137,11 +3014,14 @@
	'DifferentialPHIDTypeDiff' => 'PhabricatorPHIDType',
	'DifferentialPHIDTypeRevision' => 'PhabricatorPHIDType',
	'DifferentialParseCacheGarbageCollector' => 'PhabricatorGarbageCollector',
	+ 'DifferentialParseCommitMessageConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialParseRenderTestCase' => 'PhabricatorTestCase',
	'DifferentialPathField' => 'DifferentialCustomField',
	'DifferentialPrimaryPaneView' => 'AphrontView',
	'DifferentialProjectReviewersField' => 'DifferentialCustomField',
	'DifferentialProjectsField' => 'DifferentialCoreCustomField',
	+ 'DifferentialQueryConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialQueryDiffsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'DifferentialReplyHandler' => 'PhabricatorMailReplyHandler',
	'DifferentialRepositoryField' => 'DifferentialCoreCustomField',
	@@ -3178,6 +3058,7 @@
	'DifferentialRevisionUpdateHistoryView' => 'AphrontView',
	'DifferentialRevisionViewController' => 'DifferentialController',
	'DifferentialSearchIndexer' => 'PhabricatorSearchDocumentIndexer',
	+ 'DifferentialSetDiffPropertyConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialStoredCustomField' => 'DifferentialCustomField',
	'DifferentialSubscribersField' => 'DifferentialCoreCustomField',
	'DifferentialSummaryField' => 'DifferentialCoreCustomField',
	@@ -3189,15 +3070,19 @@
	'DifferentialTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'DifferentialTransactionView' => 'PhabricatorApplicationTransactionView',
	'DifferentialUnitField' => 'DifferentialCustomField',
	+ 'DifferentialUpdateRevisionConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	+ 'DifferentialUpdateUnitResultsConduitAPIMethod' => 'DifferentialConduitAPIMethod',
	'DifferentialViewPolicyField' => 'DifferentialCoreCustomField',
	'DiffusionArcanistProjectDatasource' => 'PhabricatorTypeaheadDatasource',
	'DiffusionAuditorDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
	+ 'DiffusionBranchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionBranchTableController' => 'DiffusionController',
	'DiffusionBranchTableView' => 'DiffusionView',
	'DiffusionBrowseController' => 'DiffusionController',
	'DiffusionBrowseDirectoryController' => 'DiffusionBrowseController',
	'DiffusionBrowseFileController' => 'DiffusionBrowseController',
	'DiffusionBrowseMainController' => 'DiffusionBrowseController',
	+ 'DiffusionBrowseQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionBrowseSearchController' => 'DiffusionBrowseController',
	'DiffusionBrowseTableView' => 'DiffusionView',
	'DiffusionCapabilityCreateRepositories' => 'PhabricatorPolicyCapability',
	@@ -3216,16 +3101,26 @@
	'DiffusionCommitHash' => 'Phobject',
	'DiffusionCommitHookEngine' => 'Phobject',
	'DiffusionCommitHookRejectException' => 'Exception',
	+ 'DiffusionCommitParentsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionCommitQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'DiffusionCommitRef' => 'Phobject',
	'DiffusionCommitRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'DiffusionCommitTagsController' => 'DiffusionController',
	+ 'DiffusionConduitAPIMethod' => 'ConduitAPIMethod',
	'DiffusionController' => 'PhabricatorController',
	+ 'DiffusionCreateCommentConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionDiffController' => 'DiffusionController',
	+ 'DiffusionDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
	'DiffusionEmptyResultView' => 'DiffusionView',
	+ 'DiffusionExistsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionExternalController' => 'DiffusionController',
	'DiffusionFileContentQuery' => 'DiffusionQuery',
	+ 'DiffusionFileContentQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	+ 'DiffusionFindSymbolsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	+ 'DiffusionGetCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	+ 'DiffusionGetLintMessagesConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	+ 'DiffusionGetRecentCommitsByPathConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionGitBranchTestCase' => 'PhabricatorTestCase',
	'DiffusionGitFileContentQuery' => 'DiffusionFileContentQuery',
	'DiffusionGitFileContentQueryTestCase' => 'PhabricatorTestCase',
	@@ -3233,14 +3128,17 @@
	'DiffusionGitRequest' => 'DiffusionRequest',
	'DiffusionGitResponse' => 'AphrontResponse',
	'DiffusionHistoryController' => 'DiffusionController',
	+ 'DiffusionHistoryQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionHistoryTableView' => 'DiffusionView',
	'DiffusionHovercardEventListener' => 'PhabricatorEventListener',
	'DiffusionInlineCommentController' => 'PhabricatorInlineCommentController',
	'DiffusionInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
	'DiffusionLastModifiedController' => 'DiffusionController',
	+ 'DiffusionLastModifiedQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionLintController' => 'DiffusionController',
	'DiffusionLintCountQuery' => 'PhabricatorQuery',
	'DiffusionLintDetailsController' => 'DiffusionController',
	+ 'DiffusionLookSoonConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionLowLevelCommitFieldsQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelCommitQuery' => 'DiffusionLowLevelQuery',
	'DiffusionLowLevelGitRefQuery' => 'DiffusionLowLevelQuery',
	@@ -3252,6 +3150,7 @@
	'DiffusionMercurialRawDiffQuery' => 'DiffusionRawDiffQuery',
	'DiffusionMercurialRequest' => 'DiffusionRequest',
	'DiffusionMercurialResponse' => 'AphrontResponse',
	+ 'DiffusionMergedCommitsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionMirrorDeleteController' => 'DiffusionController',
	'DiffusionMirrorEditController' => 'DiffusionController',
	'DiffusionPathCompleteController' => 'DiffusionController',
	@@ -3263,8 +3162,14 @@
	'DiffusionPushLogListController' => 'DiffusionPushLogController',
	'DiffusionPushLogListView' => 'AphrontView',
	'DiffusionQuery' => 'PhabricatorQuery',
	+ 'DiffusionQueryCommitsConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	+ 'DiffusionQueryConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	+ 'DiffusionQueryPathsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionRawDiffQuery' => 'DiffusionQuery',
	+ 'DiffusionRawDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	+ 'DiffusionReadmeQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionRefNotFoundException' => 'Exception',
	+ 'DiffusionRefsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionRepositoryController' => 'DiffusionController',
	'DiffusionRepositoryCreateController' => 'DiffusionRepositoryEditController',
	'DiffusionRepositoryDatasource' => 'PhabricatorTypeaheadDatasource',
	@@ -3285,6 +3190,7 @@
	'DiffusionRepositoryNewController' => 'DiffusionController',
	'DiffusionRepositoryRef' => 'Phobject',
	'DiffusionRepositoryRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	+ 'DiffusionResolveRefsConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionResolveUserQuery' => 'Phobject',
	'DiffusionSSHGitReceivePackWorkflow' => 'DiffusionSSHGitWorkflow',
	'DiffusionSSHGitUploadPackWorkflow' => 'DiffusionSSHGitWorkflow',
	@@ -3296,6 +3202,7 @@
	'DiffusionSSHSubversionServeWorkflow' => 'DiffusionSSHSubversionWorkflow',
	'DiffusionSSHSubversionWorkflow' => 'DiffusionSSHWorkflow',
	'DiffusionSSHWorkflow' => 'PhabricatorSSHWorkflow',
	+ 'DiffusionSearchQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionServeController' => 'DiffusionController',
	'DiffusionSetPasswordPanel' => 'PhabricatorSettingsPanel',
	'DiffusionSetupException' => 'AphrontUsageException',
	@@ -3309,7 +3216,9 @@
	'DiffusionSymbolQuery' => 'PhabricatorOffsetPagedQuery',
	'DiffusionTagListController' => 'DiffusionController',
	'DiffusionTagListView' => 'DiffusionView',
	+ 'DiffusionTagsQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
	'DiffusionURITestCase' => 'ArcanistPhutilTestCase',
	+ 'DiffusionUpdateCoverageConduitAPIMethod' => 'DiffusionConduitAPIMethod',
	'DiffusionView' => 'AphrontView',
	'DivinerArticleAtomizer' => 'DivinerAtomizer',
	'DivinerAtomCache' => 'DivinerDiskCache',
	@@ -3443,12 +3352,24 @@
	'DrydockSSHCommandInterface' => 'DrydockCommandInterface',
	'DrydockWebrootInterface' => 'DrydockInterface',
	'DrydockWorkingCopyBlueprintImplementation' => 'DrydockBlueprintImplementation',
	+ 'FeedConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'FeedPublishConduitAPIMethod' => 'FeedConduitAPIMethod',
	'FeedPublisherHTTPWorker' => 'FeedPushWorker',
	'FeedPublisherWorker' => 'FeedPushWorker',
	'FeedPushWorker' => 'PhabricatorWorker',
	+ 'FeedQueryConduitAPIMethod' => 'FeedConduitAPIMethod',
	+ 'FileConduitAPIMethod' => 'ConduitAPIMethod',
	'FileCreateMailReceiver' => 'PhabricatorMailReceiver',
	+ 'FileDownloadConduitAPIMethod' => 'FileConduitAPIMethod',
	+ 'FileInfoConduitAPIMethod' => 'FileConduitAPIMethod',
	'FileMailReceiver' => 'PhabricatorObjectMailReceiver',
	'FileReplyHandler' => 'PhabricatorMailReplyHandler',
	+ 'FileUploadConduitAPIMethod' => 'FileConduitAPIMethod',
	+ 'FileUploadHashConduitAPIMethod' => 'FileConduitAPIMethod',
	+ 'FlagConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'FlagDeleteConduitAPIMethod' => 'FlagConduitAPIMethod',
	+ 'FlagEditConduitAPIMethod' => 'FlagConduitAPIMethod',
	+ 'FlagQueryConduitAPIMethod' => 'FlagConduitAPIMethod',
	'HarbormasterBuild' => array(
	'HarbormasterDAO',
	'PhabricatorPolicyInterface',
	@@ -3525,6 +3446,7 @@
	'HarbormasterBuildableViewController' => 'HarbormasterController',
	'HarbormasterCapabilityManagePlans' => 'PhabricatorPolicyCapability',
	'HarbormasterCommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	+ 'HarbormasterConduitAPIMethod' => 'ConduitAPIMethod',
	'HarbormasterController' => 'PhabricatorController',
	'HarbormasterDAO' => 'PhabricatorLiskDAO',
	'HarbormasterHTTPRequestBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	@@ -3548,8 +3470,11 @@
	'HarbormasterPlanRunController' => 'HarbormasterController',
	'HarbormasterPlanViewController' => 'HarbormasterPlanController',
	'HarbormasterPublishFragmentBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	+ 'HarbormasterQueryBuildablesConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	+ 'HarbormasterQueryBuildsConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'HarbormasterScratchTable' => 'HarbormasterDAO',
	+ 'HarbormasterSendMessageConduitAPIMethod' => 'HarbormasterConduitAPIMethod',
	'HarbormasterSleepBuildStepImplementation' => 'HarbormasterBuildStepImplementation',
	'HarbormasterStepAddController' => 'HarbormasterController',
	'HarbormasterStepDeleteController' => 'HarbormasterController',
	@@ -3668,6 +3593,9 @@
	'LiskIsolationTestDAOException' => 'Exception',
	'LiskMigrationIterator' => 'PhutilBufferedIterator',
	'LiskRawMigrationIterator' => 'PhutilBufferedIterator',
	+ 'MacroConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'MacroCreateMemeConduitAPIMethod' => 'MacroConduitAPIMethod',
	+ 'MacroQueryConduitAPIMethod' => 'MacroConduitAPIMethod',
	'ManiphestActionMenuEventListener' => 'PhabricatorEventListener',
	'ManiphestBatchEditController' => 'ManiphestController',
	'ManiphestCapabilityBulkEdit' => 'PhabricatorPolicyCapability',
	@@ -3678,12 +3606,14 @@
	'ManiphestCapabilityEditPriority' => 'PhabricatorPolicyCapability',
	'ManiphestCapabilityEditProjects' => 'PhabricatorPolicyCapability',
	'ManiphestCapabilityEditStatus' => 'PhabricatorPolicyCapability',
	+ 'ManiphestConduitAPIMethod' => 'ConduitAPIMethod',
	'ManiphestConfiguredCustomField' => array(
	'ManiphestCustomField',
	'PhabricatorStandardCustomFieldInterface',
	),
	'ManiphestController' => 'PhabricatorController',
	'ManiphestCreateMailReceiver' => 'PhabricatorMailReceiver',
	+ 'ManiphestCreateTaskConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestCustomField' => 'PhabricatorCustomField',
	'ManiphestCustomFieldNumericIndex' => 'PhabricatorCustomFieldNumericIndexStorage',
	'ManiphestCustomFieldStatusParser' => 'PhabricatorCustomFieldMonogramParser',
	@@ -3693,10 +3623,15 @@
	'ManiphestDAO' => 'PhabricatorLiskDAO',
	'ManiphestExcelDefaultFormat' => 'ManiphestExcelFormat',
	'ManiphestExportController' => 'ManiphestController',
	+ 'ManiphestFindConduitAPIMethod' => 'ManiphestQueryConduitAPIMethod',
	+ 'ManiphestGetTaskTransactionsConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestHovercardEventListener' => 'PhabricatorEventListener',
	+ 'ManiphestInfoConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestNameIndex' => 'ManiphestDAO',
	'ManiphestNameIndexEventListener' => 'PhabricatorEventListener',
	'ManiphestPHIDTypeTask' => 'PhabricatorPHIDType',
	+ 'ManiphestQueryConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	+ 'ManiphestQueryStatusesConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'ManiphestReplyHandler' => 'PhabricatorMailReplyHandler',
	'ManiphestReportController' => 'ManiphestController',
	@@ -3738,6 +3673,7 @@
	'ManiphestTransactionPreviewController' => 'ManiphestController',
	'ManiphestTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'ManiphestTransactionSaveController' => 'ManiphestController',
	+ 'ManiphestUpdateConduitAPIMethod' => 'ManiphestConduitAPIMethod',
	'ManiphestView' => 'AphrontView',
	'MetaMTAMailReceivedGarbageCollector' => 'PhabricatorGarbageCollector',
	'MetaMTAMailSentGarbageCollector' => 'PhabricatorGarbageCollector',
	@@ -3746,7 +3682,9 @@
	'NuanceCapabilitySourceDefaultEdit' => 'PhabricatorPolicyCapability',
	'NuanceCapabilitySourceDefaultView' => 'PhabricatorPolicyCapability',
	'NuanceCapabilitySourceManage' => 'PhabricatorPolicyCapability',
	+ 'NuanceConduitAPIMethod' => 'ConduitAPIMethod',
	'NuanceController' => 'PhabricatorController',
	+ 'NuanceCreateItemConduitAPIMethod' => 'NuanceConduitAPIMethod',
	'NuanceDAO' => 'PhabricatorLiskDAO',
	'NuanceItem' => array(
	'NuanceDAO',
	@@ -3799,7 +3737,13 @@
	'NuanceSourceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
	'NuanceSourceViewController' => 'NuanceController',
	'NuanceTransaction' => 'PhabricatorApplicationTransaction',
	+ 'OwnersConduitAPIMethod' => 'ConduitAPIMethod',
	'OwnersPackageReplyHandler' => 'PhabricatorMailReplyHandler',
	+ 'OwnersQueryConduitAPIMethod' => 'OwnersConduitAPIMethod',
	+ 'PHIDConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'PHIDInfoConduitAPIMethod' => 'PHIDConduitAPIMethod',
	+ 'PHIDLookupConduitAPIMethod' => 'PHIDConduitAPIMethod',
	+ 'PHIDQueryConduitAPIMethod' => 'PHIDConduitAPIMethod',
	'PHUIActionHeaderExample' => 'PhabricatorUIExample',
	'PHUIActionHeaderView' => 'AphrontView',
	'PHUIBoxExample' => 'PhabricatorUIExample',
	@@ -3892,9 +3836,13 @@
	'PassphraseSSHKey' => 'PassphraseAbstractKey',
	'PassphraseSecret' => 'PassphraseDAO',
	'PasteCapabilityDefaultView' => 'PhabricatorPolicyCapability',
	+ 'PasteConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'PasteCreateConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteCreateMailReceiver' => 'PhabricatorMailReceiver',
	'PasteEmbedView' => 'AphrontView',
	+ 'PasteInfoConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteMockMailReceiver' => 'PhabricatorObjectMailReceiver',
	+ 'PasteQueryConduitAPIMethod' => 'PasteConduitAPIMethod',
	'PasteReplyHandler' => 'PhabricatorMailReplyHandler',
	'PeopleCapabilityBrowseUserDirectory' => 'PhabricatorPolicyCapability',
	'PeopleUserLogGarbageCollector' => 'PhabricatorGarbageCollector',
	@@ -5118,7 +5066,6 @@
	'PhabricatorSubscriptionsTransactionController' => 'PhabricatorController',
	'PhabricatorSubscriptionsUIEventListener' => 'PhabricatorEventListener',
	'PhabricatorSupportApplication' => 'PhabricatorApplication',
	- 'PhabricatorSymbolNameLinter' => 'ArcanistXHPASTLintNamingHook',
	'PhabricatorSyntaxHighlightingConfigOptions' => 'PhabricatorApplicationConfigOptions',
	'PhabricatorSystemActionEngine' => 'Phobject',
	'PhabricatorSystemActionGarbageCollector' => 'PhabricatorGarbageCollector',
	@@ -5279,7 +5226,9 @@
	'PhameBlogSkin' => 'PhabricatorController',
	'PhameBlogViewController' => 'PhameController',
	'PhameCelerityResources' => 'CelerityResources',
	+ 'PhameConduitAPIMethod' => 'ConduitAPIMethod',
	'PhameController' => 'PhabricatorController',
	+ 'PhameCreatePostConduitAPIMethod' => 'PhameConduitAPIMethod',
	'PhameDAO' => 'PhabricatorLiskDAO',
	'PhamePost' => array(
	'PhameDAO',
	@@ -5299,6 +5248,8 @@
	'PhamePostUnpublishController' => 'PhameController',
	'PhamePostView' => 'AphrontView',
	'PhamePostViewController' => 'PhameController',
	+ 'PhameQueryConduitAPIMethod' => 'PhameConduitAPIMethod',
	+ 'PhameQueryPostsConduitAPIMethod' => 'PhameConduitAPIMethod',
	'PhameResourceController' => 'CelerityResourceController',
	'PhluxController' => 'PhabricatorController',
	'PhluxDAO' => 'PhabricatorLiskDAO',
	@@ -5414,6 +5365,7 @@
	'PhortuneWePayPaymentProvider' => 'PhortunePaymentProvider',
	'PhragmentBrowseController' => 'PhragmentController',
	'PhragmentCapabilityCanCreate' => 'PhabricatorPolicyCapability',
	+ 'PhragmentConduitAPIMethod' => 'ConduitAPIMethod',
	'PhragmentController' => 'PhabricatorController',
	'PhragmentCreateController' => 'PhragmentController',
	'PhragmentDAO' => 'PhabricatorLiskDAO',
	@@ -5427,6 +5379,7 @@
	'PhabricatorPolicyInterface',
	),
	'PhragmentFragmentVersionQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	+ 'PhragmentGetPatchConduitAPIMethod' => 'PhragmentConduitAPIMethod',
	'PhragmentHistoryController' => 'PhragmentController',
	'PhragmentPHIDTypeFragment' => 'PhabricatorPHIDType',
	'PhragmentPHIDTypeFragmentVersion' => 'PhabricatorPHIDType',
	@@ -5434,6 +5387,7 @@
	'PhragmentPatchController' => 'PhragmentController',
	'PhragmentPatchUtil' => 'Phobject',
	'PhragmentPolicyController' => 'PhragmentController',
	+ 'PhragmentQueryFragmentsConduitAPIMethod' => 'PhragmentConduitAPIMethod',
	'PhragmentRevertController' => 'PhragmentController',
	'PhragmentSnapshot' => array(
	'PhragmentDAO',
	@@ -5452,14 +5406,18 @@
	'PhragmentUpdateController' => 'PhragmentController',
	'PhragmentVersionController' => 'PhragmentController',
	'PhragmentZIPController' => 'PhragmentController',
	+ 'PhrequentConduitAPIMethod' => 'ConduitAPIMethod',
	'PhrequentController' => 'PhabricatorController',
	'PhrequentDAO' => 'PhabricatorLiskDAO',
	'PhrequentListController' => 'PhrequentController',
	+ 'PhrequentPopConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	+ 'PhrequentPushConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	'PhrequentSearchEngine' => 'PhabricatorApplicationSearchEngine',
	'PhrequentTimeBlock' => 'Phobject',
	'PhrequentTimeBlockTestCase' => 'PhabricatorTestCase',
	'PhrequentTimeSlices' => 'Phobject',
	'PhrequentTrackController' => 'PhrequentController',
	+ 'PhrequentTrackingConduitAPIMethod' => 'PhrequentConduitAPIMethod',
	'PhrequentTrackingEditor' => 'PhabricatorEditor',
	'PhrequentUIEventListener' => 'PhabricatorEventListener',
	'PhrequentUserTime' => array(
	@@ -5470,6 +5428,7 @@
	'PhrictionActionConstants' => 'PhrictionConstants',
	'PhrictionActionMenuEventListener' => 'PhabricatorEventListener',
	'PhrictionChangeType' => 'PhrictionConstants',
	+ 'PhrictionConduitAPIMethod' => 'ConduitAPIMethod',
	'PhrictionContent' => array(
	'PhrictionDAO',
	'PhabricatorMarkupInterface',
	@@ -5492,8 +5451,11 @@
	'PhrictionDocumentQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
	'PhrictionDocumentStatus' => 'PhrictionConstants',
	'PhrictionDocumentTestCase' => 'PhabricatorTestCase',
	+ 'PhrictionEditConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionEditController' => 'PhrictionController',
	+ 'PhrictionHistoryConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionHistoryController' => 'PhrictionController',
	+ 'PhrictionInfoConduitAPIMethod' => 'PhrictionConduitAPIMethod',
	'PhrictionListController' => 'PhrictionController',
	'PhrictionMoveController' => 'PhrictionController',
	'PhrictionNewController' => 'PhrictionController',
	@@ -5563,6 +5525,8 @@
	'PonderVoteEditor' => 'PhabricatorEditor',
	'PonderVoteSaveController' => 'PonderController',
	'ProjectCapabilityCreateProjects' => 'PhabricatorPolicyCapability',
	+ 'ProjectConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'ProjectQueryConduitAPIMethod' => 'ProjectConduitAPIMethod',
	'ProjectRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	'QueryFormattingTestCase' => 'PhabricatorTestCase',
	'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification',
	@@ -5589,6 +5553,7 @@
	),
	'ReleephCommitFinderException' => 'Exception',
	'ReleephCommitMessageFieldSpecification' => 'ReleephFieldSpecification',
	+ 'ReleephConduitAPIMethod' => 'ConduitAPIMethod',
	'ReleephController' => 'PhabricatorController',
	'ReleephDAO' => 'PhabricatorLiskDAO',
	'ReleephDefaultFieldSelector' => 'ReleephFieldSelector',
	@@ -5601,6 +5566,7 @@
	'PhabricatorCustomField',
	'PhabricatorMarkupInterface',
	),
	+ 'ReleephGetBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephIntentFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephLevelFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephOriginalCommitFieldSpecification' => 'ReleephFieldSpecification',
	@@ -5626,6 +5592,10 @@
	'ReleephDAO',
	'PhabricatorPolicyInterface',
	),
	+ 'ReleephProjectInfoConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephQueryBranchesConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephQueryProductsConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephQueryRequestsConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephReasonFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephRequest' => array(
	'ReleephDAO',
	@@ -5634,6 +5604,7 @@
	),
	'ReleephRequestActionController' => 'ReleephRequestController',
	'ReleephRequestCommentController' => 'ReleephRequestController',
	+ 'ReleephRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
	'ReleephRequestController' => 'ReleephController',
	'ReleephRequestDifferentialCreateController' => 'ReleephController',
	'ReleephRequestEditController' => 'ReleephBranchController',
	@@ -5653,8 +5624,35 @@
	'ReleephRevisionFieldSpecification' => 'ReleephFieldSpecification',
	'ReleephSeverityFieldSpecification' => 'ReleephLevelFieldSpecification',
	'ReleephSummaryFieldSpecification' => 'ReleephFieldSpecification',
	+ 'ReleephWorkCanPushConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkGetAuthorInfoConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkGetBranchCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkGetBranchConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkGetCommitMessageConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkNextRequestConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkRecordConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'ReleephWorkRecordPickStatusConduitAPIMethod' => 'ReleephConduitAPIMethod',
	+ 'RemarkupProcessConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'RepositoryConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'RepositoryCreateConduitAPIMethod' => 'RepositoryConduitAPIMethod',
	+ 'RepositoryQueryConduitAPIMethod' => 'RepositoryConduitAPIMethod',
	'ShellLogView' => 'AphrontView',
	+ 'SlowvoteConduitAPIMethod' => 'ConduitAPIMethod',
	'SlowvoteEmbedView' => 'AphrontView',
	+ 'SlowvoteInfoConduitAPIMethod' => 'SlowvoteConduitAPIMethod',
	'SlowvoteRemarkupRule' => 'PhabricatorRemarkupRuleObject',
	+ 'TokenConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'TokenGiveConduitAPIMethod' => 'TokenConduitAPIMethod',
	+ 'TokenGivenConduitAPIMethod' => 'TokenConduitAPIMethod',
	+ 'TokenQueryConduitAPIMethod' => 'TokenConduitAPIMethod',
	+ 'UserAddStatusConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserConduitAPIMethod' => 'ConduitAPIMethod',
	+ 'UserDisableConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserEnableConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserFindConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserInfoConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserQueryConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserRemoveStatusConduitAPIMethod' => 'UserConduitAPIMethod',
	+ 'UserWhoAmIConduitAPIMethod' => 'UserConduitAPIMethod',
	),
	));
	diff --git a/src/applications/arcanist/conduit/ArcanistConduitAPIMethod.php b/src/applications/arcanist/conduit/ArcanistConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/arcanist/conduit/ArcanistConduitAPIMethod.php
	@@ -0,0 +1,3 @@
	+<?php
	+
	+abstract class ArcanistConduitAPIMethod extends ConduitAPIMethod {}
	diff --git a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php b/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php
	rename from src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
	rename to src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php
	--- a/src/applications/arcanist/conduit/ConduitAPI_arcanist_projectinfo_Method.php
	+++ b/src/applications/arcanist/conduit/ArcanistProjectInfoConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_arcanist_projectinfo_Method
	- extends ConduitAPI_arcanist_Method {
	+final class ArcanistProjectInfoConduitAPIMethod
	+ extends ArcanistConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'arcanist.projectinfo';
	+ }

	public function getMethodDescription() {
	return 'Get information about Arcanist projects.';
	diff --git a/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php b/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php
	deleted file mode 100644
	--- a/src/applications/arcanist/conduit/ConduitAPI_arcanist_Method.php
	+++ /dev/null
	@@ -1,3 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_arcanist_Method extends ConduitAPIMethod {}
	diff --git a/src/applications/audit/conduit/AuditConduitAPIMethod.php b/src/applications/audit/conduit/AuditConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/audit/conduit/AuditConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class AuditConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationAudit');
	+ }
	+
	+}
	diff --git a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
	rename from src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
	rename to src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
	--- a/src/applications/audit/conduit/ConduitAPI_audit_query_Method.php
	+++ b/src/applications/audit/conduit/AuditQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_audit_query_Method extends ConduitAPI_audit_Method {
	+final class AuditQueryConduitAPIMethod extends AuditConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'audit.query';
	+ }

	public function getMethodDescription() {
	return 'Query audit requests.';
	diff --git a/src/applications/audit/conduit/ConduitAPI_audit_Method.php b/src/applications/audit/conduit/ConduitAPI_audit_Method.php
	deleted file mode 100644
	--- a/src/applications/audit/conduit/ConduitAPI_audit_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_audit_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorAuditApplication');
	- }
	-
	-}
	diff --git a/src/applications/chatlog/conduit/ChatLogConduitAPIMethod.php b/src/applications/chatlog/conduit/ChatLogConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/chatlog/conduit/ChatLogConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class ChatLogConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationChatLog');
	+ }
	+
	+}
	diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php b/src/applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php
	rename from src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
	rename to src/applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php
	--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_query_Method.php
	+++ b/src/applications/chatlog/conduit/ChatLogQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_chatlog_query_Method extends ConduitAPI_chatlog_Method {
	+final class ChatLogQueryConduitAPIMethod extends ChatLogConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'chatlog.query';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php b/src/applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php
	rename from src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
	rename to src/applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php
	--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_record_Method.php
	+++ b/src/applications/chatlog/conduit/ChatLogRecordConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_chatlog_record_Method extends ConduitAPI_chatlog_Method {
	+final class ChatLogRecordConduitAPIMethod extends ChatLogConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'chatlog.record';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php b/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
	deleted file mode 100644
	--- a/src/applications/chatlog/conduit/ConduitAPI_chatlog_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_chatlog_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorChatLogApplication');
	- }
	-
	-}
	diff --git a/src/applications/conduit/call/ConduitCall.php b/src/applications/conduit/call/ConduitCall.php
	--- a/src/applications/conduit/call/ConduitCall.php
	+++ b/src/applications/conduit/call/ConduitCall.php
	@@ -168,41 +168,19 @@
	return $servers[array_rand($servers)];
	}

	- protected function buildMethodHandler($method) {
	- $method_class = ConduitAPIMethod::getClassNameFromAPIMethodName($method);
	+ protected function buildMethodHandler($method_name) {
	+ $method = ConduitAPIMethod::getConduitMethod($method_name);

	- // Test if the method exists.
	- $ok = false;
	- try {
	- $ok = class_exists($method_class);
	- } catch (Exception $ex) {
	- // Discard, we provide a more specific exception below.
	- }
	- if (!$ok) {
	- throw new ConduitException(
	- "Conduit method '{$method}' does not exist.");
	- }
	-
	- $class_info = new ReflectionClass($method_class);
	- if ($class_info->isAbstract()) {
	- throw new ConduitException(
	- "Method '{$method}' is not valid; the implementation is an abstract ".
	- "base class.");
	- }
	-
	- $method = newv($method_class, array());
	-
	- if (!($method instanceof ConduitAPIMethod)) {
	+ if (!$method) {
	throw new ConduitException(
	- "Method '{$method_class}' is not valid; the implementation must be ".
	- "a subclass of ConduitAPIMethod.");
	+ "Conduit method '{$method_name}' does not exist.");
	}

	$application = $method->getApplication();
	if ($application && !$application->isInstalled()) {
	$app_name = $application->getName();
	throw new ConduitException(
	- "Method '{$method_class}' belongs to application '{$app_name}', ".
	+ "Method '{$method_name}' belongs to application '{$app_name}', ".
	"which is not installed.");
	}

	diff --git a/src/applications/conduit/method/ConduitAPIMethod.php b/src/applications/conduit/method/ConduitAPIMethod.php
	--- a/src/applications/conduit/method/ConduitAPIMethod.php
	+++ b/src/applications/conduit/method/ConduitAPIMethod.php
	@@ -18,9 +18,7 @@
	abstract public function defineErrorTypes();
	abstract protected function execute(ConduitAPIRequest $request);

	- public function __construct() {
	-
	- }
	+ public function __construct() {}

	/**
	* This is mostly for compatibility with
	@@ -67,9 +65,7 @@
	return $this->execute($request);
	}

	- public function getAPIMethodName() {
	- return self::getAPIMethodNameFromClassName(get_class($this));
	- }
	+ public abstract function getAPIMethodName();

	/**
	* Return a key which sorts methods by application name, then method status,
	@@ -94,9 +90,33 @@
	return head(explode('.', $this->getAPIMethodName(), 2));
	}

	- public static function getClassNameFromAPIMethodName($method_name) {
	- $method_fragment = str_replace('.', '_', $method_name);
	- return 'ConduitAPI_'.$method_fragment.'_Method';
	+ public static function getConduitMethod($method_name) {
	+ static $method_map = null;
	+
	+ if ($method_map === null) {
	+ $methods = id(new PhutilSymbolLoader())
	+ ->setAncestorClass(__CLASS__)
	+ ->setConcreteOnly(true)
	+ ->loadObjects();
	+
	+ foreach ($methods as $method) {
	+ $name = $method->getAPIMethodName();
	+
	+ if (empty($method_map[$name])) {
	+ $method_map[$name] = $method;
	+ continue;
	+ }
	+
	+ $orig_class = get_class($method_map[$name]);
	+ $this_class = get_class($method);
	+ throw new Exception(
	+ "Two Conduit API method classes ({$orig_class}, {$this_class}) ".
	+ "both have the same method name ({$name}). API methods ".
	+ "must have unique method names.");
	+ }
	+ }
	+
	+ return idx($method_map, $method_name);
	}

	public function shouldRequireAuthentication() {
	@@ -122,20 +142,6 @@
	return null;
	}

	- public static function getAPIMethodNameFromClassName($class_name) {
	- $match = null;
	- $is_valid = preg_match(
	- '/^ConduitAPI_(.*)_Method$/',
	- $class_name,
	- $match);
	- if (!$is_valid) {
	- throw new Exception(
	- "Parameter '{$class_name}' is not a valid Conduit API method class.");
	- }
	- $method_fragment = $match[1];
	- return str_replace('_', '.', $method_fragment);
	- }
	-
	protected function formatStringConstants($constants) {
	foreach ($constants as $key => $value) {
	$constants[$key] = '"'.$value.'"';
	@@ -153,9 +159,9 @@
	*/
	protected function getPagerParamTypes() {
	return array(
	- 'before' => 'optional string',
	- 'after' => 'optional string',
	- 'limit' => 'optional int (default = 100)',
	+ 'before' => 'optional string',
	+ 'after' => 'optional string',
	+ 'limit' => 'optional int (default = 100)',
	);
	}

	@@ -229,7 +235,7 @@

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	if (!$this->shouldRequireAuthentication()) {
	- // Make unauthenticated methods univerally visible.
	+ // Make unauthenticated methods universally visible.
	return true;
	}

	@@ -240,5 +246,4 @@
	return null;
	}

	-
	}
	diff --git a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	rename from src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
	rename to src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	--- a/src/applications/conduit/method/ConduitAPI_conduit_connect_Method.php
	+++ b/src/applications/conduit/method/ConduitConnectConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_conduit_connect_Method extends ConduitAPIMethod {
	+final class ConduitConnectConduitAPIMethod extends ConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conduit.connect';
	+ }

	public function shouldRequireAuthentication() {
	return false;
	diff --git a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/ConduitGetCertificateConduitAPIMethod.php
	rename from src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
	rename to src/applications/conduit/method/ConduitGetCertificateConduitAPIMethod.php
	--- a/src/applications/conduit/method/ConduitAPI_conduit_getcertificate_Method.php
	+++ b/src/applications/conduit/method/ConduitGetCertificateConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_conduit_getcertificate_Method extends ConduitAPIMethod {
	+final class ConduitGetCertificateConduitAPIMethod extends ConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conduit.getcertificate';
	+ }

	public function shouldRequireAuthentication() {
	return false;
	diff --git a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php b/src/applications/conduit/method/ConduitPingConduitAPIMethod.php
	rename from src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
	rename to src/applications/conduit/method/ConduitPingConduitAPIMethod.php
	--- a/src/applications/conduit/method/ConduitAPI_conduit_ping_Method.php
	+++ b/src/applications/conduit/method/ConduitPingConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_conduit_ping_Method extends ConduitAPIMethod {
	+final class ConduitPingConduitAPIMethod extends ConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conduit.ping';
	+ }

	public function shouldRequireAuthentication() {
	return false;
	diff --git a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php b/src/applications/conduit/method/ConduitQueryConduitAPIMethod.php
	rename from src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
	rename to src/applications/conduit/method/ConduitQueryConduitAPIMethod.php
	--- a/src/applications/conduit/method/ConduitAPI_conduit_query_Method.php
	+++ b/src/applications/conduit/method/ConduitQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_conduit_query_Method extends ConduitAPIMethod {
	+final class ConduitQueryConduitAPIMethod extends ConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conduit.query';
	+ }

	public function getMethodDescription() {
	return 'Returns the parameters of the Conduit methods.';
	diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php b/src/applications/conpherence/conduit/ConpherenceConduitAPIMethod.php
	rename from src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
	rename to src/applications/conpherence/conduit/ConpherenceConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_Method.php
	+++ b/src/applications/conpherence/conduit/ConpherenceConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_conpherence_Method extends ConduitAPIMethod {
	+abstract class ConpherenceConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorConpherenceApplication');
	}
	diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php b/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	rename from src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php
	rename to src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_createthread_Method.php
	+++ b/src/applications/conpherence/conduit/ConpherenceCreateThreadConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_conpherence_createthread_Method
	- extends ConduitAPI_conpherence_Method {
	+final class ConpherenceCreateThreadConduitAPIMethod
	+ extends ConpherenceConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conpherence.createthread';
	+ }

	public function getMethodDescription() {
	return pht('Create a new conpherence thread.');
	diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php b/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	rename from src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php
	rename to src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querythread_Method.php
	+++ b/src/applications/conpherence/conduit/ConpherenceQueryThreadConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_conpherence_querythread_Method
	- extends ConduitAPI_conpherence_Method {
	+final class ConpherenceQueryThreadConduitAPIMethod
	+ extends ConpherenceConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conpherence.querythread';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php b/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	rename from src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php
	rename to src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_querytransaction_Method.php
	+++ b/src/applications/conpherence/conduit/ConpherenceQueryTransactionConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_conpherence_querytransaction_Method
	- extends ConduitAPI_conpherence_Method {
	+final class ConpherenceQueryTransactionConduitAPIMethod
	+ extends ConpherenceConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conpherence.querytransaction';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php b/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	rename from src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php
	rename to src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	--- a/src/applications/conpherence/conduit/ConduitAPI_conpherence_updatethread_Method.php
	+++ b/src/applications/conpherence/conduit/ConpherenceUpdateThreadConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_conpherence_updatethread_Method
	- extends ConduitAPI_conpherence_Method {
	+final class ConpherenceUpdateThreadConduitAPIMethod
	+ extends ConpherenceConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'conpherence.updatethread';
	+ }

	public function getMethodDescription() {
	return pht('Update an existing conpherence thread.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
	rename to src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_close_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCloseConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_close_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCloseConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.close';
	+ }

	public function getMethodDescription() {
	return pht('Close a Differential revision.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_Method.php b/src/applications/differential/conduit/DifferentialConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_Method.php
	rename to src/applications/differential/conduit/DifferentialConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_Method.php
	+++ b/src/applications/differential/conduit/DifferentialConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_differential_Method extends ConduitAPIMethod {
	+abstract class DifferentialConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorDifferentialApplication');
	}
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
	rename to src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_createcomment_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCreateCommentConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_createcomment_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCreateCommentConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.createcomment';
	+ }

	public function getMethodDescription() {
	return pht('Add a comment to a Differential revision.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
	rename to src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_creatediff_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCreateDiffConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_creatediff_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCreateDiffConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.creatediff';
	+ }

	public function getMethodDescription() {
	return 'Create a new Differential diff.';
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php b/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
	rename to src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_createinline_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCreateInlineConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_createinline_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCreateInlineConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.createinline';
	+ }

	public function getMethodDescription() {
	return 'Add an inline comment to a Differential revision.';
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
	rename to src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_createrawdiff_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCreateRawDiffConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_createrawdiff_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCreateRawDiffConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.createrawdiff';
	+ }

	public function getMethodDescription() {
	return pht('Create a new Differential diff from a raw diff source.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php b/src/applications/differential/conduit/DifferentialCreateRevisionConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php
	rename to src/applications/differential/conduit/DifferentialCreateRevisionConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_createrevision_Method.php
	+++ b/src/applications/differential/conduit/DifferentialCreateRevisionConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_createrevision_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialCreateRevisionConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.createrevision';
	+ }

	public function getMethodDescription() {
	return pht('Create a new Differential revision.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
	rename to src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_find_Method.php
	+++ b/src/applications/differential/conduit/DifferentialFindConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_find_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialFindConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.find';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php b/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
	rename to src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_finishpostponedlinters_Method.php
	+++ b/src/applications/differential/conduit/DifferentialFinishPostponedLintersConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_finishpostponedlinters_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialFinishPostponedLintersConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.finishpostponedlinters';
	+ }

	public function getMethodDescription() {
	return 'Update diff with new lint messages and mark postponed '.
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php b/src/applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
	rename to src/applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getalldiffs_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetAllDiffsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getalldiffs_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetAllDiffsConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getalldiffs';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php b/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
	rename to src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitmessage_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetCommitMessageConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getcommitmessage_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetCommitMessageConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getcommitmessage';
	+ }

	public function getMethodDescription() {
	return 'Retrieve Differential commit messages or message templates.';
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php b/src/applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
	rename to src/applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getcommitpaths_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetCommitPathsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getcommitpaths_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetCommitPathsConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getcommitpaths';
	+ }

	public function getMethodDescription() {
	return 'Query which paths should be included when committing a '.
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php b/src/applications/differential/conduit/DifferentialGetDiffConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
	rename to src/applications/differential/conduit/DifferentialGetDiffConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetDiffConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getdiff_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetDiffConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getdiff';
	+ }

	public function shouldAllowPublic() {
	return true;
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php b/src/applications/differential/conduit/DifferentialGetRawDiffConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
	rename to src/applications/differential/conduit/DifferentialGetRawDiffConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getrawdiff_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetRawDiffConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getrawdiff_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetRawDiffConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getrawdiff';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve a raw diff');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php b/src/applications/differential/conduit/DifferentialGetRevisionCommentsConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php
	rename to src/applications/differential/conduit/DifferentialGetRevisionCommentsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getrevisioncomments_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetRevisionCommentsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getrevisioncomments_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetRevisionCommentsConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getrevisioncomments';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php
	rename to src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getrevision_Method.php
	+++ b/src/applications/differential/conduit/DifferentialGetRevisionConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_getrevision_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialGetRevisionConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.getrevision';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
	rename to src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_parsecommitmessage_Method.php
	+++ b/src/applications/differential/conduit/DifferentialParseCommitMessageConduitAPIMethod.php
	@@ -1,10 +1,14 @@
	<?php

	-final class ConduitAPI_differential_parsecommitmessage_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialParseCommitMessageConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {

	private $errors;

	+ public function getAPIMethodName() {
	+ return 'differential.parsecommitmessage';
	+ }
	+
	public function getMethodDescription() {
	return pht('Parse commit messages for Differential fields.');
	}
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_query_Method.php
	rename to src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_query_Method.php
	+++ b/src/applications/differential/conduit/DifferentialQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_query_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialQueryConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.query';
	+ }

	public function getMethodDescription() {
	return 'Query Differential revisions which match certain criteria.';
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php b/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php
	rename to src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_querydiffs_Method.php
	+++ b/src/applications/differential/conduit/DifferentialQueryDiffsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_querydiffs_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialQueryDiffsConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.querydiffs';
	+ }

	public function getMethodDescription() {
	return pht('Query differential diffs which match certain criteria.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php b/src/applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
	rename to src/applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_setdiffproperty_Method.php
	+++ b/src/applications/differential/conduit/DifferentialSetDiffPropertyConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_setdiffproperty_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialSetDiffPropertyConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.setdiffproperty';
	+ }

	public function getMethodDescription() {
	return 'Attach properties to Differential diffs.';
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php
	rename to src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_updaterevision_Method.php
	+++ b/src/applications/differential/conduit/DifferentialUpdateRevisionConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_updaterevision_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialUpdateRevisionConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.updaterevision';
	+ }

	public function getMethodDescription() {
	return pht('Update a Differential revision.');
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php b/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	rename from src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
	rename to src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	--- a/src/applications/differential/conduit/ConduitAPI_differential_updateunitresults_Method.php
	+++ b/src/applications/differential/conduit/DifferentialUpdateUnitResultsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_differential_updateunitresults_Method
	- extends ConduitAPI_differential_Method {
	+final class DifferentialUpdateUnitResultsConduitAPIMethod
	+ extends DifferentialConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.updateunitresults';
	+ }

	public function getMethodDescription() {
	return 'Update arc unit results for a postponed test.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php b/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
	deleted file mode 100644
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_Method.php
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_diffusion_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass(
	- 'PhabricatorDiffusionApplication');
	- }
	-
	-}
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_branchquery_Method.php b/src/applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_branchquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_branchquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_branchquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionBranchQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.branchquery';
	+ }

	public function getMethodDescription() {
	return pht('Determine what branches exist for a repository.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_browsequery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_browsequery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionBrowseQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.browsequery';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php b/src/applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_commitparentsquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionCommitParentsQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_commitparentsquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionCommitParentsQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.commitparentsquery';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/diffusion/conduit/DiffusionConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/diffusion/conduit/DiffusionConduitAPIMethod.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+abstract class DiffusionConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass(
	+ 'PhabricatorApplicationDiffusion');
	+ }
	+
	+}
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php b/src/applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php
	rename to src/applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_createcomment_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionCreateCommentConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_createcomment_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionCreateCommentConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.createcomment';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_diffquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php
	@@ -1,10 +1,14 @@
	<?php

	-final class ConduitAPI_diffusion_diffquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionDiffQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {

	private $effectiveCommit;

	+ public function getAPIMethodName() {
	+ return 'diffusion.diffquery';
	+ }
	+
	public function getMethodDescription() {
	return
	'Get diff information from a repository for a specific path at an '.
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_existsquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_existsquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionExistsQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.existsquery';
	+ }

	public function getMethodDescription() {
	return 'Determine if code exists in a version control system.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php b/src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_filecontentquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionFileContentQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_filecontentquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionFileContentQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.filecontentquery';
	+ }

	public function getMethodDescription() {
	return 'Retrieve file content from a repository.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php b/src/applications/diffusion/conduit/DiffusionFindSymbolsConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
	rename to src/applications/diffusion/conduit/DiffusionFindSymbolsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_findsymbols_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionFindSymbolsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_findsymbols_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionFindSymbolsConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.findsymbols';
	+ }

	public function getMethodDescription() {
	return 'Retrieve Diffusion symbol information.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php b/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php
	rename to src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getcommits_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionGetCommitsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_getcommits_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionGetCommitsConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.getcommits';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve Diffusion commit information.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php b/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
	rename to src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getlintmessages_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionGetLintMessagesConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_getlintmessages_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionGetLintMessagesConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.getlintmessages';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
	rename to src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionGetRecentCommitsByPathConduitAPIMethod.php
	@@ -1,10 +1,14 @@
	<?php

	-final class ConduitAPI_diffusion_getrecentcommitsbypath_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionGetRecentCommitsByPathConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {

	const DEFAULT_LIMIT = 10;

	+ public function getAPIMethodName() {
	+ return 'diffusion.getrecentcommitsbypath';
	+ }
	+
	public function getMethodDescription() {
	return 'Get commit identifiers for recent commits affecting a given path.';
	}
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php b/src/applications/diffusion/conduit/DiffusionHistoryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionHistoryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_historyquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionHistoryConduitAPIMethod.php
	@@ -1,10 +1,14 @@
	<?php

	-final class ConduitAPI_diffusion_historyquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionHistoryQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {

	private $parents = array();

	+ public function getAPIMethodName() {
	+ return 'diffusion.historyquery';
	+ }
	+
	public function getMethodDescription() {
	return 'Returns history information for a repository at a specific '.
	'commit and path.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_lastmodifiedquery_Method.php b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_lastmodifiedquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_lastmodifiedquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_lastmodifiedquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionLastModifiedQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.lastmodifiedquery';
	+ }

	public function getMethodDescription() {
	return pht('Get the commits at which paths were last modified.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_looksoon_Method.php b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_looksoon_Method.php
	rename to src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_looksoon_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionLookSoonConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_looksoon_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionLookSoonConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.looksoon';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_mergedcommitsquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_mergedcommitsquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionMergedCommitsQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.mergedcommitsquery';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_querycommits_Method.php b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_querycommits_Method.php
	rename to src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_querycommits_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionQueryCommitsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_querycommits_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionQueryCommitsConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.querycommits';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve information about commits.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_abstractquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionQueryConduitAPIMethod.php
	@@ -1,7 +1,7 @@
	<?php

	-abstract class ConduitAPI_diffusion_abstractquery_Method
	- extends ConduitAPI_diffusion_Method {
	+abstract class DiffusionQueryConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {

	public function shouldAllowPublic() {
	return true;
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_querypaths_Method.php b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_querypaths_Method.php
	rename to src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_querypaths_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_querypaths_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionQueryPathsConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.querypaths';
	+ }

	public function getMethodDescription() {
	return pht('Filename search on a repository.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php b/src/applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_rawdiffquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionRawDiffQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_rawdiffquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionRawDiffQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.rawdiffquery';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_readmequery_Method.php b/src/applications/diffusion/conduit/DiffusionReadmeQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_readmequery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionReadmeQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_readmequery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionReadmeQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_readmequery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionReadmeQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.readmequery';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php b/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_refsquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionRefsQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_refsquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionRefsQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.refsquery';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_resolverefs_Method.php b/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_resolverefs_Method.php
	rename to src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_resolverefs_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionResolveRefsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_resolverefs_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionResolveRefsConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.resolverefsquery';
	+ }

	public function getMethodDescription() {
	return pht('Resolve references into stable, canonical identifiers.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_searchquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_searchquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionSearchQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.searchquery';
	+ }

	public function getMethodDescription() {
	return 'Search (grep) a repository at a specific path and commit.';
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_tagsquery_Method.php b/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_tagsquery_Method.php
	rename to src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_tagsquery_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionTagsQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_tagsquery_Method
	- extends ConduitAPI_diffusion_abstractquery_Method {
	+final class DiffusionTagsQueryConduitAPIMethod
	+ extends DiffusionQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'differential.tagsquery';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve information about tags in a repository.');
	diff --git a/src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php b/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php
	rename from src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php
	rename to src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php
	--- a/src/applications/diffusion/conduit/ConduitAPI_diffusion_updatecoverage_Method.php
	+++ b/src/applications/diffusion/conduit/DiffusionUpdateCoverageConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_diffusion_updatecoverage_Method
	- extends ConduitAPI_diffusion_Method {
	+final class DiffusionUpdateCoverageConduitAPIMethod
	+ extends DiffusionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'diffusion.updatecoverage';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/feed/conduit/ConduitAPI_feed_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_Method.php
	deleted file mode 100644
	--- a/src/applications/feed/conduit/ConduitAPI_feed_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_feed_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorFeedApplication');
	- }
	-
	-}
	diff --git a/src/applications/feed/conduit/FeedConduitAPIMethod.php b/src/applications/feed/conduit/FeedConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/feed/conduit/FeedConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class FeedConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationFeed');
	+ }
	+
	+}
	diff --git a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php b/src/applications/feed/conduit/FeedPublishConduitAPIMethod.php
	rename from src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
	rename to src/applications/feed/conduit/FeedPublishConduitAPIMethod.php
	--- a/src/applications/feed/conduit/ConduitAPI_feed_publish_Method.php
	+++ b/src/applications/feed/conduit/FeedPublishConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_feed_publish_Method extends ConduitAPI_feed_Method {
	+final class FeedPublishConduitAPIMethod extends FeedConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'feed.publish';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	rename from src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
	rename to src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	--- a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
	+++ b/src/applications/feed/conduit/FeedQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_feed_query_Method extends ConduitAPI_feed_Method {
	+final class FeedQueryConduitAPIMethod extends FeedConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'feed.query';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/files/conduit/ConduitAPI_file_Method.php b/src/applications/files/conduit/ConduitAPI_file_Method.php
	deleted file mode 100644
	--- a/src/applications/files/conduit/ConduitAPI_file_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_file_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorFilesApplication');
	- }
	-
	-}
	diff --git a/src/applications/files/conduit/FileConduitAPIMethod.php b/src/applications/files/conduit/FileConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/files/conduit/FileConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class FileConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationFiles');
	+ }
	+
	+}
	diff --git a/src/applications/files/conduit/ConduitAPI_file_download_Method.php b/src/applications/files/conduit/FileDownloadConduitAPIMethod.php
	rename from src/applications/files/conduit/ConduitAPI_file_download_Method.php
	rename to src/applications/files/conduit/FileDownloadConduitAPIMethod.php
	--- a/src/applications/files/conduit/ConduitAPI_file_download_Method.php
	+++ b/src/applications/files/conduit/FileDownloadConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_file_download_Method extends ConduitAPI_file_Method {
	+final class FileDownloadConduitAPIMethod extends FileConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'file.download';
	+ }

	public function getMethodDescription() {
	return 'Download a file from the server.';
	diff --git a/src/applications/files/conduit/ConduitAPI_file_info_Method.php b/src/applications/files/conduit/FileInfoConduitAPIMethod.php
	rename from src/applications/files/conduit/ConduitAPI_file_info_Method.php
	rename to src/applications/files/conduit/FileInfoConduitAPIMethod.php
	--- a/src/applications/files/conduit/ConduitAPI_file_info_Method.php
	+++ b/src/applications/files/conduit/FileInfoConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_file_info_Method extends ConduitAPI_file_Method {
	+final class FileInfoConduitAPIMethod extends FileConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'file.info';
	+ }

	public function getMethodDescription() {
	return 'Get information about a file.';
	diff --git a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php b/src/applications/files/conduit/FileUploadConduitAPIMethod.php
	rename from src/applications/files/conduit/ConduitAPI_file_upload_Method.php
	rename to src/applications/files/conduit/FileUploadConduitAPIMethod.php
	--- a/src/applications/files/conduit/ConduitAPI_file_upload_Method.php
	+++ b/src/applications/files/conduit/FileUploadConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_file_upload_Method extends ConduitAPI_file_Method {
	+final class FileUploadConduitAPIMethod extends FileConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'file.upload';
	+ }

	public function getMethodDescription() {
	return 'Upload a file to the server.';
	diff --git a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php b/src/applications/files/conduit/FileUploadHashConduitAPIMethod.php
	rename from src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
	rename to src/applications/files/conduit/FileUploadHashConduitAPIMethod.php
	--- a/src/applications/files/conduit/ConduitAPI_file_uploadhash_Method.php
	+++ b/src/applications/files/conduit/FileUploadHashConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_file_uploadhash_Method extends ConduitAPI_file_Method {
	+final class FileUploadHashConduitAPIMethod extends FileConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'file.uploadhash';
	+ }

	public function getMethodDescription() {
	return 'Upload a file to the server using content hash.';
	diff --git a/src/applications/flag/conduit/ConduitAPI_flag_Method.php b/src/applications/flag/conduit/FlagConduitAPIMethod.php
	rename from src/applications/flag/conduit/ConduitAPI_flag_Method.php
	rename to src/applications/flag/conduit/FlagConduitAPIMethod.php
	--- a/src/applications/flag/conduit/ConduitAPI_flag_Method.php
	+++ b/src/applications/flag/conduit/FlagConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_flag_Method extends ConduitAPIMethod {
	+abstract class FlagConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorFlagsApplication');
	}

	diff --git a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php b/src/applications/flag/conduit/FlagDeleteConduitAPIMethod.php
	rename from src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
	rename to src/applications/flag/conduit/FlagDeleteConduitAPIMethod.php
	--- a/src/applications/flag/conduit/ConduitAPI_flag_delete_Method.php
	+++ b/src/applications/flag/conduit/FlagDeleteConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_flag_delete_Method extends ConduitAPI_flag_Method {
	+final class FlagDeleteConduitAPIMethod extends FlagConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'flag.delete';
	+ }

	public function getMethodDescription() {
	return 'Clear a flag.';
	diff --git a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php b/src/applications/flag/conduit/FlagEditConduitAPIMethod.php
	rename from src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
	rename to src/applications/flag/conduit/FlagEditConduitAPIMethod.php
	--- a/src/applications/flag/conduit/ConduitAPI_flag_edit_Method.php
	+++ b/src/applications/flag/conduit/FlagEditConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_flag_edit_Method extends ConduitAPI_flag_Method {
	+final class FlagEditConduitAPIMethod extends FlagConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'flag.edit';
	+ }

	public function getMethodDescription() {
	return 'Create or modify a flag.';
	diff --git a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php b/src/applications/flag/conduit/FlagQueryConduitAPIMethod.php
	rename from src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
	rename to src/applications/flag/conduit/FlagQueryConduitAPIMethod.php
	--- a/src/applications/flag/conduit/ConduitAPI_flag_query_Method.php
	+++ b/src/applications/flag/conduit/FlagQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_flag_query_Method extends ConduitAPI_flag_Method {
	+final class FlagQueryConduitAPIMethod extends FlagConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'flag.query';
	+ }

	public function getMethodDescription() {
	return 'Query flag markers.';
	diff --git a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php b/src/applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php
	rename from src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php
	rename to src/applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php
	--- a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_Method.php
	+++ b/src/applications/harbormaster/conduit/HarbormasterConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_harbormaster_Method extends ConduitAPIMethod {
	+abstract class HarbormasterConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorHarbormasterApplication');
	}
	diff --git a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuildables_Method.php b/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
	rename from src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuildables_Method.php
	rename to src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
	--- a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuildables_Method.php
	+++ b/src/applications/harbormaster/conduit/HarbormasterQueryBuildablesConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_harbormaster_querybuildables_Method
	- extends ConduitAPI_harbormaster_Method {
	+final class HarbormasterQueryBuildablesConduitAPIMethod
	+ extends HarbormasterConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'harbormaster.querybuildables';
	+ }

	public function getMethodDescription() {
	return pht('Query Harbormaster buildables.');
	diff --git a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuilds_Method.php b/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
	rename from src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuilds_Method.php
	rename to src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
	--- a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_querybuilds_Method.php
	+++ b/src/applications/harbormaster/conduit/HarbormasterQueryBuildsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_harbormaster_querybuilds_Method
	- extends ConduitAPI_harbormaster_Method {
	+final class HarbormasterQueryBuildsConduitAPIMethod
	+ extends HarbormasterConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'harbormaster.querybuilds';
	+ }

	public function getMethodDescription() {
	return pht('Query Harbormaster builds.');
	diff --git a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_sendmessage_Method.php b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
	rename from src/applications/harbormaster/conduit/ConduitAPI_harbormaster_sendmessage_Method.php
	rename to src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
	--- a/src/applications/harbormaster/conduit/ConduitAPI_harbormaster_sendmessage_Method.php
	+++ b/src/applications/harbormaster/conduit/HarbormasterSendMessageConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_harbormaster_sendmessage_Method
	- extends ConduitAPI_harbormaster_Method {
	+final class HarbormasterSendMessageConduitAPIMethod
	+ extends HarbormasterConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'harbormaster.sendmessage';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/macro/conduit/ConduitAPI_macro_Method.php b/src/applications/macro/conduit/ConduitAPI_macro_Method.php
	deleted file mode 100644
	--- a/src/applications/macro/conduit/ConduitAPI_macro_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_macro_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorMacroApplication');
	- }
	-
	-}
	diff --git a/src/applications/macro/conduit/MacroConduitAPIMethod.php b/src/applications/macro/conduit/MacroConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/macro/conduit/MacroConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class MacroConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationMacro');
	+ }
	+
	+}
	diff --git a/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php b/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
	rename from src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php
	rename to src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
	--- a/src/applications/macro/conduit/ConduitAPI_macro_creatememe_Method.php
	+++ b/src/applications/macro/conduit/MacroCreateMemeConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_macro_creatememe_Method extends ConduitAPI_macro_Method {
	+final class MacroCreateMemeConduitAPIMethod extends MacroConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'macro.creatememe';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php b/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	rename from src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
	rename to src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	--- a/src/applications/macro/conduit/ConduitAPI_macro_query_Method.php
	+++ b/src/applications/macro/conduit/MacroQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_macro_query_Method extends ConduitAPI_macro_Method {
	+final class MacroQueryConduitAPIMethod extends MacroConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'macro.query';
	+ }

	public function getMethodDescription() {
	return 'Retrieve image macro information.';
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php b/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
	rename to src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_maniphest_Method extends ConduitAPIMethod {
	+abstract class ManiphestConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorManiphestApplication');
	}
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php b/src/applications/maniphest/conduit/ManiphestCreateTaskConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
	rename to src/applications/maniphest/conduit/ManiphestCreateTaskConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_createtask_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestCreateTaskConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_maniphest_createtask_Method
	- extends ConduitAPI_maniphest_Method {
	+final class ManiphestCreateTaskConduitAPIMethod
	+ extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.createtask';
	+ }

	public function getMethodDescription() {
	return 'Create a new Maniphest task.';
	@@ -17,7 +21,7 @@

	public function defineErrorTypes() {
	return array(
	- 'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.'
	+ 'ERR-INVALID-PARAMETER' => 'Missing or malformed parameter.',
	);
	}

	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php b/src/applications/maniphest/conduit/ManiphestFindConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
	rename to src/applications/maniphest/conduit/ManiphestFindConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_find_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestFindConduitAPIMethod.php
	@@ -3,8 +3,12 @@
	/**
	* @concrete-extensible
	*/
	-final class ConduitAPI_maniphest_find_Method
	- extends ConduitAPI_maniphest_query_Method {
	+final class ManiphestFindConduitAPIMethod
	+ extends ManiphestQueryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.find';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
	rename to src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_gettasktransactions_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestGetTaskTransactionsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_maniphest_gettasktransactions_Method
	- extends ConduitAPI_maniphest_Method {
	+final class ManiphestGetTaskTransactionsConduitAPIMethod
	+ extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.gettasktransactions';
	+ }

	public function getMethodDescription() {
	return 'Retrieve Maniphest Task Transactions.';
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php b/src/applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
	rename to src/applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_info_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestInfoConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_maniphest_info_Method
	- extends ConduitAPI_maniphest_Method {
	+final class ManiphestInfoConduitAPIMethod extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.info';
	+ }

	public function getMethodDescription() {
	return 'Retrieve information about a Maniphest task, given its id.';
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php b/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
	rename to src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_query_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestQueryConduitAPIMethod.php
	@@ -5,7 +5,11 @@
	*
	* @concrete-extensible
	*/
	-class ConduitAPI_maniphest_query_Method extends ConduitAPI_maniphest_Method {
	+class ManiphestQueryConduitAPIMethod extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.query';
	+ }

	public function getMethodDescription() {
	return 'Execute complex searches for Maniphest tasks.';
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php b/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php
	rename to src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_querystatuses_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestQueryStatusesConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_maniphest_querystatuses_Method
	- extends ConduitAPI_maniphest_Method {
	+final class ManiphestQueryStatusesConduitAPIMethod
	+ extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.querystatuses';
	+ }

	public function getMethodDescription() {
	return 'Retrieve information about possible Maniphest Task status values.';
	diff --git a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php b/src/applications/maniphest/conduit/ManiphestUpdateConduitAPIMethod.php
	rename from src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
	rename to src/applications/maniphest/conduit/ManiphestUpdateConduitAPIMethod.php
	--- a/src/applications/maniphest/conduit/ConduitAPI_maniphest_update_Method.php
	+++ b/src/applications/maniphest/conduit/ManiphestUpdateConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_maniphest_update_Method
	- extends ConduitAPI_maniphest_Method {
	+final class ManiphestUpdateConduitAPIMethod extends ManiphestConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'maniphest.update';
	+ }

	public function getMethodDescription() {
	return 'Update an existing Maniphest task.';
	diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php b/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
	deleted file mode 100644
	--- a/src/applications/nuance/conduit/ConduitAPI_nuance_Method.php
	+++ /dev/null
	@@ -1,13 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_nuance_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorNuanceApplication');
	- }
	-
	- public function getMethodStatus() {
	- return self::METHOD_STATUS_UNSTABLE;
	- }
	-
	-}
	diff --git a/src/applications/nuance/conduit/NuanceConduitAPIMethod.php b/src/applications/nuance/conduit/NuanceConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/nuance/conduit/NuanceConduitAPIMethod.php
	@@ -0,0 +1,13 @@
	+<?php
	+
	+abstract class NuanceConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationNuance');
	+ }
	+
	+ public function getMethodStatus() {
	+ return self::METHOD_STATUS_UNSTABLE;
	+ }
	+
	+}
	diff --git a/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php b/src/applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php
	rename from src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php
	rename to src/applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php
	--- a/src/applications/nuance/conduit/ConduitAPI_nuance_createitem_Method.php
	+++ b/src/applications/nuance/conduit/NuanceCreateItemConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_nuance_createitem_Method
	- extends ConduitAPI_nuance_Method {
	+final class NuanceCreateItemConduitAPIMethod extends NuanceConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'nuance.createitem';
	+ }

	public function getMethodDescription() {
	return pht('Create a new item.');
	diff --git a/src/applications/owners/conduit/ConduitAPI_owners_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_Method.php
	deleted file mode 100644
	--- a/src/applications/owners/conduit/ConduitAPI_owners_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_owners_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorOwnersApplication');
	- }
	-
	-}
	diff --git a/src/applications/owners/conduit/OwnersConduitAPIMethod.php b/src/applications/owners/conduit/OwnersConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/owners/conduit/OwnersConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class OwnersConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationOwners');
	+ }
	+
	+}
	diff --git a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	rename from src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	rename to src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	--- a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	+++ b/src/applications/owners/conduit/OwnersQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_owners_query_Method extends ConduitAPI_owners_Method {
	+final class OwnersQueryConduitAPIMethod extends OwnersConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'owners.query';
	+ }

	public function getMethodDescription() {
	return 'Query for packages by one of the following: repository/path, '.
	diff --git a/src/applications/paste/conduit/ConduitAPI_paste_Method.php b/src/applications/paste/conduit/PasteConduitAPIMethod.php
	rename from src/applications/paste/conduit/ConduitAPI_paste_Method.php
	rename to src/applications/paste/conduit/PasteConduitAPIMethod.php
	--- a/src/applications/paste/conduit/ConduitAPI_paste_Method.php
	+++ b/src/applications/paste/conduit/PasteConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_paste_Method extends ConduitAPIMethod {
	+abstract class PasteConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorPasteApplication');
	}

	diff --git a/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php b/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
	rename from src/applications/paste/conduit/ConduitAPI_paste_create_Method.php
	rename to src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
	--- a/src/applications/paste/conduit/ConduitAPI_paste_create_Method.php
	+++ b/src/applications/paste/conduit/PasteCreateConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_paste_create_Method extends ConduitAPI_paste_Method {
	+final class PasteCreateConduitAPIMethod extends PasteConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'paste.create';
	+ }

	public function getMethodDescription() {
	return 'Create a new paste.';
	diff --git a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php b/src/applications/paste/conduit/PasteInfoConduitAPIMethod.php
	rename from src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
	rename to src/applications/paste/conduit/PasteInfoConduitAPIMethod.php
	--- a/src/applications/paste/conduit/ConduitAPI_paste_info_Method.php
	+++ b/src/applications/paste/conduit/PasteInfoConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_paste_info_Method extends ConduitAPI_paste_Method {
	+final class PasteInfoConduitAPIMethod extends PasteConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'paste.info';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php b/src/applications/paste/conduit/PasteQueryConduitAPIMethod.php
	rename from src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
	rename to src/applications/paste/conduit/PasteQueryConduitAPIMethod.php
	--- a/src/applications/paste/conduit/ConduitAPI_paste_query_Method.php
	+++ b/src/applications/paste/conduit/PasteQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_paste_query_Method extends ConduitAPI_paste_Method {
	+final class PasteQueryConduitAPIMethod extends PasteConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'paste.query';
	+ }

	public function getMethodDescription() {
	return 'Query Pastes.';
	diff --git a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php b/src/applications/people/conduit/UserAddStatusConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
	rename to src/applications/people/conduit/UserAddStatusConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_addstatus_Method.php
	+++ b/src/applications/people/conduit/UserAddStatusConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_user_addstatus_Method
	- extends ConduitAPI_user_Method {
	+final class UserAddStatusConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.addstatus';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/people/conduit/ConduitAPI_user_Method.php b/src/applications/people/conduit/UserConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_Method.php
	rename to src/applications/people/conduit/UserConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_Method.php
	+++ b/src/applications/people/conduit/UserConduitAPIMethod.php
	@@ -1,10 +1,9 @@
	<?php

	-abstract class ConduitAPI_user_Method extends ConduitAPIMethod {
	+abstract class UserConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	- return PhabricatorApplication::getByClass(
	- 'PhabricatorPeopleApplication');
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorPeopleApplication');
	}

	protected function buildUserInformationDictionary(
	diff --git a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php b/src/applications/people/conduit/UserDisableConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_disable_Method.php
	rename to src/applications/people/conduit/UserDisableConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_disable_Method.php
	+++ b/src/applications/people/conduit/UserDisableConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_disable_Method extends ConduitAPI_user_Method {
	+final class UserDisableConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.disable';
	+ }

	public function getMethodDescription() {
	return 'Permanently disable specified users (admin only).';
	diff --git a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php b/src/applications/people/conduit/UserEnableConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_enable_Method.php
	rename to src/applications/people/conduit/UserEnableConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_enable_Method.php
	+++ b/src/applications/people/conduit/UserEnableConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_enable_Method extends ConduitAPI_user_Method {
	+final class UserEnableConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.enable';
	+ }

	public function getMethodDescription() {
	return 'Re-enable specified users (admin only).';
	diff --git a/src/applications/people/conduit/ConduitAPI_user_find_Method.php b/src/applications/people/conduit/UserFindConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_find_Method.php
	rename to src/applications/people/conduit/UserFindConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_find_Method.php
	+++ b/src/applications/people/conduit/UserFindConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_user_find_Method
	- extends ConduitAPI_user_Method {
	+final class UserFindConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.find';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/people/conduit/ConduitAPI_user_info_Method.php b/src/applications/people/conduit/UserInfpConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_info_Method.php
	rename to src/applications/people/conduit/UserInfpConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_info_Method.php
	+++ b/src/applications/people/conduit/UserInfpConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_info_Method extends ConduitAPI_user_Method {
	+final class UserInfoConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.info';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/people/conduit/ConduitAPI_user_query_Method.php b/src/applications/people/conduit/UserQueryConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_query_Method.php
	rename to src/applications/people/conduit/UserQueryConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_query_Method.php
	+++ b/src/applications/people/conduit/UserQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_query_Method extends ConduitAPI_user_Method {
	+final class UserQueryConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.query';
	+ }

	public function getMethodDescription() {
	return 'Query users.';
	@@ -16,7 +20,6 @@
	'offset' => 'optional int',
	'limit' => 'optional int (default = 100)',
	);
	-
	}

	public function defineReturnType() {
	diff --git a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php b/src/applications/people/conduit/UserRemoveStatusConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
	rename to src/applications/people/conduit/UserRemoveStatusConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_removestatus_Method.php
	+++ b/src/applications/people/conduit/UserRemoveStatusConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_removestatus_Method extends ConduitAPI_user_Method {
	+final class UserRemoveStatusConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.removestatus';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php b/src/applications/people/conduit/UserWhoAmIConduitAPIMethod.php
	rename from src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
	rename to src/applications/people/conduit/UserWhoAmIConduitAPIMethod.php
	--- a/src/applications/people/conduit/ConduitAPI_user_whoami_Method.php
	+++ b/src/applications/people/conduit/UserWhoAmIConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_user_whoami_Method extends ConduitAPI_user_Method {
	+final class UserWhoAmIConduitAPIMethod extends UserConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'user.whoami';
	+ }

	public function getMethodDescription() {
	return 'Retrieve information about the logged-in user.';
	diff --git a/src/applications/phame/conduit/ConduitAPI_phame_Method.php b/src/applications/phame/conduit/ConduitAPI_phame_Method.php
	deleted file mode 100644
	--- a/src/applications/phame/conduit/ConduitAPI_phame_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_phame_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorPhameApplication');
	- }
	-
	-}
	diff --git a/src/applications/phame/conduit/PhameConduitAPIMethod.php b/src/applications/phame/conduit/PhameConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/phame/conduit/PhameConduitAPIMethod.php
	@@ -0,0 +1,9 @@
	+<?php
	+
	+abstract class PhameConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass('PhabricatorApplicationPhame');
	+ }
	+
	+}
	diff --git a/src/applications/phame/conduit/ConduitAPI_phame_createpost_Method.php b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	rename from src/applications/phame/conduit/ConduitAPI_phame_createpost_Method.php
	rename to src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	--- a/src/applications/phame/conduit/ConduitAPI_phame_createpost_Method.php
	+++ b/src/applications/phame/conduit/PhameCreatePostConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phame_createpost_Method extends ConduitAPI_phame_Method {
	+final class PhameCreatePostConduitAPIMethod extends PhameConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phame.createpost';
	+ }

	public function getMethodDescription() {
	return pht('Create a phame post.');
	diff --git a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php b/src/applications/phame/conduit/PhameQueryConduitAPIMethod.php
	rename from src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
	rename to src/applications/phame/conduit/PhameQueryConduitAPIMethod.php
	--- a/src/applications/phame/conduit/ConduitAPI_phame_query_Method.php
	+++ b/src/applications/phame/conduit/PhameQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phame_query_Method extends ConduitAPI_phame_Method {
	+final class PhameQueryConduitAPIMethod extends PhameConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phame.query';
	+ }

	public function getMethodDescription() {
	return 'Query phame blogs.';
	diff --git a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	rename from src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
	rename to src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	--- a/src/applications/phame/conduit/ConduitAPI_phame_queryposts_Method.php
	+++ b/src/applications/phame/conduit/PhameQueryPostsConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phame_queryposts_Method extends ConduitAPI_phame_Method {
	+final class PhameQueryPostsConduitAPIMethod extends PhameConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phame.queryposts';
	+ }

	public function getMethodDescription() {
	return 'Query phame posts.';
	diff --git a/src/applications/phid/conduit/ConduitAPI_phid_Method.php b/src/applications/phid/conduit/PHIDConduitAPIMethod.php
	rename from src/applications/phid/conduit/ConduitAPI_phid_Method.php
	rename to src/applications/phid/conduit/PHIDConduitAPIMethod.php
	--- a/src/applications/phid/conduit/ConduitAPI_phid_Method.php
	+++ b/src/applications/phid/conduit/PHIDConduitAPIMethod.php
	@@ -1,6 +1,6 @@
	<?php

	-abstract class ConduitAPI_phid_Method extends ConduitAPIMethod {
	+abstract class PHIDConduitAPIMethod extends ConduitAPIMethod {

	protected function buildHandleInformationDictionary(
	PhabricatorObjectHandle $handle) {
	diff --git a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php b/src/applications/phid/conduit/PHIDInfoConduitAPIMethod.php
	rename from src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
	rename to src/applications/phid/conduit/PHIDInfoConduitAPIMethod.php
	--- a/src/applications/phid/conduit/ConduitAPI_phid_info_Method.php
	+++ b/src/applications/phid/conduit/PHIDInfoConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phid_info_Method extends ConduitAPI_phid_Method {
	+final class PHIDInfoConduitAPIMethod extends PHIDConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phid.info';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	diff --git a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php b/src/applications/phid/conduit/PHIDLookupConduitAPIMethod.php
	rename from src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
	rename to src/applications/phid/conduit/PHIDLookupConduitAPIMethod.php
	--- a/src/applications/phid/conduit/ConduitAPI_phid_lookup_Method.php
	+++ b/src/applications/phid/conduit/PHIDLookupConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phid_lookup_Method extends ConduitAPI_phid_Method {
	+final class PHIDLookupConduitAPIMethod extends PHIDConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phid.lookup';
	+ }

	public function getMethodDescription() {
	return 'Look up objects by name.';
	diff --git a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php b/src/applications/phid/conduit/PHIDQueryConduitAPIMethod.php
	rename from src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
	rename to src/applications/phid/conduit/PHIDQueryConduitAPIMethod.php
	--- a/src/applications/phid/conduit/ConduitAPI_phid_query_Method.php
	+++ b/src/applications/phid/conduit/PHIDQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_phid_query_Method extends ConduitAPI_phid_Method {
	+final class PHIDQueryConduitAPIMethod extends PHIDConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phid.query';
	+ }

	public function getMethodDescription() {
	return 'Retrieve information about arbitrary PHIDs.';
	diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php b/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
	deleted file mode 100644
	--- a/src/applications/phragment/conduit/ConduitAPI_phragment_Method.php
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_phragment_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass(
	- 'PhabricatorPhragmentApplication');
	- }
	-
	-}
	diff --git a/src/applications/phragment/conduit/PhragmentConduitAPIMethod.php b/src/applications/phragment/conduit/PhragmentConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/phragment/conduit/PhragmentConduitAPIMethod.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+abstract class PhragmentConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass(
	+ 'PhabricatorApplicationPhragment');
	+ }
	+
	+}
	diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php b/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	rename from src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
	rename to src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	--- a/src/applications/phragment/conduit/ConduitAPI_phragment_getpatch_Method.php
	+++ b/src/applications/phragment/conduit/PhragmentGetPatchConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_phragment_getpatch_Method
	- extends ConduitAPI_phragment_Method {
	+final class PhragmentGetPatchConduitAPIMethod
	+ extends PhragmentConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phragment.getpatch';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php b/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	rename from src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
	rename to src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	--- a/src/applications/phragment/conduit/ConduitAPI_phragment_queryfragments_Method.php
	+++ b/src/applications/phragment/conduit/PhragmentQueryFragmentsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_phragment_queryfragments_Method
	- extends ConduitAPI_phragment_Method {
	+final class PhragmentQueryFragmentsConduitAPIMethod
	+ extends PhragmentConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phragment.queryfragments';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php b/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php
	deleted file mode 100644
	--- a/src/applications/phrequent/conduit/ConduitAPI_phrequent_Method.php
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_phrequent_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass(
	- 'PhabricatorPhrequentApplication');
	- }
	-
	-}
	diff --git a/src/applications/phrequent/conduit/PhrequentConduitAPIMethod.php b/src/applications/phrequent/conduit/PhrequentConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/phrequent/conduit/PhrequentConduitAPIMethod.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+abstract class PhrequentConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass(
	+ 'PhabricatorApplicationPhrequent');
	+ }
	+
	+}
	diff --git a/src/applications/phrequent/conduit/ConduitAPI_phrequent_pop_Method.php b/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	rename from src/applications/phrequent/conduit/ConduitAPI_phrequent_pop_Method.php
	rename to src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	--- a/src/applications/phrequent/conduit/ConduitAPI_phrequent_pop_Method.php
	+++ b/src/applications/phrequent/conduit/PhrequentPopConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_phrequent_pop_Method
	- extends ConduitAPI_phrequent_Method {
	+final class PhrequentPopConduitAPIMethod extends PhrequentConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phrequent.pop';
	+ }

	public function getMethodDescription() {
	return pht('Stop tracking time on an object by popping it from the stack.');
	diff --git a/src/applications/phrequent/conduit/ConduitAPI_phrequent_push_Method.php b/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	rename from src/applications/phrequent/conduit/ConduitAPI_phrequent_push_Method.php
	rename to src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	--- a/src/applications/phrequent/conduit/ConduitAPI_phrequent_push_Method.php
	+++ b/src/applications/phrequent/conduit/PhrequentPushConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_phrequent_push_Method
	- extends ConduitAPI_phrequent_Method {
	+final class PhrequentPushConduitAPIMethod extends PhrequentConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phrequent.push';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/phrequent/conduit/ConduitAPI_phrequent_tracking_Method.php b/src/applications/phrequent/conduit/PhrequentTrackingConduitAPIMethod.php
	rename from src/applications/phrequent/conduit/ConduitAPI_phrequent_tracking_Method.php
	rename to src/applications/phrequent/conduit/PhrequentTrackingConduitAPIMethod.php
	--- a/src/applications/phrequent/conduit/ConduitAPI_phrequent_tracking_Method.php
	+++ b/src/applications/phrequent/conduit/PhrequentTrackingConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_phrequent_tracking_Method
	- extends ConduitAPI_phrequent_Method {
	+final class PhrequentTrackingConduitAPIMethod
	+ extends PhrequentConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phrequent.tracking';
	+ }

	public function getMethodDescription() {
	return pht(
	diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php b/src/applications/phriction/conduit/PhrictionConduitAPIMethod.php
	rename from src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
	rename to src/applications/phriction/conduit/PhrictionConduitAPIMethod.php
	--- a/src/applications/phriction/conduit/ConduitAPI_phriction_Method.php
	+++ b/src/applications/phriction/conduit/PhrictionConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_phriction_Method extends ConduitAPIMethod {
	+abstract class PhrictionConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass(
	'PhabricatorPhrictionApplication');
	}
	diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php b/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
	rename from src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php
	rename to src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
	--- a/src/applications/phriction/conduit/ConduitAPI_phriction_edit_Method.php
	+++ b/src/applications/phriction/conduit/PhrictionEditConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_phriction_edit_Method
	- extends ConduitAPI_phriction_Method {
	+final class PhrictionEditConduitAPIMethod extends PhrictionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phriction.edit';
	+ }

	public function getMethodDescription() {
	return 'Update a Phriction document.';
	diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_history_Method.php b/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
	rename from src/applications/phriction/conduit/ConduitAPI_phriction_history_Method.php
	rename to src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
	--- a/src/applications/phriction/conduit/ConduitAPI_phriction_history_Method.php
	+++ b/src/applications/phriction/conduit/PhrictionHistoryConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_phriction_history_Method
	- extends ConduitAPI_phriction_Method {
	+final class PhrictionHistoryConduitAPIMethod extends PhrictionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phriction.history';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve history about a Phriction document.');
	diff --git a/src/applications/phriction/conduit/ConduitAPI_phriction_info_Method.php b/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
	rename from src/applications/phriction/conduit/ConduitAPI_phriction_info_Method.php
	rename to src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
	--- a/src/applications/phriction/conduit/ConduitAPI_phriction_info_Method.php
	+++ b/src/applications/phriction/conduit/PhrictionInfoConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_phriction_info_Method
	- extends ConduitAPI_phriction_Method {
	+final class PhrictionInfoConduitAPIMethod extends PhrictionConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'phriction.info';
	+ }

	public function getMethodDescription() {
	return pht('Retrieve information about a Phriction document.');
	diff --git a/src/applications/project/conduit/ConduitAPI_project_Method.php b/src/applications/project/conduit/ProjectConduitAPIMethod.php
	rename from src/applications/project/conduit/ConduitAPI_project_Method.php
	rename to src/applications/project/conduit/ProjectConduitAPIMethod.php
	--- a/src/applications/project/conduit/ConduitAPI_project_Method.php
	+++ b/src/applications/project/conduit/ProjectConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_project_Method extends ConduitAPIMethod {
	+abstract class ProjectConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorProjectApplication');
	}

	diff --git a/src/applications/project/conduit/ConduitAPI_project_query_Method.php b/src/applications/project/conduit/ProjectQueryConduitAPIMethod.php
	rename from src/applications/project/conduit/ConduitAPI_project_query_Method.php
	rename to src/applications/project/conduit/ProjectQueryConduitAPIMethod.php
	--- a/src/applications/project/conduit/ConduitAPI_project_query_Method.php
	+++ b/src/applications/project/conduit/ProjectQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_project_query_Method extends ConduitAPI_project_Method {
	+final class ProjectQueryConduitAPIMethod extends ProjectConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'project.query';
	+ }

	public function getMethodDescription() {
	return 'Execute searches for Projects.';
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php b/src/applications/releeph/conduit/ReleephConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_Method.php
	rename to src/applications/releeph/conduit/ReleephConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_Method.php
	+++ b/src/applications/releeph/conduit/ReleephConduitAPIMethod.php
	@@ -1,6 +1,6 @@
	<?php

	-abstract class ConduitAPI_releeph_Method extends ConduitAPIMethod {
	+abstract class ReleephConduitAPIMethod extends ConduitAPIMethod {

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	@@ -10,7 +10,7 @@
	return pht('All Releeph methods are subject to abrupt change.');
	}

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorReleephApplication');
	}

	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php b/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
	rename to src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_getbranches_Method.php
	+++ b/src/applications/releeph/conduit/ReleephGetBranchesConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_releeph_getbranches_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephGetBranchesConduitAPIMethod extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.getbranches';
	+ }

	public function getMethodDescription() {
	return 'Return information about all active Releeph branches.';
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php b/src/applications/releeph/conduit/ReleephProjectInfoConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php
	rename to src/applications/releeph/conduit/ReleephProjectInfoConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_projectinfo_Method.php
	+++ b/src/applications/releeph/conduit/ReleephProjectInfoConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_releeph_projectinfo_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephProjectInfoConduitAPIMethod extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.projectinfo';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_querybranches_Method.php b/src/applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_querybranches_Method.php
	rename to src/applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_querybranches_Method.php
	+++ b/src/applications/releeph/conduit/ReleephQueryBranchesConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releeph_querybranches_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephQueryBranchesConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.querybranches';
	+ }

	public function getMethodDescription() {
	return pht('Query information about Releeph branches.');
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_queryproducts_Method.php b/src/applications/releeph/conduit/ReleephQueryProdutsConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_queryproducts_Method.php
	rename to src/applications/releeph/conduit/ReleephQueryProdutsConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_queryproducts_Method.php
	+++ b/src/applications/releeph/conduit/ReleephQueryProdutsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releeph_queryproducts_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephQueryProductsConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.queryproducts';
	+ }

	public function getMethodDescription() {
	return pht('Query information about Releeph products.');
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php b/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php
	rename to src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_queryrequests_Method.php
	+++ b/src/applications/releeph/conduit/ReleephQueryRequestsConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releeph_queryrequests_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephQueryRequestsConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.queryrequests';
	+ }

	public function getMethodDescription() {
	return
	diff --git a/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php b/src/applications/releeph/conduit/ReleephRequestConduitAPIMethod.php
	rename from src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php
	rename to src/applications/releeph/conduit/ReleephRequestConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/ConduitAPI_releeph_request_Method.php
	+++ b/src/applications/releeph/conduit/ReleephRequestConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_releeph_request_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephRequestConduitAPIMethod extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releeph.request';
	+ }

	public function getMethodDescription() {
	return 'Request a commit or diff to be picked to a branch.';
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php b/src/applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_canpush_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkCanPushConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_releephwork_canpush_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkCanPushConduitAPIMethod extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.canpush';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php b/src/applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getauthorinfo_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkGetAuthorInfoConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_getauthorinfo_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkGetAuthorInfoConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.getauthorinfo';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php b/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranchcommitmessage_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkGetBranchCommitMessageConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_getbranchcommitmessage_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkGetBranchCommitMessageConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.getbranchcommitmessage';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php b/src/applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getbranch_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkGetBranchConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_getbranch_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkGetBranchConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.getbranch';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php b/src/applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_getcommitmessage_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkGetCommitMessageConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_getcommitmessage_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkGetCommitMessageConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.getcommitmessage';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_nextrequest_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkNextRequestConduitAPIMethod.php
	@@ -1,11 +1,15 @@
	<?php

	-final class ConduitAPI_releephwork_nextrequest_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkNextRequestConduitAPIMethod
	+ extends ReleephConduitAPIMethod {

	private $project;
	private $branch;

	+ public function getAPIMethodName() {
	+ return 'releephwork.nextrequest';
	+ }
	+
	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php b/src/applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_record_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkRecordConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_record_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkRecordConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.record';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php b/src/applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php
	rename from src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php
	rename to src/applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php
	--- a/src/applications/releeph/conduit/work/ConduitAPI_releephwork_recordpickstatus_Method.php
	+++ b/src/applications/releeph/conduit/work/ReleephWorkRecordPickStatusConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_releephwork_recordpickstatus_Method
	- extends ConduitAPI_releeph_Method {
	+final class ReleephWorkRecordPickStatusConduitAPIMethod
	+ extends ReleephConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'releephwork.recordpickstatus';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/remarkup/conduit/ConduitAPI_remarkup_process_Method.php b/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php
	rename from src/applications/remarkup/conduit/ConduitAPI_remarkup_process_Method.php
	rename to src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php
	--- a/src/applications/remarkup/conduit/ConduitAPI_remarkup_process_Method.php
	+++ b/src/applications/remarkup/conduit/RemarkupProcessConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_remarkup_process_Method extends ConduitAPIMethod {
	+final class RemarkupProcessConduitAPIMethod extends ConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'remarkup.process';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/repository/conduit/ConduitAPI_repository_Method.php b/src/applications/repository/conduit/ConduitAPI_repository_Method.php
	deleted file mode 100644
	--- a/src/applications/repository/conduit/ConduitAPI_repository_Method.php
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_repository_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass(
	- 'PhabricatorDiffusionApplication');
	- }
	-
	-}
	diff --git a/src/applications/repository/conduit/RepositoryConduitAPIMethod.php b/src/applications/repository/conduit/RepositoryConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/repository/conduit/RepositoryConduitAPIMethod.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+abstract class RepositoryConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass(
	+ 'PhabricatorApplicationDiffusion');
	+ }
	+
	+}
	diff --git a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php b/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php
	rename from src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
	rename to src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php
	--- a/src/applications/repository/conduit/ConduitAPI_repository_create_Method.php
	+++ b/src/applications/repository/conduit/RepositoryCreateConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_repository_create_Method
	- extends ConduitAPI_repository_Method {
	+final class RepositoryCreateConduitAPIMethod
	+ extends RepositoryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'repository.create';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php b/src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php
	rename from src/applications/repository/conduit/ConduitAPI_repository_query_Method.php
	rename to src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php
	--- a/src/applications/repository/conduit/ConduitAPI_repository_query_Method.php
	+++ b/src/applications/repository/conduit/RepositoryQueryConduitAPIMethod.php
	@@ -1,7 +1,11 @@
	<?php

	-final class ConduitAPI_repository_query_Method
	- extends ConduitAPI_repository_Method {
	+final class RepositoryQueryConduitAPIMethod
	+ extends RepositoryConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'repository.query';
	+ }

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php b/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
	deleted file mode 100644
	--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_Method.php
	+++ /dev/null
	@@ -1,9 +0,0 @@
	-<?php
	-
	-abstract class ConduitAPI_slowvote_Method extends ConduitAPIMethod {
	-
	- public function getApplication() {
	- return PhabricatorApplication::getByClass('PhabricatorSlowvoteApplication');
	- }
	-
	-}
	diff --git a/src/applications/slowvote/conduit/SlowvoteConduitAPIMethod.php b/src/applications/slowvote/conduit/SlowvoteConduitAPIMethod.php
	new file mode 100644
	--- /dev/null
	+++ b/src/applications/slowvote/conduit/SlowvoteConduitAPIMethod.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+abstract class SlowvoteConduitAPIMethod extends ConduitAPIMethod {
	+
	+ final public function getApplication() {
	+ return PhabricatorApplication::getByClass(
	+ 'PhabricatorApplicationSlowvote');
	+ }
	+
	+}
	diff --git a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php b/src/applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php
	rename from src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
	rename to src/applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php
	--- a/src/applications/slowvote/conduit/ConduitAPI_slowvote_info_Method.php
	+++ b/src/applications/slowvote/conduit/SlowvoteInfoConduitAPIMethod.php
	@@ -1,7 +1,10 @@
	<?php

	-final class ConduitAPI_slowvote_info_Method
	- extends ConduitAPI_slowvote_Method {
	+final class SlowvoteInfoConduitAPIMethod extends SlowvoteConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'slowvote.info';
	+ }

	public function getMethodDescription() {
	return 'Retrieve an array of information about a poll.';
	diff --git a/src/applications/tokens/conduit/ConduitAPI_token_Method.php b/src/applications/tokens/conduit/TokenConduitAPIMethod.php
	rename from src/applications/tokens/conduit/ConduitAPI_token_Method.php
	rename to src/applications/tokens/conduit/TokenConduitAPIMethod.php
	--- a/src/applications/tokens/conduit/ConduitAPI_token_Method.php
	+++ b/src/applications/tokens/conduit/TokenConduitAPIMethod.php
	@@ -1,8 +1,8 @@
	<?php

	-abstract class ConduitAPI_token_Method extends ConduitAPIMethod {
	+abstract class TokenConduitAPIMethod extends ConduitAPIMethod {

	- public function getApplication() {
	+ final public function getApplication() {
	return PhabricatorApplication::getByClass('PhabricatorTokensApplication');
	}

	@@ -41,4 +41,5 @@
	return $list;
	}

	+
	}
	diff --git a/src/applications/tokens/conduit/ConduitAPI_token_give_Method.php b/src/applications/tokens/conduit/TokenGiveConduitAPIMethod.php
	rename from src/applications/tokens/conduit/ConduitAPI_token_give_Method.php
	rename to src/applications/tokens/conduit/TokenGiveConduitAPIMethod.php
	--- a/src/applications/tokens/conduit/ConduitAPI_token_give_Method.php
	+++ b/src/applications/tokens/conduit/TokenGiveConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_token_give_Method extends ConduitAPI_token_Method {
	+final class TokenGiveConduitAPIMethod extends TokenConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'token.give';
	+ }

	public function getMethodDescription() {
	return pht('Give or change a token.');
	diff --git a/src/applications/tokens/conduit/ConduitAPI_token_given_Method.php b/src/applications/tokens/conduit/TokenGivenConduitAPIMethod.php
	rename from src/applications/tokens/conduit/ConduitAPI_token_given_Method.php
	rename to src/applications/tokens/conduit/TokenGivenConduitAPIMethod.php
	--- a/src/applications/tokens/conduit/ConduitAPI_token_given_Method.php
	+++ b/src/applications/tokens/conduit/TokenGivenConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_token_given_Method extends ConduitAPI_token_Method {
	+final class TokenGivenConduitAPIMethod extends TokenConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'token.given';
	+ }

	public function getMethodDescription() {
	return pht('Query tokens given to objects.');
	diff --git a/src/applications/tokens/conduit/ConduitAPI_token_query_Method.php b/src/applications/tokens/conduit/TokenQueryConduitAPIMethod.php
	rename from src/applications/tokens/conduit/ConduitAPI_token_query_Method.php
	rename to src/applications/tokens/conduit/TokenQueryConduitAPIMethod.php
	--- a/src/applications/tokens/conduit/ConduitAPI_token_query_Method.php
	+++ b/src/applications/tokens/conduit/TokenQueryConduitAPIMethod.php
	@@ -1,6 +1,10 @@
	<?php

	-final class ConduitAPI_token_query_Method extends ConduitAPI_token_Method {
	+final class TokenQueryConduitAPIMethod extends TokenConduitAPIMethod {
	+
	+ public function getAPIMethodName() {
	+ return 'token.query';
	+ }

	public function getMethodDescription() {
	return pht('Query tokens.');
	diff --git a/src/docs/contributor/phabricator_code_layout.diviner b/src/docs/contributor/phabricator_code_layout.diviner
	--- a/src/docs/contributor/phabricator_code_layout.diviner
	+++ b/src/docs/contributor/phabricator_code_layout.diviner
	@@ -81,7 +81,7 @@
	Reading more about the @{class:LiskDAO} is highly recommended.
	- DerpView: view objects for the ##Derp## application. Typically these
	extend @{class:AphrontView}.
	- - ConduitAPI_derp_Method: provides any and all ##Derp## application
	+ - DerpConduitAPIMethod: provides any and all ##Derp## application
	functionality that is accessible over Conduit.

	However, it is likely that ##Derp## is even more complex, and rather than
	diff --git a/src/docs/user/userguide/arcanist_extending_lint.diviner b/src/docs/user/userguide/arcanist_extending_lint.diviner
	--- a/src/docs/user/userguide/arcanist_extending_lint.diviner
	+++ b/src/docs/user/userguide/arcanist_extending_lint.diviner
	@@ -98,5 +98,5 @@

	- Use ##lint.xhpast.naminghook## in ##.arcconfig## to override naming
	convention rules. See @{class@arcanist:ArcanistXHPASTLintNamingHook}
	- for details, and @{class:PhabricatorSymbolNameLinter} for an example.
	+ for details.
	- Use ##getXHPASTTreeForPath()## to reuse the AAST in other linters.
	diff --git a/src/infrastructure/lint/hook/PhabricatorSymbolNameLinter.php b/src/infrastructure/lint/hook/PhabricatorSymbolNameLinter.php
	deleted file mode 100644
	--- a/src/infrastructure/lint/hook/PhabricatorSymbolNameLinter.php
	+++ /dev/null
	@@ -1,23 +0,0 @@
	-<?php
	-
	-final class PhabricatorSymbolNameLinter extends ArcanistXHPASTLintNamingHook {
	-
	- public function lintSymbolName($type, $name, $default) {
	- $matches = null;
	- if ($type == 'class' &&
	- preg_match('/^ConduitAPI_(.*)_Method$/', $name, $matches)) {
	- if (preg_match('/^[a-z]+(_[a-z]+)?$/', $matches[1])) {
	- // These are permitted since Conduit does reflectioney stuff to figure
	- // out the method name from the class name.
	- return null;
	- } else {
	- return 'Conduit method implementations should contain lowercase '.
	- 'letters only, with an underscore separating group and method '.
	- 'names for implementations, e.g. '.
	- '"ConduitAPI_thing_info_Method".';
	- }
	- }
	-
	- return $default;
	- }
	-}

File Metadata

Mime Type: text/plain
Expires: Jul 23 2025, 2:29 PM (5 w, 7 h ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/sz/7a/ks7bpvy7ilivtbk6
Default Alt Text: D9991.id24092.largetrue.diff (251 KB)

D9991.id24092.largetrue.diffNo OneTemporaryActions

D9991.id24092.largetrue.diffView Options

File Metadata

Event Timeline

D9991.id24092.largetrue.diff
No OneTemporary
Actions

D9991.id24092.largetrue.diff
View Options