diff --git a/src/js/client.js b/src/js/client.js
index b1e2a74a9..34e6790f9 100644
--- a/src/js/client.js
+++ b/src/js/client.js
@@ -627,12 +627,12 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         }
     };
 
-    Client.prototype.getAddonLogs = function (addonName, follow, lines, callback) {
+    Client.prototype.getServiceLogs = function (serviceName, follow, lines, callback) {
         if (follow) {
-            var eventSource = new EventSource(client.apiOrigin + '/api/v1/services/' + addonName + '/logstream?lines=' + lines + '&access_token=' + token);
+            var eventSource = new EventSource(client.apiOrigin + '/api/v1/services/' + serviceName + '/logstream?lines=' + lines + '&access_token=' + token);
             callback(null, eventSource);
         } else {
-            get('/api/v1/services/' + addonName + '/logs?lines=100').success(function (data, status) {
+            get('/api/v1/services/' + serviceName + '/logs?lines=100').success(function (data, status) {
                 if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
                 callback(null, data);
             }).error(defaultErrorHandler(callback));
@@ -665,29 +665,29 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.getAddons = function (callback) {
+    Client.prototype.getServices = function (callback) {
         get('/api/v1/services').success(function (data, status) {
             if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
-            callback(null, data.addons);
+            callback(null, data.services);
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.getAddon = function (addonName, callback) {
-        get('/api/v1/services/' + addonName).success(function (data, status) {
+    Client.prototype.getService = function (serviceName, callback) {
+        get('/api/v1/services/' + serviceName).success(function (data, status) {
             if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data));
-            callback(null, data.addon);
+            callback(null, data.service);
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.configureAddon = function (addonName, memoryLimit, callback) {
-        post('/api/v1/services/' + addonName, { memory: memoryLimit }).success(function (data, status) {
+    Client.prototype.configureService = function (serviceName, memoryLimit, callback) {
+        post('/api/v1/services/' + serviceName, { memory: memoryLimit }).success(function (data, status) {
             if (status !== 202) return callback(new ClientError(status, data));
             callback(null);
         }).error(defaultErrorHandler(callback));
     };
 
-    Client.prototype.restartAddon = function (addonName, callback) {
-        post('/api/v1/services/' + addonName + '/restart').success(function (data, status) {
+    Client.prototype.restartService = function (serviceName, callback) {
+        post('/api/v1/services/' + serviceName + '/restart').success(function (data, status) {
             if (status !== 202) return callback(new ClientError(status, data));
             callback(null);
         }).error(defaultErrorHandler(callback));
diff --git a/src/js/logs.js b/src/js/logs.js
index 4c9d9c6be..ac5699085 100644
--- a/src/js/logs.js
+++ b/src/js/logs.js
@@ -34,7 +34,7 @@ app.controller('LogsController', ['$scope', '$timeout', '$location', 'Client', f
 
         var func;
         if ($scope.selected.type === 'platform') func = Client.getPlatformLogs;
-        else if ($scope.selected.type === 'addon') func = Client.getAddonLogs;
+        else if ($scope.selected.type === 'addon') func = Client.getServiceLogs;
         else func = Client.getAppLogs;
 
         func($scope.selected.value, true, $scope.lines, function handleLogs(error, result) {
@@ -73,7 +73,7 @@ app.controller('LogsController', ['$scope', '$timeout', '$location', 'Client', f
             { name: 'MongoDB', type: 'addon', value: 'mongodb', url: Client.makeURL('/api/v1/services/mongodb/logs') },
             { name: 'MySQL', type: 'addon', value: 'mysql', url: Client.makeURL('/api/v1/services/mysql/logs') },
             { name: 'PostgreSQL', type: 'addon', value: 'postgresql', url: Client.makeURL('/api/v1/services/postgresql/logs') },
-            { name: 'Email', type: 'addon', value: 'email', url: Client.makeURL('/api/v1/services/email/logs') },
+            { name: 'Mail', type: 'addon', value: 'mail', url: Client.makeURL('/api/v1/services/mail/logs') },
             { name: 'Docker', type: 'addon', value: 'docker', url: Client.makeURL('/api/v1/services/docker/logs') }
         ];
 
diff --git a/src/views/system.js b/src/views/system.js
index 1852d1295..78028be21 100644
--- a/src/views/system.js
+++ b/src/views/system.js
@@ -13,7 +13,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
     function refresh(addonName, callback) {
         callback = callback || function () {};
 
-        Client.getAddon(addonName, function (error, result) {
+        Client.getService(addonName, function (error, result) {
             if (error) Client.error(error);
             else $scope.addons[addonName] = result;
 
@@ -57,7 +57,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             });
         }
 
-        Client.restartAddon(addonName, function (error) {
+        Client.restartService(addonName, function (error) {
             if (error) return Client.error(error);
 
             waitForActive(addonName);
@@ -97,7 +97,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
             $scope.addonConfigure.busy = true;
             $scope.addonConfigure.error = null;
 
-            Client.configureAddon($scope.addonConfigure.addon.name, memoryLimit, function (error) {
+            Client.configureService($scope.addonConfigure.addon.name, memoryLimit, function (error) {
                 $scope.addonConfigure.busy = false;
                 if (error) {
                     $scope.addonConfigure.error = error.message;
@@ -130,7 +130,7 @@ angular.module('Application').controller('SystemController', ['$scope', '$locati
 
             $scope.isRebootRequired = !!result;
 
-            Client.getAddons(function (error, result) {
+            Client.getServices(function (error, result) {
                 if (error) return Client.error(error);
 
                 result.forEach(function (a) {