diff --git a/client/client/src/address-create/address-create.html b/client/client/src/address-create/address-create.html
index ff0ccf0805..b65862c69a 100644
--- a/client/client/src/address-create/address-create.html
+++ b/client/client/src/address-create/address-create.html
@@ -10,7 +10,7 @@
         <vn-vertical pad-large>
             <vn-title>Address</vn-title>
             <vn-horizontal>
-                <vn-check vn-one label="Default" field="$ctrl.address.default"></vn-check> 
+                <vn-check vn-one label="Default" field="$ctrl.address.isDefaultAddress"></vn-check> 
             </vn-horizontal>
             <vn-horizontal>
                 <vn-textfield vn-one label="Consignee" field="$ctrl.address.consignee" vn-focus></vn-textfield>
diff --git a/client/client/src/address-create/address-create.js b/client/client/src/address-create/address-create.js
index 6c3e4521b3..416726fc57 100644
--- a/client/client/src/address-create/address-create.js
+++ b/client/client/src/address-create/address-create.js
@@ -4,7 +4,7 @@ export default class Controller {
     constructor($state) {
         this.address = {
             clientFk: parseInt($state.params.id),
-            enabled: true
+            isEnabled: true
         };
     }
 }
diff --git a/client/client/src/address-create/address-create.spec.js b/client/client/src/address-create/address-create.spec.js
index 9bc109d598..ebedc2f520 100644
--- a/client/client/src/address-create/address-create.spec.js
+++ b/client/client/src/address-create/address-create.spec.js
@@ -19,7 +19,7 @@ describe('Client', () => {
             let controller = $componentController('vnAddressCreate', {$state});
 
             expect(controller.address.clientFk).toBe(1234);
-            expect(controller.address.enabled).toBe(true);
+            expect(controller.address.isEnabled).toBe(true);
         });
     });
 });
diff --git a/client/client/src/address-edit/address-edit.html b/client/client/src/address-edit/address-edit.html
index e0691254c1..bd4b632327 100644
--- a/client/client/src/address-edit/address-edit.html
+++ b/client/client/src/address-edit/address-edit.html
@@ -11,7 +11,7 @@
         <vn-vertical pad-large>
             <vn-title>Address</vn-title>
             <vn-horizontal>
-                <vn-check vn-one label="Enabled" field="$ctrl.address.enabled"></vn-check>
+                <vn-check vn-one label="enabled" field="$ctrl.address.isEnabled"></vn-check>
                 <vn-check vn-one label="Is equalizated" field="$ctrl.address.isEqualizated"></vn-check> 
             </vn-horizontal>
             <vn-horizontal>
diff --git a/client/client/src/addresses/addresses.html b/client/client/src/addresses/addresses.html
index 1d6538fc67..8ec33bc5e3 100644
--- a/client/client/src/addresses/addresses.html
+++ b/client/client/src/addresses/addresses.html
@@ -7,11 +7,11 @@
             </vn-horizontal>
             <vn-horizontal ng-repeat="i in index.model track by i.id" class="pad-medium-top" style="align-items: center;">
                 <vn-auto style="border-radius: .5em;" class="pad-small border-solid"
-                    ng-class="{'bg-dark-item': i.default,'bg-opacity-item': !i.enabled && !i.default}">
+                    ng-class="{'bg-dark-item': i.isDefaultAddress,'bg-opacity-item': !i.isEnabled && !i.isDefaultAddress}">
                     <vn-horizontal style="align-items: center;">
                         <vn-none pad-medium-h style="color:#FFA410;">
-                            <i class="material-icons" ng-if="i.default">star</i>
-                            <i class="material-icons pointer" ng-if="!i.default&&i.enabled" vn-tooltip="Set as default" tooltip-position="left" ng-click="$ctrl.setDefault(i.id)">star_border</i>
+                            <i class="material-icons" ng-if="i.isDefaultAddress">star</i>
+                            <i class="material-icons pointer" ng-if="!i.isDefaultAddress&&i.isEnabled" vn-tooltip="Set as default" tooltip-position="left" ng-click="$ctrl.setDefault(i.id)">star_border</i>
                         </vn-none>
                         <vn-auto>
                             <div><b>{{::i.consignee}}</b></div>
diff --git a/client/client/src/addresses/addresses.js b/client/client/src/addresses/addresses.js
index bd9d5c6dde..dcf06e9355 100644
--- a/client/client/src/addresses/addresses.js
+++ b/client/client/src/addresses/addresses.js
@@ -6,7 +6,7 @@ class ClientAddresses {
         this.$scope = $scope;
     }
     setDefault(id) {
-        this.$http.patch(`/client/api/Addresses/${id}`, {id: id, default: 1}).then(() => {
+        this.$http.patch(`/client/api/Addresses/${id}`, {id: id, isDefaultAddress: true}).then(() => {
             this.$scope.index.accept();
         });
     }
diff --git a/services/client/common/methods/client/addresses.js b/services/client/common/methods/client/addresses.js
index 970c52d4b1..247c9aec0c 100644
--- a/services/client/common/methods/client/addresses.js
+++ b/services/client/common/methods/client/addresses.js
@@ -38,7 +38,7 @@ module.exports = function(Client) {
             },
             skip: (params.page - 1) * params.size,
             limit: params.size,
-            order: ['default DESC', 'enabled DESC']
+            order: ['isDefaultAddress DESC', 'isEnabled DESC']
         };
 
         Client.app.models.Address.find(filter, function(err, instances) {
diff --git a/services/client/common/models/address.js b/services/client/common/models/address.js
index 09f95209cf..6e85ed7f26 100644
--- a/services/client/common/models/address.js
+++ b/services/client/common/models/address.js
@@ -1,7 +1,7 @@
 module.exports = function(Address) {
     Address.validate('default',isEnabled,{message: 'No se puede poner predeterminado un consignatario desactivado'});
     function isEnabled(err) {
-        if (!this.enabled && this.default)  err();
+        if (!this.isEnabled && this.default)  err();
     }
 
     Address.beforeRemote('create',function(ctx, modelInstance, next){
diff --git a/services/client/common/models/address.json b/services/client/common/models/address.json
index e43b324e23..ec9ee5805c 100644
--- a/services/client/common/models/address.json
+++ b/services/client/common/models/address.json
@@ -29,10 +29,10 @@
     "mobile": {
       "type": "string"
     },
-    "enabled": {
+    "isEnabled": {
       "type": "boolean"
     },
-    "default": {
+    "isDefaultAddress": {
       "type": "boolean"
     },
     "longitude": {