diff --git a/modules/users/client/config/users-admin.client.routes.js b/modules/users/client/config/users-admin.client.routes.js
index b15154e95f..15d15f3fba 100644
--- a/modules/users/client/config/users-admin.client.routes.js
+++ b/modules/users/client/config/users-admin.client.routes.js
@@ -6,12 +6,12 @@ angular.module('users.admin.routes').config(['$stateProvider',
     $stateProvider
       .state('admin.users', {
         url: '/users',
-        templateUrl: 'modules/users/client/views/admin/user-list.client.view.html',
+        templateUrl: 'modules/users/client/views/admin/list-users.client.view.html',
         controller: 'UserListController'
       })
       .state('admin.user', {
         url: '/users/:userId',
-        templateUrl: 'modules/users/client/views/admin/user.client.view.html',
+        templateUrl: 'modules/users/client/views/admin/view-user.client.view.html',
         controller: 'UserController',
         resolve: {
           userResolve: ['$stateParams', 'Admin', function ($stateParams, Admin) {
@@ -23,7 +23,7 @@ angular.module('users.admin.routes').config(['$stateProvider',
       })
       .state('admin.user-edit', {
         url: '/users/:userId/edit',
-        templateUrl: 'modules/users/client/views/admin/user-edit.client.view.html',
+        templateUrl: 'modules/users/client/views/admin/edit-user.client.view.html',
         controller: 'UserController',
         resolve: {
           userResolve: ['$stateParams', 'Admin', function ($stateParams, Admin) {
diff --git a/modules/users/client/controllers/admin/user-list.client.controller.js b/modules/users/client/controllers/admin/list-users.client.controller.js
similarity index 100%
rename from modules/users/client/controllers/admin/user-list.client.controller.js
rename to modules/users/client/controllers/admin/list-users.client.controller.js
diff --git a/modules/users/client/views/admin/user-edit.client.view.html b/modules/users/client/views/admin/edit-user.client.view.html
similarity index 100%
rename from modules/users/client/views/admin/user-edit.client.view.html
rename to modules/users/client/views/admin/edit-user.client.view.html
diff --git a/modules/users/client/views/admin/user-list.client.view.html b/modules/users/client/views/admin/list-users.client.view.html
similarity index 100%
rename from modules/users/client/views/admin/user-list.client.view.html
rename to modules/users/client/views/admin/list-users.client.view.html
diff --git a/modules/users/client/views/admin/user.client.view.html b/modules/users/client/views/admin/view-user.client.view.html
similarity index 100%
rename from modules/users/client/views/admin/user.client.view.html
rename to modules/users/client/views/admin/view-user.client.view.html