diff --git a/client/client/src/credit-list/credit-list.html b/client/client/src/credit-list/credit-list.html
index 30a477cef..02a13d1ff 100644
--- a/client/client/src/credit-list/credit-list.html
+++ b/client/client/src/credit-list/credit-list.html
@@ -1,4 +1,4 @@
-<mg-ajax path="/client/api/clientCredits/filter" options="vnIndexNonAuto"></mg-ajax>
+<mg-ajax path="/client/api/ClientCredits/filter" options="vnIndexNonAuto"></mg-ajax>
 <vn-card pad-medium>
     <vn-vertical pad-large>
         <vn-title vn-one margin-large-bottom>Credit</vn-title>
diff --git a/client/client/src/mandate/mandate.html b/client/client/src/mandate/mandate.html
index c09824582..f129da64b 100644
--- a/client/client/src/mandate/mandate.html
+++ b/client/client/src/mandate/mandate.html
@@ -1,4 +1,4 @@
-<mg-ajax path="/client/api/mandates/filter" options="vnIndexNonAuto"></mg-ajax>
+<mg-ajax path="/client/api/Mandates/filter" options="vnIndexNonAuto"></mg-ajax>
 <vn-card pad-medium>
     <vn-vertical pad-medium>
         <vn-title vn-one margin-large-bottom>Mandate</vn-title>
diff --git a/client/core/src/column-header/column-header.js b/client/core/src/column-header/column-header.js
index 8d84c34d5..51f990db6 100644
--- a/client/core/src/column-header/column-header.js
+++ b/client/core/src/column-header/column-header.js
@@ -17,7 +17,8 @@ export default class ColumnHeader {
             }
             this.gridHeader.selectColum(this);
         }
-        event.preventDefault();
+        if (event)
+            event.preventDefault();
     }
     showArrow(type) {
         if (this.orderLocked)
diff --git a/services/client/common/models/client-credit.json b/services/client/common/models/client-credit.json
index 26a1733ad..c3461fe05 100644
--- a/services/client/common/models/client-credit.json
+++ b/services/client/common/models/client-credit.json
@@ -1,6 +1,12 @@
 {
-  "name": "clientCredit",
+  "name": "ClientCredit",
   "base": "VnModel",
+  "options": {
+    "mysql": {
+      "table": "clientCredit",
+      "database": "vn"
+    }
+  },
   "validateUpsert": true,
   "properties": {
     "id": {
diff --git a/services/client/common/models/company.json b/services/client/common/models/company.json
index ae7b0c07f..9314456ff 100644
--- a/services/client/common/models/company.json
+++ b/services/client/common/models/company.json
@@ -1,6 +1,12 @@
 {
-    "name": "company",
+    "name": "Company",
     "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "company",
+        "database": "vn"
+      }
+    },
     "properties": {
       "id": {
         "id": true,
diff --git a/services/client/common/models/greuge-type.json b/services/client/common/models/greuge-type.json
index 151aea5a6..6d8124e6b 100644
--- a/services/client/common/models/greuge-type.json
+++ b/services/client/common/models/greuge-type.json
@@ -1,6 +1,12 @@
 {
-    "name": "greugeType",
+    "name": "GreugeType",
     "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "greugeType",
+        "database": "vn"
+      }
+    },
     "properties": {
       "id": {
         "id": true,
diff --git a/services/client/common/models/greuge.json b/services/client/common/models/greuge.json
index 2c00f9f73..37c2c000a 100644
--- a/services/client/common/models/greuge.json
+++ b/services/client/common/models/greuge.json
@@ -1,6 +1,12 @@
 {
-    "name": "greuge",
+    "name": "Greuge",
     "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "greuge",
+        "database": "vn"
+      }
+    },
     "properties": {
       "id": {
         "id": true,
@@ -28,7 +34,7 @@
       },
       "greugeType": {
         "type": "belongsTo",
-        "model": "greugeType",
+        "model": "GreugeType",
         "foreignKey": "greugeTypeFk"
       }
     }
diff --git a/services/client/common/models/mandate.json b/services/client/common/models/mandate.json
index 4b84df5ec..0c516bc00 100644
--- a/services/client/common/models/mandate.json
+++ b/services/client/common/models/mandate.json
@@ -1,6 +1,12 @@
 {
-    "name": "mandate",
+    "name": "Mandate",
     "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "mandate",
+        "database": "vn"
+      }
+    },
     "properties": {
       "id": {
         "id": true,
@@ -25,12 +31,12 @@
       },
       "company": {
         "type": "belongsTo",
-        "model": "company",
+        "model": "Company",
         "foreignKey": "companyFk"
       },
       "mandateType": {
         "type": "belongsTo",
-        "model": "mandateType",
+        "model": "MandateType",
         "foreignKey": "mandateTypeFk"
       }
     }
diff --git a/services/client/common/models/mandateType.json b/services/client/common/models/mandateType.json
index 3e6199303..c1e1bd9fc 100644
--- a/services/client/common/models/mandateType.json
+++ b/services/client/common/models/mandateType.json
@@ -1,6 +1,12 @@
 {
-    "name": "mandateType",
+    "name": "MandateType",
     "base": "VnModel",
+    "options": {
+      "mysql": {
+        "table": "mandateType",
+        "database": "vn"
+      }
+    },
     "properties": {
       "id": {
         "id": true,
diff --git a/services/client/server/model-config.json b/services/client/server/model-config.json
index 90ccfeb59..9a8946a2e 100644
--- a/services/client/server/model-config.json
+++ b/services/client/server/model-config.json
@@ -27,7 +27,7 @@
   "Client": {
     "dataSource": "vn"
   },
-  "clientCredit": {
+  "ClientCredit": {
     "dataSource": "vn"
   },
   "ClientCreditLimit": {
@@ -60,19 +60,19 @@
   "CreditClassification": {
       "dataSource": "salix"
   },
-  "greuge": {
+  "Greuge": {
     "dataSource": "vn"
   },
-  "greugeType": {
+  "GreugeType": {
     "dataSource": "vn"
   },
-  "mandate": {
+  "Mandate": {
     "dataSource": "vn"
   },
-  "mandateType": {
+  "MandateType": {
     "dataSource": "vn"
   },
-  "company": {
+  "Company": {
     "dataSource": "vn"
   }
 }