diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 4f64828c6d..da880ab92d 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1771,6 +1771,7 @@ phutil_register_library_map(array(
     'PhabricatorEdgeTestCase' => 'infrastructure/edges/__tests__/PhabricatorEdgeTestCase.php',
     'PhabricatorEdgeType' => 'infrastructure/edges/type/PhabricatorEdgeType.php',
     'PhabricatorEditor' => 'infrastructure/PhabricatorEditor.php',
+    'PhabricatorElasticSearchEngine' => 'applications/search/engine/PhabricatorElasticSearchEngine.php',
     'PhabricatorElasticSetupCheck' => 'applications/config/check/PhabricatorElasticSetupCheck.php',
     'PhabricatorEmailAddressesSettingsPanel' => 'applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php',
     'PhabricatorEmailFormatSettingsPanel' => 'applications/settings/panel/PhabricatorEmailFormatSettingsPanel.php',
@@ -2081,6 +2082,7 @@ phutil_register_library_map(array(
     'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
     'PhabricatorMySQLConfigOptions' => 'applications/config/option/PhabricatorMySQLConfigOptions.php',
     'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
+    'PhabricatorMySQLSearchEngine' => 'applications/search/engine/PhabricatorMySQLSearchEngine.php',
     'PhabricatorMySQLSetupCheck' => 'applications/config/check/PhabricatorMySQLSetupCheck.php',
     'PhabricatorNamedQuery' => 'applications/search/storage/PhabricatorNamedQuery.php',
     'PhabricatorNamedQueryQuery' => 'applications/search/query/PhabricatorNamedQueryQuery.php',
@@ -2507,8 +2509,6 @@ phutil_register_library_map(array(
     'PhabricatorSearchDocumentTypeDatasource' => 'applications/search/typeahead/PhabricatorSearchDocumentTypeDatasource.php',
     'PhabricatorSearchEditController' => 'applications/search/controller/PhabricatorSearchEditController.php',
     'PhabricatorSearchEngine' => 'applications/search/engine/PhabricatorSearchEngine.php',
-    'PhabricatorSearchEngineElastic' => 'applications/search/engine/PhabricatorSearchEngineElastic.php',
-    'PhabricatorSearchEngineMySQL' => 'applications/search/engine/PhabricatorSearchEngineMySQL.php',
     'PhabricatorSearchEngineSelector' => 'applications/search/selector/PhabricatorSearchEngineSelector.php',
     'PhabricatorSearchField' => 'applications/search/constants/PhabricatorSearchField.php',
     'PhabricatorSearchHovercardController' => 'applications/search/controller/PhabricatorSearchHovercardController.php',
@@ -5152,6 +5152,7 @@ phutil_register_library_map(array(
     'PhabricatorEdgeTestCase' => 'PhabricatorTestCase',
     'PhabricatorEdgeType' => 'Phobject',
     'PhabricatorEditor' => 'Phobject',
+    'PhabricatorElasticSearchEngine' => 'PhabricatorSearchEngine',
     'PhabricatorElasticSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorEmailAddressesSettingsPanel' => 'PhabricatorSettingsPanel',
     'PhabricatorEmailFormatSettingsPanel' => 'PhabricatorSettingsPanel',
@@ -5477,6 +5478,7 @@ phutil_register_library_map(array(
     'PhabricatorMustVerifyEmailController' => 'PhabricatorAuthController',
     'PhabricatorMySQLConfigOptions' => 'PhabricatorApplicationConfigOptions',
     'PhabricatorMySQLFileStorageEngine' => 'PhabricatorFileStorageEngine',
+    'PhabricatorMySQLSearchEngine' => 'PhabricatorSearchEngine',
     'PhabricatorMySQLSetupCheck' => 'PhabricatorSetupCheck',
     'PhabricatorNamedQuery' => array(
       'PhabricatorSearchDAO',
@@ -5967,8 +5969,6 @@ phutil_register_library_map(array(
     'PhabricatorSearchDocumentRelationship' => 'PhabricatorSearchDAO',
     'PhabricatorSearchDocumentTypeDatasource' => 'PhabricatorTypeaheadDatasource',
     'PhabricatorSearchEditController' => 'PhabricatorSearchBaseController',
-    'PhabricatorSearchEngineElastic' => 'PhabricatorSearchEngine',
-    'PhabricatorSearchEngineMySQL' => 'PhabricatorSearchEngine',
     'PhabricatorSearchHovercardController' => 'PhabricatorSearchBaseController',
     'PhabricatorSearchManagementIndexWorkflow' => 'PhabricatorSearchManagementWorkflow',
     'PhabricatorSearchManagementInitWorkflow' => 'PhabricatorSearchManagementWorkflow',
diff --git a/src/applications/search/engine/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorElasticSearchEngine.php
similarity index 99%
rename from src/applications/search/engine/PhabricatorSearchEngineElastic.php
rename to src/applications/search/engine/PhabricatorElasticSearchEngine.php
index b97d690752..15f5ee7a61 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineElastic.php
+++ b/src/applications/search/engine/PhabricatorElasticSearchEngine.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorSearchEngineElastic extends PhabricatorSearchEngine {
+final class PhabricatorElasticSearchEngine extends PhabricatorSearchEngine {
   private $uri;
   private $index;
   private $timeout;
diff --git a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php b/src/applications/search/engine/PhabricatorMySQLSearchEngine.php
similarity index 99%
rename from src/applications/search/engine/PhabricatorSearchEngineMySQL.php
rename to src/applications/search/engine/PhabricatorMySQLSearchEngine.php
index 5366d3fd02..42ed21d2e8 100644
--- a/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
+++ b/src/applications/search/engine/PhabricatorMySQLSearchEngine.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorSearchEngineMySQL extends PhabricatorSearchEngine {
+final class PhabricatorMySQLSearchEngine extends PhabricatorSearchEngine {
 
   public function reindexAbstractDocument(
     PhabricatorSearchAbstractDocument $doc) {
diff --git a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
index 2bd804ed30..9e06b1182a 100644
--- a/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
+++ b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
@@ -7,9 +7,9 @@ final class PhabricatorDefaultSearchEngineSelector
     if (self::shouldUseElasticSearch()) {
       $elastic_host = PhabricatorEnv::getEnvConfig('search.elastic.host');
       $elastic_index = PhabricatorEnv::getEnvConfig('search.elastic.namespace');
-      return new PhabricatorSearchEngineElastic($elastic_host, $elastic_index);
+      return new PhabricatorElasticSearchEngine($elastic_host, $elastic_index);
     }
-    return new PhabricatorSearchEngineMySQL();
+    return new PhabricatorMySQLSearchEngine();
   }
 
   public static function shouldUseElasticSearch() {