diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 393ebe9a..5a141d0b 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -181,6 +181,7 @@ phutil_register_library_map(array(
     'ArcanistUnitRenderer' => 'unit/renderer/ArcanistUnitRenderer.php',
     'ArcanistUnitTestEngine' => 'unit/engine/ArcanistUnitTestEngine.php',
     'ArcanistUnitTestResult' => 'unit/ArcanistUnitTestResult.php',
+    'ArcanistUnitTestableLintEngine' => 'lint/engine/ArcanistUnitTestableLintEngine.php',
     'ArcanistUnitWorkflow' => 'workflow/ArcanistUnitWorkflow.php',
     'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php',
     'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php',
@@ -210,7 +211,6 @@ phutil_register_library_map(array(
     'PhutilUnitTestEngine' => 'unit/engine/PhutilUnitTestEngine.php',
     'PhutilUnitTestEngineTestCase' => 'unit/engine/__tests__/PhutilUnitTestEngineTestCase.php',
     'PytestTestEngine' => 'unit/engine/PytestTestEngine.php',
-    'UnitTestableArcanistLintEngine' => 'lint/engine/UnitTestableArcanistLintEngine.php',
     'XUnitTestEngine' => 'unit/engine/XUnitTestEngine.php',
     'XUnitTestResultParserTestCase' => 'unit/engine/__tests__/XUnitTestResultParserTestCase.php',
   ),
@@ -357,6 +357,7 @@ phutil_register_library_map(array(
     'ArcanistTodoWorkflow' => 'ArcanistWorkflow',
     'ArcanistUncommittedChangesException' => 'ArcanistUsageException',
     'ArcanistUnitConsoleRenderer' => 'ArcanistUnitRenderer',
+    'ArcanistUnitTestableLintEngine' => 'ArcanistLintEngine',
     'ArcanistUnitWorkflow' => 'ArcanistWorkflow',
     'ArcanistUpgradeWorkflow' => 'ArcanistWorkflow',
     'ArcanistUploadWorkflow' => 'ArcanistWorkflow',
@@ -382,7 +383,6 @@ phutil_register_library_map(array(
     'PhutilUnitTestEngine' => 'ArcanistUnitTestEngine',
     'PhutilUnitTestEngineTestCase' => 'ArcanistTestCase',
     'PytestTestEngine' => 'ArcanistUnitTestEngine',
-    'UnitTestableArcanistLintEngine' => 'ArcanistLintEngine',
     'XUnitTestEngine' => 'ArcanistUnitTestEngine',
     'XUnitTestResultParserTestCase' => 'ArcanistTestCase',
   ),
diff --git a/src/lint/engine/UnitTestableArcanistLintEngine.php b/src/lint/engine/ArcanistUnitTestableLintEngine.php
similarity index 89%
rename from src/lint/engine/UnitTestableArcanistLintEngine.php
rename to src/lint/engine/ArcanistUnitTestableLintEngine.php
index 4c1f771a..278e3188 100644
--- a/src/lint/engine/UnitTestableArcanistLintEngine.php
+++ b/src/lint/engine/ArcanistUnitTestableLintEngine.php
@@ -4,7 +4,7 @@
  * Lint engine for use in constructing test cases. See
  * @{class:ArcanistLinterTestCase}.
  */
-final class UnitTestableArcanistLintEngine extends ArcanistLintEngine {
+final class ArcanistUnitTestableLintEngine extends ArcanistLintEngine {
 
   protected $linters = array();
 
diff --git a/src/lint/linter/__tests__/ArcanistLinterTestCase.php b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
index 6062f985..87a84c0c 100644
--- a/src/lint/linter/__tests__/ArcanistLinterTestCase.php
+++ b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
@@ -110,7 +110,7 @@ abstract class ArcanistLinterTestCase extends ArcanistPhutilTestCase {
       $configuration_manager->setWorkingCopyIdentity($working_copy);
 
 
-      $engine = new UnitTestableArcanistLintEngine();
+      $engine = new ArcanistUnitTestableLintEngine();
       $engine->setWorkingCopy($working_copy);
       $engine->setConfigurationManager($configuration_manager);
       $engine->setPaths(array($path));