diff --git a/app/locales.js b/app/locales.js
index b961541b..9807da2c 100644
--- a/app/locales.js
+++ b/app/locales.js
@@ -783,7 +783,7 @@ Ext.define('Ngcp.csc.locales', {
                 sp: 'Webrtc'
             }
         },
-        fax_spool: {
+        faxspool: {
             title: {
                 en: 'Your faxes.',
                 it: 'Your faxes.',
@@ -850,7 +850,7 @@ Ext.define('Ngcp.csc.locales', {
                 }
             }
         },
-        fax_send: {
+        faxsend: {
             title: {
                 en: 'Send a fax.',
                 it: 'Send a fax.',
@@ -983,21 +983,21 @@ Ext.define('Ngcp.csc.locales', {
                 fr: 'Logo',
                 sp: 'Logo'
             },
-            fontfamily: {
+            font_family: {
                 en: 'Font family',
                 it: 'Font family',
                 de: 'Font family',
                 fr: 'Font family',
                 sp: 'Font family'
             },
-            fontsize: {
+            font_size: {
                 en: 'Font size',
                 it: 'Font size',
                 de: 'Font size',
                 fr: 'Font size',
                 sp: 'Font size'
             },
-            fontweight: {
+            font_weight: {
                 en: 'Font weight',
                 it: 'Font weight',
                 de: 'Font weight',
diff --git a/classic/src/view/pages/faxsend/FaxSend.js b/classic/src/view/pages/faxsend/FaxSend.js
index f349b22c..7ea61ee4 100644
--- a/classic/src/view/pages/faxsend/FaxSend.js
+++ b/classic/src/view/pages/faxsend/FaxSend.js
@@ -7,7 +7,7 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSend', {
 
     controller: 'faxsend',
 
-    title: Ngcp.csc.locales.fax_send.title[localStorage.getItem('languageSelected')],
+    title: Ngcp.csc.locales.faxsend.title[localStorage.getItem('languageSelected')],
 
     initComponent: function () {
         this.items = [{
@@ -26,7 +26,7 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSend', {
 
                 items:[{
                     height: 60,
-                    html: Ngcp.csc.locales.fax_send.subtitle[localStorage.getItem('languageSelected')]
+                    html: Ngcp.csc.locales.faxsend.subtitle[localStorage.getItem('languageSelected')]
                 }, {
                     reference:'faxsendForm',
                     xtype: 'faxsendform',
@@ -39,7 +39,7 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSend', {
                         flex: 1
                     },
                     items: [{
-                        text: Ngcp.csc.locales.fax_send.send_fax[localStorage.getItem('languageSelected')],
+                        text: Ngcp.csc.locales.faxsend.send_fax[localStorage.getItem('languageSelected')],
                         margin: '0 5 0 0',
                         handler: 'submitForm'
                     }, {
diff --git a/classic/src/view/pages/faxsend/FaxSendForm.js b/classic/src/view/pages/faxsend/FaxSendForm.js
index c809cd7d..ec8917cc 100644
--- a/classic/src/view/pages/faxsend/FaxSendForm.js
+++ b/classic/src/view/pages/faxsend/FaxSendForm.js
@@ -8,16 +8,16 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSendForm', {
     layout: 'form',
 
     items: [{
-        fieldLabel: Ngcp.csc.locales.fax_send.field_labels.destination_number[localStorage.getItem('languageSelected')],
+        fieldLabel: Ngcp.csc.locales.faxsend.field_labels.destination_number[localStorage.getItem('languageSelected')],
         bind: '{destination_number}',
         allowBlank: false,
-        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.fax_send.tooltips.number_fax[localStorage.getItem('languageSelected')] + '"',
+        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.faxsend.tooltips.number_fax[localStorage.getItem('languageSelected')] + '"',
         listeners: {
             specialKey: 'onEnterPressed'
         }
     }, {
         xtype: 'combo',
-        fieldLabel: Ngcp.csc.locales.fax_send.field_labels.quality[localStorage.getItem('languageSelected')],
+        fieldLabel: Ngcp.csc.locales.faxsend.field_labels.quality[localStorage.getItem('languageSelected')],
         padding: '0 0 0 15',
         store: 'FaxSendQuality',
         queryMode: 'local',
@@ -26,37 +26,37 @@ Ext.define('NgcpCsc.view.pages.faxsend.FaxSendForm', {
         displayField: 'quality',
         editable: false,
         value: 'Standard',
-        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.fax_send.tooltips.fax_quality[localStorage.getItem('languageSelected')] + '"',
+        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.faxsend.tooltips.fax_quality[localStorage.getItem('languageSelected')] + '"',
         listeners: {
             'select': 'selectQuality'
         }
     }, {
-        fieldLabel: Ngcp.csc.locales.fax_send.field_labels.page_header[localStorage.getItem('languageSelected')],
+        fieldLabel: Ngcp.csc.locales.faxsend.field_labels.page_header[localStorage.getItem('languageSelected')],
         bind: '{page_header}',
         allowBlank: false,
-        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.fax_send.tooltips.header_text[localStorage.getItem('languageSelected')] + '"',
+        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.faxsend.tooltips.header_text[localStorage.getItem('languageSelected')] + '"',
         listeners: {
             specialKey: 'onEnterPressed'
         }
     }, {
         xtype: 'textareafield',
-        fieldLabel: Ngcp.csc.locales.fax_send.field_labels.content[localStorage.getItem('languageSelected')],
+        fieldLabel: Ngcp.csc.locales.faxsend.field_labels.content[localStorage.getItem('languageSelected')],
         bind: '{content}',
         cls: 'faxsend-content',
         allowBlank: false,
-        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.fax_send.tooltips.content_text[localStorage.getItem('languageSelected')] + '"',
+        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.faxsend.tooltips.content_text[localStorage.getItem('languageSelected')] + '"',
         listeners: {
             specialKey: 'onEnterPressed'
         }
     }, {
         xtype: 'filefield',
         itemId: 'fs-file',
-        fieldLabel: Ngcp.csc.locales.fax_send.field_labels.file[localStorage.getItem('languageSelected')],
+        fieldLabel: Ngcp.csc.locales.faxsend.field_labels.file[localStorage.getItem('languageSelected')],
         anchor: '100%',
         allowBlank: false,
-        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.fax_send.tooltips.file_to_send[localStorage.getItem('languageSelected')] + '"',
+        inputAttrTpl: 'data-qtip="' + Ngcp.csc.locales.faxsend.tooltips.file_to_send[localStorage.getItem('languageSelected')] + '"',
         bind: '{file}',
-        buttonText: Ngcp.csc.locales.fax_send.choose_file[localStorage.getItem('languageSelected')]
+        buttonText: Ngcp.csc.locales.faxsend.choose_file[localStorage.getItem('languageSelected')]
     }]
 
 })
diff --git a/classic/src/view/pages/faxspool/FaxSpool.js b/classic/src/view/pages/faxspool/FaxSpool.js
index 4764ee52..a98ad513 100644
--- a/classic/src/view/pages/faxspool/FaxSpool.js
+++ b/classic/src/view/pages/faxspool/FaxSpool.js
@@ -5,7 +5,7 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpool', {
 
     controller: 'faxspool',
 
-    title: Ngcp.csc.locales.fax_spool.title[localStorage.getItem('languageSelected')],
+    title: Ngcp.csc.locales.faxspool.title[localStorage.getItem('languageSelected')],
 
     layout: 'responsivecolumn',
 
@@ -15,11 +15,11 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpool', {
             padding:30,
             items: [{
                 height: 40,
-                html: Ngcp.csc.locales.fax_spool.subtitle[localStorage.getItem('languageSelected')]
+                html: Ngcp.csc.locales.faxspool.subtitle[localStorage.getItem('languageSelected')]
             }, {
                 height: 80,
                 padding: '5 0 0 0',
-                html: Ext.String.format('<div class="faxspool-heading">{0} {1}</div>', Ngcp.csc.locales.fax_spool.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
+                html: Ext.String.format('<div class="faxspool-heading">{0} {1}</div>', Ngcp.csc.locales.faxspool.user_label[localStorage.getItem('languageSelected')], localStorage.getItem('username'))
             }, {
                 xtype: 'faxspool-grid'
             }]
diff --git a/classic/src/view/pages/faxspool/FaxSpoolGrid.js b/classic/src/view/pages/faxspool/FaxSpoolGrid.js
index 369c3e27..9da3ae5c 100644
--- a/classic/src/view/pages/faxspool/FaxSpoolGrid.js
+++ b/classic/src/view/pages/faxspool/FaxSpoolGrid.js
@@ -31,13 +31,13 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpoolGrid', {
             flex: 1,
             xtype:'datecolumn',
             dataIndex: 'timestamp',
-            text: Ngcp.csc.locales.fax_spool.columns.timestamp[localStorage.getItem('languageSelected')],
+            text: Ngcp.csc.locales.faxspool.columns.timestamp[localStorage.getItem('languageSelected')],
             format: 'd.m.Y h:i:s'
         }
         , {
             flex: 1,
             dataIndex: 'status',
-            text: Ngcp.csc.locales.fax_spool.columns.status[localStorage.getItem('languageSelected')]
+            text: Ngcp.csc.locales.faxspool.columns.status[localStorage.getItem('languageSelected')]
         }, {
             flex: 1,
             dataIndex: 'duration',
@@ -45,7 +45,7 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpoolGrid', {
         }, {
             flex: 1,
             dataIndex: 'direction',
-            text: Ngcp.csc.locales.fax_spool.columns.direction[localStorage.getItem('languageSelected')]
+            text: Ngcp.csc.locales.faxspool.columns.direction[localStorage.getItem('languageSelected')]
         }, {
             flex: 1,
             dataIndex: 'caller',
@@ -53,11 +53,11 @@ Ext.define('NgcpCsc.view.pages.faxspool.FaxSpoolGrid', {
         }, {
             flex: 1,
             dataIndex: 'callee',
-            text: Ngcp.csc.locales.fax_spool.columns.callee[localStorage.getItem('languageSelected')]
+            text: Ngcp.csc.locales.faxspool.columns.callee[localStorage.getItem('languageSelected')]
         }, {
             flex: 1,
             dataIndex: 'pages',
-            text: Ngcp.csc.locales.fax_spool.columns.pages[localStorage.getItem('languageSelected')],
+            text: Ngcp.csc.locales.faxspool.columns.pages[localStorage.getItem('languageSelected')],
             align: 'right'
         }, {
             xtype: 'actioncolumn',
diff --git a/classic/src/view/pages/themeroller/ThemeRoller.js b/classic/src/view/pages/themeroller/ThemeRoller.js
index 17004e11..7c4ad4b3 100644
--- a/classic/src/view/pages/themeroller/ThemeRoller.js
+++ b/classic/src/view/pages/themeroller/ThemeRoller.js
@@ -99,11 +99,11 @@ Ext.define('NgcpCsc.view.pages.themeroller.ThemeRoller', {
                 },
                 items: [{
                     xtype: 'textfield',
-                    fieldLabel: Ngcp.csc.locales.themeroller.fontfamily[localStorage.getItem('languageSelected')],
+                    fieldLabel: Ngcp.csc.locales.themeroller.font_family[localStorage.getItem('languageSelected')],
                     bind: '{fontfamily}'
                 }, {
                     xtype: 'combo',
-                    fieldLabel: Ngcp.csc.locales.themeroller.fontweight[localStorage.getItem('languageSelected')],
+                    fieldLabel: Ngcp.csc.locales.themeroller.font_weight[localStorage.getItem('languageSelected')],
                     bind: '{fontweight}',
                     editable: false,
                     store: Ext.create('Ext.data.Store', {
@@ -121,7 +121,7 @@ Ext.define('NgcpCsc.view.pages.themeroller.ThemeRoller', {
                     minValue: 6,
                     editable: false,
                     bind: '{fontsize}',
-                    fieldLabel: Ngcp.csc.locales.themeroller.fontsize[localStorage.getItem('languageSelected')]
+                    fieldLabel: Ngcp.csc.locales.themeroller.font_size[localStorage.getItem('languageSelected')]
                 }, {
                     layout: 'hbox',
                     margin: '10 0 0 0',