diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index bd539556ec..541d2a9b20 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1835,7 +1835,7 @@ phutil_register_library_map(array(
     'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php',
     'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
     'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
-    'PhabricatorOAuthClientBaseController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php',
+    'PhabricatorOAuthClientController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientController.php',
     'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php',
     'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php',
     'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
@@ -4644,11 +4644,11 @@ phutil_register_library_map(array(
       'PhabricatorPolicyInterface',
     ),
     'PhabricatorOAuthClientAuthorizationQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
-    'PhabricatorOAuthClientBaseController' => 'PhabricatorOAuthServerController',
-    'PhabricatorOAuthClientDeleteController' => 'PhabricatorOAuthClientBaseController',
-    'PhabricatorOAuthClientEditController' => 'PhabricatorOAuthClientBaseController',
-    'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientBaseController',
-    'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientBaseController',
+    'PhabricatorOAuthClientController' => 'PhabricatorOAuthServerController',
+    'PhabricatorOAuthClientDeleteController' => 'PhabricatorOAuthClientController',
+    'PhabricatorOAuthClientEditController' => 'PhabricatorOAuthClientController',
+    'PhabricatorOAuthClientListController' => 'PhabricatorOAuthClientController',
+    'PhabricatorOAuthClientViewController' => 'PhabricatorOAuthClientController',
     'PhabricatorOAuthResponse' => 'AphrontResponse',
     'PhabricatorOAuthServerAccessToken' => 'PhabricatorOAuthServerDAO',
     'PhabricatorOAuthServerAuthController' => 'PhabricatorAuthController',
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientController.php
similarity index 93%
rename from src/applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientController.php
index 90cdb525d4..c373738b1a 100644
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientController.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class PhabricatorOAuthClientBaseController
+abstract class PhabricatorOAuthClientController
   extends PhabricatorOAuthServerController {
 
   private $clientPHID;
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php
index daf72bf6b7..409063d9e9 100644
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorOAuthClientDeleteController
-  extends PhabricatorOAuthClientBaseController {
+  extends PhabricatorOAuthClientController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
index 0de4776230..9ed97d85f5 100644
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorOAuthClientEditController
-  extends PhabricatorOAuthClientBaseController {
+  extends PhabricatorOAuthClientController {
 
   public function processRequest() {
     $request = $this->getRequest();
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
index 230a1d47b0..ee5d85661a 100644
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorOAuthClientListController
-  extends PhabricatorOAuthClientBaseController {
+  extends PhabricatorOAuthClientController {
 
   private $queryKey;
 
diff --git a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
index 778e232709..8965c158b3 100644
--- a/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
+++ b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
@@ -1,7 +1,7 @@
 <?php
 
 final class PhabricatorOAuthClientViewController
-  extends PhabricatorOAuthClientBaseController {
+  extends PhabricatorOAuthClientController {
 
   public function processRequest() {
     $request = $this->getRequest();