diff --git a/src/main/scala/ScalatraBootstrap.scala b/src/main/scala/ScalatraBootstrap.scala
index de3c40d04..b03456578 100644
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -20,7 +20,7 @@ class ScalatraBootstrap extends LifeCycle {
     context.mount(new DashboardController, "/*")
     context.mount(new UserManagementController, "/*")
     context.mount(new SystemSettingsController, "/*")
-    context.mount(new CreateRepositoryController, "/*")
+    context.mount(new CreateController, "/*")
     context.mount(new AccountController, "/*")
     context.mount(new RepositoryViewerController, "/*")
     context.mount(new WikiController, "/*")
diff --git a/src/main/scala/app/CreateRepositoryController.scala b/src/main/scala/app/CreateController.scala
similarity index 98%
rename from src/main/scala/app/CreateRepositoryController.scala
rename to src/main/scala/app/CreateController.scala
index 90e9ac3ae..022277ed7 100644
--- a/src/main/scala/app/CreateRepositoryController.scala
+++ b/src/main/scala/app/CreateController.scala
@@ -11,14 +11,14 @@ import org.eclipse.jgit.dircache.DirCache
 import org.scalatra.i18n.Messages
 import org.apache.commons.io.FileUtils
 
-class CreateRepositoryController extends CreateRepositoryControllerBase
+class CreateController extends CreateControllerBase
   with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
   with UsersAuthenticator with ReadableUsersAuthenticator
 
 /**
  * Creates new repository or group.
  */
-trait CreateRepositoryControllerBase extends AccountManagementControllerBase {
+trait CreateControllerBase extends AccountManagementControllerBase {
   self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService
     with UsersAuthenticator with ReadableUsersAuthenticator =>