diff --git a/js/designer/database.js b/js/designer/database.js
index bb70726b2e..e3c332f21d 100644
--- a/js/designer/database.js
+++ b/js/designer/database.js
@@ -1,7 +1,7 @@
 var designerTables = [
     {
         name: 'pdf_pages',
-        key: 'pg_nr',
+        key: 'pgNr',
         autoIncrement: true
     },
     {
diff --git a/js/designer/move.js b/js/designer/move.js
index 6871579832..d853a47161 100644
--- a/js/designer/move.js
+++ b/js/designer/move.js
@@ -662,7 +662,7 @@ DesignerMove.getUrlPos = function (forceString) {
             if (document.getElementById('check_vis_' + key).checked) {
                 var x = parseInt(document.getElementById(key).style.left, 10);
                 var y = parseInt(document.getElementById(key).style.top, 10);
-                var tbCoords = new TableCoordinate(db, key.split('.')[1], -1, x, y);
+                var tbCoords = new DesignerObjects.TableCoordinate(db, key.split('.')[1], -1, x, y);
                 coords.push(tbCoords);
             }
         }
@@ -731,10 +731,10 @@ DesignerMove.submitSaveDialogAndClose = function (callback) {
     } else {
         DesignerPage.saveToNewPage(db, name, DesignerMove.getUrlPos(), function (page) {
             DesignerMove.markSaved();
-            if (page.pg_nr) {
-                selectedPage = page.pg_nr;
+            if (page.pgNr) {
+                selectedPage = page.pgNr;
             }
-            $('#page_name').text(page.page_descr);
+            $('#page_name').text(page.pageDescr);
             if (typeof callback !== 'undefined') {
                 callback();
             }
@@ -961,19 +961,19 @@ DesignerMove.saveAs = function () {
                 DesignerPage.saveToSelectedPage(db, selectedPageId, name, DesignerMove.getUrlPos(), function (page) {
                     Functions.ajaxRemoveMessage($msgbox);
                     DesignerMove.markSaved();
-                    if (page.pg_nr) {
-                        selectedPage = page.pg_nr;
+                    if (page.pgNr) {
+                        selectedPage = page.pgNr;
                     }
-                    $('#page_name').text(page.page_descr);
+                    $('#page_name').text(page.pageDescr);
                 });
             } else if (choice === 'new') {
                 DesignerPage.saveToNewPage(db, name, DesignerMove.getUrlPos(), function (page) {
                     Functions.ajaxRemoveMessage($msgbox);
                     DesignerMove.markSaved();
-                    if (page.pg_nr) {
-                        selectedPage = page.pg_nr;
+                    if (page.pgNr) {
+                        selectedPage = page.pgNr;
                     }
-                    $('#page_name').text(page.page_descr);
+                    $('#page_name').text(page.pageDescr);
                 });
             }
         }
diff --git a/js/designer/objects.js b/js/designer/objects.js
index 7d57cd678b..befe4c8320 100644
--- a/js/designer/objects.js
+++ b/js/designer/objects.js
@@ -1,19 +1,15 @@
-function PDFPage (dbName, pageDescr, tblCords) {
-    // no dot set the auto increment before put() in the database
-    // issue #12900
-    // this.pg_nr = null;
-    this.db_name = dbName;
-    this.page_descr = pageDescr;
-    this.tbl_cords = tblCords;
-}
-
-function TableCoordinate (dbName, tableName, pdfPgNr, x, y) {
-    // no dot set the auto increment before put() in the database
-    // issue #12900
-    // this.id = null;
-    this.db_name = dbName;
-    this.table_name = tableName;
-    this.pdf_pg_nr = pdfPgNr;
-    this.x = x;
-    this.y = y;
-}
+var DesignerObjects = {
+    PdfPage: function (dbName, pageDescr, tblCords) {
+        var pgNr;
+        this.dbName = dbName;
+        this.pageDescr = pageDescr;
+        this.tblCords = tblCords;
+    },
+    TableCoordinate: function (dbName, tableName, pdfPgNr, x, y) {
+        this.dbName = dbName;
+        this.tableName = tableName;
+        this.pdfPgNr = pdfPgNr;
+        this.x = x;
+        this.y = y;
+    }
+};
diff --git a/js/designer/page.js b/js/designer/page.js
index 53de165d9b..bcf6615c4d 100644
--- a/js/designer/page.js
+++ b/js/designer/page.js
@@ -3,8 +3,8 @@ var DesignerPage = {};
 DesignerPage.showTablesInLandingPage = function (db) {
     DesignerPage.loadFirstPage(db, function (page) {
         if (page) {
-            DesignerPage.loadHtmlForPage(page.pg_nr);
-            selectedPage = page.pg_nr;
+            DesignerPage.loadHtmlForPage(page.pgNr);
+            selectedPage = page.pgNr;
         } else {
             DesignerPage.showNewPageTables(true);
         }
@@ -18,12 +18,12 @@ DesignerPage.saveToNewPage = function (db, pageName, tablePositions, callback) {
             var saveCallback = function (id) {
                 tblCords.push(id);
                 if (tablePositions.length === tblCords.length) {
-                    page.tbl_cords = tblCords;
+                    page.tblCords = tblCords;
                     DesignerOfflineDB.addObject('pdf_pages', page);
                 }
             };
             for (var pos = 0; pos < tablePositions.length; pos++) {
-                tablePositions[pos].pdf_pg_nr = page.pg_nr;
+                tablePositions[pos].pdfPgNr = page.pgNr;
                 DesignerPage.saveTablePositions(tablePositions[pos], saveCallback);
             }
             if (typeof callback !== 'undefined') {
@@ -39,14 +39,14 @@ DesignerPage.saveToSelectedPage = function (db, pageId, pageName, tablePositions
         if (typeof callback !== 'undefined') {
             callback(page);
         }
-        selectedPage = page.pg_nr;
+        selectedPage = page.pgNr;
     });
 };
 
 DesignerPage.createNewPage = function (db, pageName, callback) {
-    var newPage = new PDFPage(db, pageName);
+    var newPage = new DesignerObjects.PdfPage(db, pageName);
     DesignerOfflineDB.addObject('pdf_pages', newPage, function (pgNr) {
-        newPage.pg_nr = pgNr;
+        newPage.pgNr = pgNr;
         if (typeof callback !== 'undefined') {
             callback(newPage);
         }
@@ -62,9 +62,9 @@ DesignerPage.createPageList = function (db, callback) {
         var html = '';
         for (var p = 0; p < pages.length; p++) {
             var page = pages[p];
-            if (page.db_name === db) {
-                html += '<option value="' + page.pg_nr + '">';
-                html += Functions.escapeHtml(page.page_descr) + '</option>';
+            if (page.dbName === db) {
+                html += '<option value="' + page.pgNr + '">';
+                html += Functions.escapeHtml(page.pageDescr) + '</option>';
             }
         }
         if (typeof callback !== 'undefined') {
@@ -76,8 +76,8 @@ DesignerPage.createPageList = function (db, callback) {
 DesignerPage.deletePage = function (pageId, callback) {
     DesignerOfflineDB.loadObject('pdf_pages', pageId, function (page) {
         if (page) {
-            for (var i = 0; i < page.tbl_cords.length; i++) {
-                DesignerOfflineDB.deleteObject('table_coords', page.tbl_cords[i]);
+            for (var i = 0; i < page.tblCords.length; i++) {
+                DesignerOfflineDB.deleteObject('table_coords', page.tblCords[i]);
             }
             DesignerOfflineDB.deleteObject('pdf_pages', pageId, callback);
         }
@@ -89,9 +89,9 @@ DesignerPage.loadFirstPage = function (db, callback) {
         var firstPage = null;
         for (var i = 0; i < pages.length; i++) {
             var page = pages[i];
-            if (page.db_name === db) {
+            if (page.dbName === db) {
                 // give preference to a page having same name as the db
-                if (page.page_descr === db) {
+                if (page.pageDescr === db) {
                     callback(page);
                     return;
                 }
@@ -124,10 +124,10 @@ DesignerPage.showNewPageTables = function (check) {
 DesignerPage.loadHtmlForPage = function (pageId) {
     DesignerPage.showNewPageTables(false);
     DesignerPage.loadPageObjects(pageId, function (page, tblCords) {
-        $('#name-panel').find('#page_name').text(page.page_descr);
+        $('#name-panel').find('#page_name').text(page.pageDescr);
         DesignerMove.markSaved();
         for (var t = 0; t < tblCords.length; t++) {
-            var tbId = db + '.' + tblCords[t].table_name;
+            var tbId = db + '.' + tblCords[t].tableName;
             var table = document.getElementById(tbId);
             table.style.top = tblCords[t].y + 'px';
             table.style.left = tblCords[t].x + 'px';
@@ -136,16 +136,16 @@ DesignerPage.loadHtmlForPage = function (pageId) {
             checkbox.checked = true;
             DesignerMove.visibleTab(checkbox, checkbox.value);
         }
-        selectedPage = page.pg_nr;
+        selectedPage = page.pgNr;
     });
 };
 
 DesignerPage.loadPageObjects = function (pageId, callback) {
     DesignerOfflineDB.loadObject('pdf_pages', pageId, function (page) {
         var tblCords = [];
-        var count = page.tbl_cords.length;
+        var count = page.tblCords.length;
         for (var i = 0; i < count; i++) {
-            DesignerOfflineDB.loadObject('table_coords', page.tbl_cords[i], function (tblCord) {
+            DesignerOfflineDB.loadObject('table_coords', page.tblCords[i], function (tblCord) {
                 tblCords.push(tblCord);
                 if (tblCords.length === count) {
                     if (typeof callback !== 'undefined') {