diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e50ece14c0..cae42983cb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1327,8 +1327,6 @@ phutil_register_library_map(array(
     'PhabricatorAuthEditController' => 'applications/auth/controller/config/PhabricatorAuthEditController.php',
     'PhabricatorAuthFactor' => 'applications/auth/factor/PhabricatorAuthFactor.php',
     'PhabricatorAuthFactorConfig' => 'applications/auth/storage/PhabricatorAuthFactorConfig.php',
-    'PhabricatorAuthFactorTOTP' => 'applications/auth/factor/PhabricatorAuthFactorTOTP.php',
-    'PhabricatorAuthFactorTOTPTestCase' => 'applications/auth/factor/__tests__/PhabricatorAuthFactorTOTPTestCase.php',
     'PhabricatorAuthFinishController' => 'applications/auth/controller/PhabricatorAuthFinishController.php',
     'PhabricatorAuthHighSecurityRequiredException' => 'applications/auth/exception/PhabricatorAuthHighSecurityRequiredException.php',
     'PhabricatorAuthHighSecurityToken' => 'applications/auth/data/PhabricatorAuthHighSecurityToken.php',
@@ -2472,6 +2470,8 @@ phutil_register_library_map(array(
     'PhabricatorSystemRemoveWorkflow' => 'applications/system/management/PhabricatorSystemRemoveWorkflow.php',
     'PhabricatorSystemSelectEncodingController' => 'applications/system/controller/PhabricatorSystemSelectEncodingController.php',
     'PhabricatorSystemSelectHighlightController' => 'applications/system/controller/PhabricatorSystemSelectHighlightController.php',
+    'PhabricatorTOTPAuthFactor' => 'applications/auth/factor/PhabricatorTOTPAuthFactor.php',
+    'PhabricatorTOTPAuthFactorTestCase' => 'applications/auth/factor/__tests__/PhabricatorTOTPAuthFactorTestCase.php',
     'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
     'PhabricatorTestApplication' => 'applications/base/controller/__tests__/PhabricatorTestApplication.php',
     'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
@@ -4479,8 +4479,6 @@ phutil_register_library_map(array(
     'PhabricatorAuthEditController' => 'PhabricatorAuthProviderConfigController',
     'PhabricatorAuthFactor' => 'Phobject',
     'PhabricatorAuthFactorConfig' => 'PhabricatorAuthDAO',
-    'PhabricatorAuthFactorTOTP' => 'PhabricatorAuthFactor',
-    'PhabricatorAuthFactorTOTPTestCase' => 'PhabricatorTestCase',
     'PhabricatorAuthFinishController' => 'PhabricatorAuthController',
     'PhabricatorAuthHighSecurityRequiredException' => 'Exception',
     'PhabricatorAuthLinkController' => 'PhabricatorAuthController',
@@ -5710,6 +5708,8 @@ phutil_register_library_map(array(
     'PhabricatorSystemRemoveWorkflow' => 'PhabricatorManagementWorkflow',
     'PhabricatorSystemSelectEncodingController' => 'PhabricatorController',
     'PhabricatorSystemSelectHighlightController' => 'PhabricatorController',
+    'PhabricatorTOTPAuthFactor' => 'PhabricatorAuthFactor',
+    'PhabricatorTOTPAuthFactorTestCase' => 'PhabricatorTestCase',
     'PhabricatorTaskmasterDaemon' => 'PhabricatorDaemon',
     'PhabricatorTestApplication' => 'PhabricatorApplication',
     'PhabricatorTestCase' => 'ArcanistPhutilTestCase',
diff --git a/src/applications/auth/factor/PhabricatorAuthFactorTOTP.php b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
similarity index 99%
rename from src/applications/auth/factor/PhabricatorAuthFactorTOTP.php
rename to src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
index 1f15c81a33..519df58ffb 100644
--- a/src/applications/auth/factor/PhabricatorAuthFactorTOTP.php
+++ b/src/applications/auth/factor/PhabricatorTOTPAuthFactor.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorAuthFactorTOTP extends PhabricatorAuthFactor {
+final class PhabricatorTOTPAuthFactor extends PhabricatorAuthFactor {
 
   const TEMPORARY_TOKEN_TYPE = 'mfa:totp:key';
 
diff --git a/src/applications/auth/factor/__tests__/PhabricatorAuthFactorTOTPTestCase.php b/src/applications/auth/factor/__tests__/PhabricatorTOTPAuthFactorTestCase.php
similarity index 86%
rename from src/applications/auth/factor/__tests__/PhabricatorAuthFactorTOTPTestCase.php
rename to src/applications/auth/factor/__tests__/PhabricatorTOTPAuthFactorTestCase.php
index 932756c608..464c0b8e54 100644
--- a/src/applications/auth/factor/__tests__/PhabricatorAuthFactorTOTPTestCase.php
+++ b/src/applications/auth/factor/__tests__/PhabricatorTOTPAuthFactorTestCase.php
@@ -1,6 +1,6 @@
 <?php
 
-final class PhabricatorAuthFactorTOTPTestCase extends PhabricatorTestCase {
+final class PhabricatorTOTPAuthFactorTestCase extends PhabricatorTestCase {
 
   public function testTOTPCodeGeneration() {
     $tests = array(
@@ -32,7 +32,7 @@ final class PhabricatorAuthFactorTOTPTestCase extends PhabricatorTestCase {
       list($key, $time, $code) = $test;
       $this->assertEqual(
         $code,
-        PhabricatorAuthFactorTOTP::getTOTPCode(
+        PhabricatorTOTPAuthFactor::getTOTPCode(
           new PhutilOpaqueEnvelope($key),
           $time));
     }