diff --git a/js/controllers/setup.js b/js/controllers/create.js
similarity index 97%
rename from js/controllers/setup.js
rename to js/controllers/create.js
index a87bc871c..40635cc34 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/create.js
@@ -32,7 +32,7 @@ var valid_pairs = {
   '1,12': 489
 };
 
-angular.module('copayApp.controllers').controller('SetupController',
+angular.module('copayApp.controllers').controller('CreateController',
   function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
     controllerUtils.redirIfLogged();
 
diff --git a/js/routes.js b/js/routes.js
index 62b47ec37..3ff033a11 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -22,8 +22,8 @@ angular
     templateUrl: 'views/import.html',
     validate: false
   })
-  .when('/setup', {
-    templateUrl: 'views/setup.html',
+  .when('/create', {
+    templateUrl: 'views/create.html',
     validate: false
   })
   .when('/copayers', {
diff --git a/test/unit/controllers/controllersSpec.js b/test/unit/controllers/controllersSpec.js
index c056246c8..4b67894a7 100644
--- a/test/unit/controllers/controllersSpec.js
+++ b/test/unit/controllers/controllersSpec.js
@@ -65,11 +65,11 @@ describe("Unit: Controllers", function() {
     });
   });
 
-  describe('Setup Controller', function() {
-    var setupCtrl;
+  describe('Create Controller', function() {
+    var c;
     beforeEach(inject(function($controller, $rootScope) {
       scope = $rootScope.$new();
-      setupCtrl = $controller('SetupController', {
+      c = $controller('CreateController', {
         $scope: scope,
       });
     }));
diff --git a/views/setup.html b/views/create.html
similarity index 99%
rename from views/setup.html
rename to views/create.html
index 5a3c873ed..010b7a39d 100644
--- a/views/setup.html
+++ b/views/create.html
@@ -1,4 +1,4 @@
-<div ng-controller="SetupController">
+<div ng-controller="CreateController">
   <div data-alert class="loading-screen" ng-show="loading">
     <i class="size-60 fi-bitcoin-circle icon-rotate spinner"></i>
     Creating wallet...
diff --git a/views/home.html b/views/home.html
index 9d3d48aa1..80f9d70bc 100644
--- a/views/home.html
+++ b/views/home.html
@@ -9,13 +9,13 @@
         <a class="text-white" href="#!/open">Open a wallet</a>
       </div>
       <div class="button-setup" ng-show="!hasWallets">
-        <a class="text-secondary" href="#!/setup">Create a new wallet</a>
+        <a class="text-secondary" href="#!/create">Create a new wallet</a>
       </div>
       <div class="button-setup">
         <a class="text-primary" href="#!/join">Join a Wallet in Creation</a>
       </div>
       <div class="button-setup" ng-show="hasWallets">
-        <a class="text-secondary" href="#!/setup">Create a wallet</a>
+        <a class="text-secondary" href="#!/create">Create a wallet</a>
       </div>
 
       <div class="footer-setup">