diff --git a/src/js/controllers/feedback/thanks.js b/src/js/controllers/feedback/complete.js
similarity index 94%
rename from src/js/controllers/feedback/thanks.js
rename to src/js/controllers/feedback/complete.js
index b3e43dced..c337e14f9 100644
--- a/src/js/controllers/feedback/thanks.js
+++ b/src/js/controllers/feedback/complete.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('thanksController', function($scope, $stateParams, $timeout, $log, platformInfo, configService, storageService) {
+angular.module('copayApp.controllers').controller('completeController', function($scope, $stateParams, $timeout, $log, platformInfo, configService, storageService) {
   $scope.score = parseInt($stateParams.score);
   $scope.skipped = $stateParams.skipped == 'false' ? false : true;
   $scope.isCordova = platformInfo.isCordova;
diff --git a/src/js/controllers/feedback/rateAppStore.js b/src/js/controllers/feedback/rateApp.js
similarity index 78%
rename from src/js/controllers/feedback/rateAppStore.js
rename to src/js/controllers/feedback/rateApp.js
index b659fa516..64792fc51 100644
--- a/src/js/controllers/feedback/rateAppStore.js
+++ b/src/js/controllers/feedback/rateApp.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('rateAppStoreController', function($scope, $state, $stateParams, externalLinkService, configService, gettextCatalog, platformInfo) {
+angular.module('copayApp.controllers').controller('rateAppController', function($scope, $state, $stateParams, externalLinkService, configService, gettextCatalog, platformInfo) {
   $scope.score = parseInt($stateParams.score);
   var isAndroid = platformInfo.isAndroid;
   var isIOS = platformInfo.isIOS;
@@ -8,14 +8,14 @@ angular.module('copayApp.controllers').controller('rateAppStoreController', func
   var config = configService.getSync();
 
   $scope.skip = function() {
-    $state.go('feedback.thanks', {
+    $state.go('feedback.complete', {
       score: $scope.score,
       skipped: true
     });
   };
 
   $scope.sendFeedback = function() {
-    $state.go('feedback.sendFeedback', {
+    $state.go('feedback.send', {
       score: $scope.score
     });
   };
diff --git a/src/js/controllers/feedback/rateCard.js b/src/js/controllers/feedback/rateCard.js
index e735f4836..53504b8de 100644
--- a/src/js/controllers/feedback/rateCard.js
+++ b/src/js/controllers/feedback/rateCard.js
@@ -10,11 +10,11 @@ angular.module('copayApp.controllers').controller('rateCardController', function
       $scope.rateModal.remove();
     }
     if ($scope.isCordova && $scope.score == 5) {
-      $state.go('feedback.rateAppStore', {
+      $state.go('feedback.rateApp', {
         score: $scope.score
       });
     } else {
-      $state.go('feedback.sendFeedback', {
+      $state.go('feedback.send', {
         score: $scope.score
       });
     }
diff --git a/src/js/controllers/feedback/sendFeedback.js b/src/js/controllers/feedback/send.js
similarity index 87%
rename from src/js/controllers/feedback/sendFeedback.js
rename to src/js/controllers/feedback/send.js
index 8899301c3..fc8fa410c 100644
--- a/src/js/controllers/feedback/sendFeedback.js
+++ b/src/js/controllers/feedback/send.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('copayApp.controllers').controller('sendFeedbackController', function($scope, $state, $log, $stateParams, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
+angular.module('copayApp.controllers').controller('sendController', function($scope, $state, $log, $stateParams, gettextCatalog, popupService, configService, lodash, feedbackService, ongoingProcess) {
   $scope.score = parseInt($stateParams.score);
   switch ($scope.score) {
     case 1:
@@ -42,7 +42,7 @@ angular.module('copayApp.controllers').controller('sendFeedbackController', func
         popupService.showAlert(gettextCatalog.getString('Error'), gettextCatalog.getString('Could not send feedback'));
         return;
       }
-      $state.go('feedback.thanks', {
+      $state.go('feedback.complete', {
         score: $stateParams.score,
         skipped: skip
       });
diff --git a/src/js/controllers/tab-home.js b/src/js/controllers/tab-home.js
index 3789bc988..1c21e05bd 100644
--- a/src/js/controllers/tab-home.js
+++ b/src/js/controllers/tab-home.js
@@ -42,7 +42,7 @@ angular.module('copayApp.controllers').controller('tabHomeController',
           initFeedBackInfo();
         } else {
           var feedbackInfo = JSON.parse(info);
-          //la version de ahora es mayor que la guardada ?
+          //Check if current version is greater than saved version
           var currentVersion = window.version;
           var savedVersion = feedbackInfo.version;
           var isVersionUpdated = feedbackService.isVersionUpdated(currentVersion, savedVersion);
diff --git a/src/js/routes.js b/src/js/routes.js
index ee65083d3..029a154fc 100644
--- a/src/js/routes.js
+++ b/src/js/routes.js
@@ -731,30 +731,30 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
         abstract: true,
         template: '<ion-nav-view name="feedback"></ion-nav-view>'
       })
-      .state('feedback.sendFeedback', {
-        url: '/sendFeedback/:score',
+      .state('feedback.send', {
+        url: '/send/:score',
         views: {
           'feedback': {
-            controller: 'sendFeedbackController',
-            templateUrl: 'views/feedback/sendFeedback.html'
+            controller: 'sendController',
+            templateUrl: 'views/feedback/send.html'
           }
         }
       })
-      .state('feedback.thanks', {
-        url: '/thanks/:score/:skipped',
+      .state('feedback.complete', {
+        url: '/complete/:score/:skipped',
         views: {
           'feedback': {
-            controller: 'thanksController',
-            templateUrl: 'views/feedback/thanks.html'
+            controller: 'completeController',
+            templateUrl: 'views/feedback/complete.html'
           }
         }
       })
-      .state('feedback.rateAppStore', {
-        url: '/rateAppStore/:score',
+      .state('feedback.rateApp', {
+        url: '/rateApp/:score',
         views: {
           'feedback': {
-            controller: 'rateAppStoreController',
-            templateUrl: 'views/feedback/rateAppStore.html'
+            controller: 'rateAppController',
+            templateUrl: 'views/feedback/rateApp.html'
           }
         }
       })
diff --git a/src/sass/views/feedback/thanks.scss b/src/sass/views/feedback/complete.scss
similarity index 97%
rename from src/sass/views/feedback/thanks.scss
rename to src/sass/views/feedback/complete.scss
index 2d86c357f..f7a7a5277 100644
--- a/src/sass/views/feedback/thanks.scss
+++ b/src/sass/views/feedback/complete.scss
@@ -1,4 +1,4 @@
-#thanks-feedback {
+#complete {
   background-color: #ffffff;
   .item-heading {
     border-style: none;
diff --git a/src/sass/views/feedback/rateAppStore.scss b/src/sass/views/feedback/rateApp.scss
similarity index 96%
rename from src/sass/views/feedback/rateAppStore.scss
rename to src/sass/views/feedback/rateApp.scss
index 5003e6b02..779cffd67 100644
--- a/src/sass/views/feedback/rateAppStore.scss
+++ b/src/sass/views/feedback/rateApp.scss
@@ -1,4 +1,4 @@
-#rate-app-store {
+#rate-app {
   background-color: #ffffff;
   .skip {
     margin: 10px;
diff --git a/src/sass/views/feedback/sendFeedBack.scss b/src/sass/views/feedback/send.scss
similarity index 100%
rename from src/sass/views/feedback/sendFeedBack.scss
rename to src/sass/views/feedback/send.scss
diff --git a/src/sass/views/views.scss b/src/sass/views/views.scss
index 5b3e8290d..688c33798 100644
--- a/src/sass/views/views.scss
+++ b/src/sass/views/views.scss
@@ -18,9 +18,9 @@
 @import "zero-state";
 @import "onboarding/onboarding";
 @import "feedback/rateCard";
-@import "feedback/sendFeedback";
-@import "feedback/thanks";
-@import "feedback/rateAppStore";
+@import "feedback/send";
+@import "feedback/complete";
+@import "feedback/rateApp";
 @import "includes/actionSheet";
 @import "export";
 @import "import";
diff --git a/www/views/feedback/thanks.html b/www/views/feedback/complete.html
similarity index 98%
rename from www/views/feedback/thanks.html
rename to www/views/feedback/complete.html
index 12c07dfca..36a47296c 100644
--- a/www/views/feedback/thanks.html
+++ b/www/views/feedback/complete.html
@@ -1,4 +1,4 @@
-<ion-view id="thanks-feedback">
+<ion-view id="complete">
   <ion-content scroll="false">
     <div class="item item-icon-right item-heading">
       <a ui-sref="tabs.home"><i class="icon ion-ios-close-empty close-home-tip"></i></a>
diff --git a/www/views/feedback/rateAppStore.html b/www/views/feedback/rateApp.html
similarity index 97%
rename from www/views/feedback/rateAppStore.html
rename to www/views/feedback/rateApp.html
index 3da6ed36b..524ba9781 100644
--- a/www/views/feedback/rateAppStore.html
+++ b/www/views/feedback/rateApp.html
@@ -1,4 +1,4 @@
-<ion-view id="rate-app-store">
+<ion-view id="rate-app">
   <ion-content scroll="false">
     <a class="right skip" ng-click="skip()">Skip</a>
     <div class="title">
diff --git a/www/views/feedback/sendFeedback.html b/www/views/feedback/send.html
similarity index 100%
rename from www/views/feedback/sendFeedback.html
rename to www/views/feedback/send.html