diff --git a/src/app/Http/Controllers/API/SignupController.php b/src/app/Http/Controllers/API/SignupController.php
index f42407ab..828f95a3 100644
--- a/src/app/Http/Controllers/API/SignupController.php
+++ b/src/app/Http/Controllers/API/SignupController.php
@@ -1,94 +1,94 @@
 <?php
 
 namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 
 class SignupController extends Controller
 {
     /**
      * Starts signup process.
      *
      * Verifies user name and email/phone, sends verification email/sms message.
      * Returns the verification code.
      *
      * @param Illuminate\Http\Request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function init(Request $request)
     {
         // TODO: validate user name and email/phone
         // TODO: generate the verification code
         // TODO: send email/sms message
 
         return response()->json(['status' => 'success']);
     }
 
     /**
      * Validation of the verification code.
      *
      * @param Illuminate\Http\Request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     public function verify(Request $request)
     {
         // TODO: validate the code
         // TODO: return user name and email/phone from the codes database on success
 
         return response()->json(['status' => 'success']);
     }
 
     /**
      * Finishes the signup process by creating the user account.
      *
      * @param Illuminate\Http\Request HTTP request
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
-    public function register(Request $request)
+    public function signup(Request $request)
     {
         $v = Validator::make(
             $request->all(),
             [
                 'email' => 'required|email|unique:users',
                 'password'  => 'required|min:3|confirmed',
             ]
         );
 
         if ($v->fails()) {
             return response()->json(['status' => 'error', 'errors' => $v->errors()], 422);
         }
 
         $user = \App\User::create(
             [
                 'email' => $request->email,
                 'password' => $request->password,
             ]
         );
 
         $token = auth()->login($user);
 
         return $this->respondWithToken($token);
     }
 
     /**
      * Get the token array structure.
      *
      * @param string $token Respond with this token.
      *
      * @return \Illuminate\Http\JsonResponse JSON response
      */
     protected function respondWithToken($token)
     {
         return response()->json([
                 'access_token' => $token,
                 'token_type' => 'bearer',
                 'expires_in' => $this->guard()->factory()->getTTL() * 60,
         ]);
     }
 }
diff --git a/src/resources/vue/components/Register.vue b/src/resources/vue/components/Signup.vue
similarity index 79%
rename from src/resources/vue/components/Register.vue
rename to src/resources/vue/components/Signup.vue
index 6cf174b5..52ecb2f6 100644
--- a/src/resources/vue/components/Register.vue
+++ b/src/resources/vue/components/Signup.vue
@@ -1,146 +1,146 @@
 <template>
     <div class="container">
         <div class="card" id="step1">
             <div class="card-body">
                 <h4 class="card-title">Step 1/3</h4>
                 <p class="card-text">
                     Sign up to start your free month.
                 </p>
                 <form v-on:submit.prevent="submitStep1">
                     <div class="form-group">
-                        <label for="register_name" class="sr-only">Your Name</label>
-                        <input type="text" class="form-control" id="register_name" placeholder="Your Name" required autofocus v-model="name">
+                        <label for="signup_name" class="sr-only">Your Name</label>
+                        <input type="text" class="form-control" id="signup_name" placeholder="Your Name" required autofocus v-model="name">
                     </div>
                     <div class="form-group">
-                        <label for="register_email" class="sr-only">Existing Email or Phone Number</label>
-                        <input type="text" class="form-control" id="register_email" placeholder="Existing Email or Phone Number" required v-model="email">
+                        <label for="signup_email" class="sr-only">Existing Email or Phone Number</label>
+                        <input type="text" class="form-control" id="signup_email" placeholder="Existing Email or Phone Number" required v-model="email">
                     </div>
                     <button class="btn btn-primary" type="submit">Continue</button>
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step2">
             <div class="card-body">
                 <h4 class="card-title">Step 2/3</h4>
                 <p class="card-text">
                     We sent out a confirmation code to PHONE/EMAIL.
                     Enter the code we sent you, or click the link in the message.
                 </p>
                 <form v-on:submit.prevent="submitStep2">
                     <div class="form-group">
-                        <label for="register_code" class="sr-only">Confirmation Code</label>
-                        <input type="text" class="form-control" id="register_code" placeholder="Confirmation Code" required v-model="code">
+                        <label for="signup_code" class="sr-only">Confirmation Code</label>
+                        <input type="text" class="form-control" id="signup_code" placeholder="Confirmation Code" required v-model="code">
                     </div>
                     <button class="btn btn-secondary" type="button" v-on:click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit">Continue</button>
                 </form>
             </div>
         </div>
 
         <div class="card d-none" id="step3">
             <div class="card-body">
                 <h4 class="card-title">Step 3/3</h4>
                 <p class="card-text">
                     Create your Kolab identity (you can choose additional addresses later).
                 </p>
                 <form v-on:submit.prevent="submitStep3">
                     <div class="form-group">
-                        <label for="register_login" class="sr-only"></label>
+                        <label for="signup_login" class="sr-only"></label>
                         <div class="input-group">
-                            <input type="text" class="form-control" id="register_login" required v-model="login">
+                            <input type="text" class="form-control" id="signup_login" required v-model="login">
                             <span class="input-group-text border-left-0 border-right-0 rounded-0">@</span>
-                            <select class="custom-select" id="register_domain" v-model="domain">
+                            <select class="custom-select" id="signup_domain" v-model="domain">
                                 <option value="kolabnow.com">kolabnow.com</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="register_password" class="sr-only">Password</label>
-                        <input type="password" class="form-control" id="register_password" placeholder="Password" required v-model="password">
+                        <label for="signup_password" class="sr-only">Password</label>
+                        <input type="password" class="form-control" id="signup_password" placeholder="Password" required v-model="password">
                     </div>
                     <div class="form-group">
-                        <label for="register_confirm" class="sr-only">Confirm Password</label>
-                        <input type="password" class="form-control" id="register_confirm" placeholder="Confirm Password" required v-model="password_confirmation">
+                        <label for="signup_confirm" class="sr-only">Confirm Password</label>
+                        <input type="password" class="form-control" id="signup_confirm" placeholder="Confirm Password" required v-model="password_confirmation">
                     </div>
                     <button class="btn btn-secondary" type="button" v-on:click="stepBack">Back</button>
                     <button class="btn btn-primary" type="submit">Submit</button>
                 </form>
             </div>
         </div>
 
     </div>
 </template>
 
 <script>
     export default {
         data() {
             return {
                 email: '',
                 name: '',
                 code: '',
                 login: '',
                 domain: '',
                 password: '',
                 password_confirmation: ''
             }
         },
         created() {
             // Verification code provided, jump to Step 2
             if (this.$route.params.code) {
                 this.code = this.$route.params.code
                 this.submitStep2()
             }
         },
         methods: {
             // Submits data to the API, validates and gets verification code
             submitStep1() {
-                axios.post('/api/auth/register/init', {
+                axios.post('/api/auth/signup/init', {
                     email: this.email,
                     name: this.name
                 }).then(response => {
                     $('#step1').addClass('d-none')
                     $('#step2').removeClass('d-none').find('input').first().focus()
                 }).catch(error => {
                     // TODO
                 });
             },
             // Submits the code to the API for verification
             submitStep2() {
-                axios.post('/api/auth/register/verify', {
+                axios.post('/api/auth/signup/verify', {
                     code: this.code
                 }).then(response => {
                     $('#step1,#step2').addClass('d-none')
                     $('#step3').removeClass('d-none').find('input').first().focus()
                     // FIXME: Reset domain selector, vue does set it to an empty value
-                    $('#register_domain > option').first().prop('selected', true);
+                    $('#signup_domain > option').first().prop('selected', true);
                 }).catch(error => {
                     // TODO
                 });
             },
             // Submits the data to the API to create the user account
             submitStep3() {
-                axios.post('/api/auth/register', {
+                axios.post('/api/auth/signup', {
                     code: this.code,
                     email: this.email,
                     login: this.login,
                     domain: this.domain,
                     password: this.password,
                     password_confirmation: this.password_confirmation
                 }).then(response => {
                     $('#step2').addClass('d-none')
                     $('#step3').removeClass('d-none').find('input').first().focus()
                 }).catch(error => {
                     // TODO
                 });
             },
             // Moves the user a step back in registration form
             stepBack(e) {
                 var card = $(e.target).closest('.card')
 
                 card.prev().removeClass('d-none')
                 card.addClass('d-none').find('form')[0].reset()
             }
         }
     }
 </script>
diff --git a/src/resources/vue/js/routes.js b/src/resources/vue/js/routes.js
index 1540e471..c414645b 100644
--- a/src/resources/vue/js/routes.js
+++ b/src/resources/vue/js/routes.js
@@ -1,69 +1,69 @@
 import Vue from 'vue'
 import VueRouter from 'vue-router'
 
 Vue.use(VueRouter)
 
 import DashboardComponent from '../components/Dashboard'
 import Error404Component from '../components/404'
 import LoginComponent from '../components/Login'
 import LogoutComponent from '../components/Logout'
-import RegisterComponent from '../components/Register'
+import SignupComponent from '../components/Signup'
 
 import store from './store'
 
 const routes = [
     {
         path: '/',
         redirect: { name: 'login' }
     },
     {
         path: '/dashboard',
         name: 'dashboard',
         component: DashboardComponent,
         meta: { requiresAuth: true }
     },
     {
         path: '/login',
         name: 'login',
         component: LoginComponent
     },
     {
         path: '/logout',
         name: 'logout',
         component: LogoutComponent
     },
     {
-        path: '/register/:code?',
-        name: 'register',
-        component: RegisterComponent
+        path: '/signup/:code?',
+        name: 'signup',
+        component: SignupComponent
     },
     {
         path: '*',
         component: Error404Component
     }
 ]
 
 const router = new VueRouter({
     mode: 'history',
     routes
 })
 
 router.beforeEach((to, from, next) => {
 
     // check if the route requires authentication and user is not logged in
     if (to.matched.some(route => route.meta.requiresAuth) && !store.state.isLoggedIn) {
         // redirect to login page
         next({ name: 'login' })
         return
     }
 
     // if logged in redirect to dashboard
     if (to.path === '/login' && store.state.isLoggedIn) {
         next({ name: 'dashboard' })
         return
     }
 
     next()
 })
 
 export default router
diff --git a/src/routes/api.php b/src/routes/api.php
index fb5d13ff..76d8cef6 100644
--- a/src/routes/api.php
+++ b/src/routes/api.php
@@ -1,43 +1,43 @@
 <?php
 
 use Illuminate\Http\Request;
 
 /*
 |--------------------------------------------------------------------------
 | API Routes
 |--------------------------------------------------------------------------
 |
 | Here is where you can register API routes for your application. These
 | routes are loaded by the RouteServiceProvider within a group which
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
 
 Route::group(
     [
         'middleware' => 'api',
         'prefix' => 'auth'
     ],
     function ($router) {
         Route::get('info', 'API\UsersController@info');
         Route::post('login', 'API\UsersController@login');
         Route::post('logout', 'API\UsersController@logout');
         Route::post('refresh', 'API\UsersController@refresh');
 
-        Route::post('register/init', 'API\SignupController@init');
-        Route::post('register/verify', 'API\SignupController@verify');
-        Route::post('register', 'API\SignupController@register');
+        Route::post('signup/init', 'API\SignupController@init');
+        Route::post('signup/verify', 'API\SignupController@verify');
+        Route::post('signup', 'API\SignupController@signup');
     }
 );
 
 Route::group(
     [
         'middleware' => 'auth:api',
         'prefix' => 'v4'
     ],
     function () {
         Route::apiResource('entitlements', API\EntitlementsController::class);
         Route::apiResource('users', API\UsersController::class);
         Route::apiResource('wallets', API\WalletsController::class);
     }
 );
diff --git a/src/routes/web.php b/src/routes/web.php
index dfed9cf5..20c26ae6 100644
--- a/src/routes/web.php
+++ b/src/routes/web.php
@@ -1,23 +1,23 @@
 <?php
 
 /*
 |--------------------------------------------------------------------------
 | Web Routes
 |--------------------------------------------------------------------------
 |
 | Here is where you can register web routes for your application. These
 | routes are loaded by the RouteServiceProvider within a group which
 | contains the "web" middleware group. Now create something great!
 |
 */
 
 $action = function () {
     return view('root');
 };
 
 Route::get('/', $action);
 
 // Deep-links
 Route::get('login', $action);
-Route::get('register/{code?}', $action);
+Route::get('signup/{code?}', $action);
 //Route::get('invoice/{invoice}', $action);