diff --git a/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php b/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
index c6b8b1769d..07cc277a2a 100644
--- a/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
+++ b/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryCreateController extends PhabricatorController {
+class PhabricatorRepositoryCreateController
+  extends PhabricatorRepositoryController {
 
   public function processRequest() {
 
diff --git a/src/applications/repository/controller/create/__init__.php b/src/applications/repository/controller/create/__init__.php
index b30ea67a72..c1e9e2c26b 100644
--- a/src/applications/repository/controller/create/__init__.php
+++ b/src/applications/repository/controller/create/__init__.php
@@ -7,7 +7,7 @@
 
 
 phutil_require_module('phabricator', 'aphront/response/redirect');
-phutil_require_module('phabricator', 'applications/base/controller/base');
+phutil_require_module('phabricator', 'applications/repository/controller/base');
 phutil_require_module('phabricator', 'applications/repository/storage/repository');
 phutil_require_module('phabricator', 'view/form/base');
 phutil_require_module('phabricator', 'view/form/control/submit');
diff --git a/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
index 50964bd660..8d27755c82 100644
--- a/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
+++ b/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryEditController extends PhabricatorController {
+class PhabricatorRepositoryEditController
+  extends PhabricatorRepositoryController {
 
   private $id;
   private $view;
diff --git a/src/applications/repository/controller/edit/__init__.php b/src/applications/repository/controller/edit/__init__.php
index 32113a75bc..d8fe5afa0d 100644
--- a/src/applications/repository/controller/edit/__init__.php
+++ b/src/applications/repository/controller/edit/__init__.php
@@ -8,8 +8,8 @@
 
 phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'aphront/response/redirect');
-phutil_require_module('phabricator', 'applications/base/controller/base');
 phutil_require_module('phabricator', 'applications/differential/constants/revisioncontrolsystem');
+phutil_require_module('phabricator', 'applications/repository/controller/base');
 phutil_require_module('phabricator', 'applications/repository/storage/githubnotification');
 phutil_require_module('phabricator', 'applications/repository/storage/repository');
 phutil_require_module('phabricator', 'infrastructure/env');
diff --git a/src/applications/repository/controller/list/PhabricatorRepositoryListController.php b/src/applications/repository/controller/list/PhabricatorRepositoryListController.php
index d8b9b326c3..708ff68768 100644
--- a/src/applications/repository/controller/list/PhabricatorRepositoryListController.php
+++ b/src/applications/repository/controller/list/PhabricatorRepositoryListController.php
@@ -16,7 +16,8 @@
  * limitations under the License.
  */
 
-class PhabricatorRepositoryListController extends PhabricatorController {
+class PhabricatorRepositoryListController
+  extends PhabricatorRepositoryController {
 
 
   public function processRequest() {
diff --git a/src/applications/repository/controller/list/__init__.php b/src/applications/repository/controller/list/__init__.php
index 918dbcc426..8b4bfb02da 100644
--- a/src/applications/repository/controller/list/__init__.php
+++ b/src/applications/repository/controller/list/__init__.php
@@ -6,7 +6,7 @@
 
 
 
-phutil_require_module('phabricator', 'applications/base/controller/base');
+phutil_require_module('phabricator', 'applications/repository/controller/base');
 phutil_require_module('phabricator', 'applications/repository/storage/repository');
 phutil_require_module('phabricator', 'view/control/table');
 phutil_require_module('phabricator', 'view/layout/panel');