diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte
index 7d9ffc07f..487880df7 100644
--- a/packages/web/src/App.svelte
+++ b/packages/web/src/App.svelte
@@ -100,7 +100,7 @@
             defaultMessage: `Loading plugin {plugin} ...`,
             values: { plugin: $loadingPluginStore.loadingPackageName },
           })
-        : _t('app.preparing_pluguns', { defaultMessage: 'Preparing plugins ...' })}
+        : _t('app.preparingPlugins', { defaultMessage: 'Preparing plugins ...' })}
     />
   {/if}
 {:else}
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 796f3a3d1..80ed66b7e 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -28,7 +28,7 @@
   registerCommand({
     id: 'dataGrid.revertRowChanges',
     category: 'Data grid',
-    name: _t('command.datagrid.revert_row_changes', { defaultMessage: 'Revert row changes' }),
+    name: _t('command.datagrid.revertRowChanges', { defaultMessage: 'Revert row changes' }),
     keyText: 'CtrlOrCommand+U',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.containsChanges,
     onClick: () => getCurrentDataGrid().revertRowChanges(),
@@ -37,8 +37,8 @@
   registerCommand({
     id: 'dataGrid.revertAllChanges',
     category: 'Data grid',
-    name: _t('command.datagrid.revert_all_changes', { defaultMessage: 'Revert all changes' }),
-    toolbarName: _t('command.datagrid.revert_all_changes.toolbar', { defaultMessage: 'Revert all' }),
+    name: _t('command.datagrid.revertAllChanges', { defaultMessage: 'Revert all changes' }),
+    toolbarName: _t('command.datagrid.revertAllChanges.toolbar', { defaultMessage: 'Revert all' }),
     icon: 'icon undo',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.containsChanges,
     onClick: () => getCurrentDataGrid().revertAllChanges(),
@@ -47,8 +47,8 @@
   registerCommand({
     id: 'dataGrid.deleteSelectedRows',
     category: 'Data grid',
-    name: _t('command.datagrid.delete_selected_rows', { defaultMessage: 'Delete selected rows' }),
-    toolbarName: _t('command.datagrid.delete_selected_rows.toolbar', { defaultMessage: 'Delete row(s)' }),
+    name: _t('command.datagrid.deleteSelectedRows', { defaultMessage: 'Delete selected rows' }),
+    toolbarName: _t('command.datagrid.deleteSelectedRows.toolbar', { defaultMessage: 'Delete row(s)' }),
     keyText: isMac() ? 'Command+Backspace' : 'CtrlOrCommand+Delete',
     icon: 'icon minus',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
@@ -58,8 +58,8 @@
   registerCommand({
     id: 'dataGrid.insertNewRow',
     category: 'Data grid',
-    name: _t('command.datagrid.insert_new_row', { defaultMessage: 'Insert new row' }),
-    toolbarName: _t('command.datagrid.insert_new_row.toolbar', { defaultMessage: 'New row' }),
+    name: _t('command.datagrid.insertNewRow', { defaultMessage: 'Insert new row' }),
+    toolbarName: _t('command.datagrid.insertNewRow.toolbar', { defaultMessage: 'New row' }),
     icon: 'icon add',
     keyText: isMac() ? 'Command+I' : 'Insert',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
@@ -69,8 +69,8 @@
   registerCommand({
     id: 'dataGrid.addNewColumn',
     category: 'Data grid',
-    name: _t('command.datagrid.add_new_column', { defaultMessage: 'Add new column' }),
-    toolbarName: _t('command.datagrid.add_new_column.toolbar', { defaultMessage: 'New column' }),
+    name: _t('command.datagrid.addNewColumn', { defaultMessage: 'Add new column' }),
+    toolbarName: _t('command.datagrid.addNewColumn.toolbar', { defaultMessage: 'New column' }),
     icon: 'icon add-column',
     testEnabled: () => getCurrentDataGrid()?.addNewColumnEnabled(),
     onClick: () => getCurrentDataGrid().addNewColumn(),
@@ -79,8 +79,8 @@
   registerCommand({
     id: 'dataGrid.cloneRows',
     category: 'Data grid',
-    name: _t('command.datagrid.clone_rows', { defaultMessage: 'Clone rows' }),
-    toolbarName: _t('command.datagrid.clone_rows.toolbar', { defaultMessage: 'Clone row(s)' }),
+    name: _t('command.datagrid.cloneRows', { defaultMessage: 'Clone rows' }),
+    toolbarName: _t('command.datagrid.cloneRows.toolbar', { defaultMessage: 'Clone row(s)' }),
     keyText: 'CtrlOrCommand+Shift+C',
     testEnabled: () => getCurrentDataGrid()?.getGrider()?.editable,
     onClick: () => getCurrentDataGrid().cloneRows(),
@@ -89,7 +89,7 @@
   registerCommand({
     id: 'dataGrid.setNull',
     category: 'Data grid',
-    name: _t('command.datagrid.set_null', { defaultMessage: 'Set NULL' }),
+    name: _t('command.datagrid.setNull', { defaultMessage: 'Set NULL' }),
     keyText: 'CtrlOrCommand+0',
     testEnabled: () =>
       getCurrentDataGrid()?.getGrider()?.editable && !getCurrentDataGrid()?.getEditorTypes()?.supportFieldRemoval,
@@ -99,7 +99,7 @@
   registerCommand({
     id: 'dataGrid.removeField',
     category: 'Data grid',
-    name: _t('command.datagrid.remove_field', { defaultMessage: 'Remove field' }),
+    name: _t('command.datagrid.removeField', { defaultMessage: 'Remove field' }),
     keyText: 'CtrlOrCommand+0',
     testEnabled: () =>
       getCurrentDataGrid()?.getGrider()?.editable && getCurrentDataGrid()?.getEditorTypes()?.supportFieldRemoval,
@@ -141,7 +141,7 @@
   registerCommand({
     id: 'dataGrid.copyToClipboard',
     category: 'Data grid',
-    name: _t('command.datagrid.copy_to_clipboard', { defaultMessage: 'Copy to clipboard' }),
+    name: _t('command.datagrid.copyToClipboard', { defaultMessage: 'Copy to clipboard' }),
     keyText: 'CtrlOrCommand+C',
     disableHandleKeyText: 'CtrlOrCommand+C',
     testEnabled: () => getCurrentDataGrid() != null,
@@ -152,7 +152,7 @@
     id: 'dataGrid.editJsonDocument',
     category: 'Data grid',
     keyText: 'CtrlOrCommand+J',
-    name: _t('command.datagrid.edit_json_document', { defaultMessage: 'Edit row as JSON document' }),
+    name: _t('command.datagrid.editJsonDocument', { defaultMessage: 'Edit row as JSON document' }),
     testEnabled: () => getCurrentDataGrid()?.editJsonEnabled(),
     onClick: () => getCurrentDataGrid().editJsonDocument(),
   });
@@ -160,7 +160,7 @@
   registerCommand({
     id: 'dataGrid.openSelectionInMap',
     category: 'Data grid',
-    name: _t('command.datagrid.open_selection_in_map', { defaultMessage: 'Open selection in map' }),
+    name: _t('command.datagrid.openSelectionInMap', { defaultMessage: 'Open selection in map' }),
     testEnabled: () => getCurrentDataGrid() != null,
     onClick: () => getCurrentDataGrid().openSelectionInMap(),
   });
@@ -168,7 +168,7 @@
   registerCommand({
     id: 'dataGrid.viewJsonDocument',
     category: 'Data grid',
-    name: _t('command.datagrid.view_json_document', { defaultMessage: 'View row as JSON document' }),
+    name: _t('command.datagrid.viewJsonDocument', { defaultMessage: 'View row as JSON document' }),
     testEnabled: () => getCurrentDataGrid()?.viewJsonDocumentEnabled(),
     onClick: () => getCurrentDataGrid().viewJsonDocument(),
   });
@@ -176,7 +176,7 @@
   registerCommand({
     id: 'dataGrid.viewJsonValue',
     category: 'Data grid',
-    name: _t('command.datagrid.view_json_value', { defaultMessage: 'View cell as JSON document' }),
+    name: _t('command.datagrid.viewJsonValue', { defaultMessage: 'View cell as JSON document' }),
     testEnabled: () => getCurrentDataGrid()?.viewJsonValueEnabled(),
     onClick: () => getCurrentDataGrid().viewJsonValue(),
   });
@@ -184,7 +184,7 @@
   registerCommand({
     id: 'dataGrid.openJsonArrayInSheet',
     category: 'Data grid',
-    name: _t('command.datagrid.open_json_array_in_sheet', { defaultMessage: 'Open array as table' }),
+    name: _t('command.datagrid.openJsonArrayInSheet', { defaultMessage: 'Open array as table' }),
     testEnabled: () => getCurrentDataGrid()?.openJsonArrayInSheetEnabled(),
     onClick: () => getCurrentDataGrid().openJsonArrayInSheet(),
   });
@@ -192,7 +192,7 @@
   registerCommand({
     id: 'dataGrid.saveCellToFile',
     category: 'Data grid',
-    name: _t('command.datagrid.save_cell_to_file', { defaultMessage: 'Save cell to file' }),
+    name: _t('command.datagrid.saveCellToFile', { defaultMessage: 'Save cell to file' }),
     testEnabled: () => getCurrentDataGrid()?.saveCellToFileEnabled(),
     onClick: () => getCurrentDataGrid().saveCellToFile(),
   });
@@ -200,7 +200,7 @@
   registerCommand({
     id: 'dataGrid.loadCellFromFile',
     category: 'Data grid',
-    name: _t('command.datagrid.load_cell_from_file', { defaultMessage: 'Load cell from file' }),
+    name: _t('command.datagrid.loadCellFromFile', { defaultMessage: 'Load cell from file' }),
     testEnabled: () => getCurrentDataGrid()?.loadCellFromFileEnabled(),
     onClick: () => getCurrentDataGrid().loadCellFromFile(),
   });
diff --git a/packages/web/src/impexp/SourceTargetConfig.svelte b/packages/web/src/impexp/SourceTargetConfig.svelte
index 5418aedfd..2fa607d7f 100644
--- a/packages/web/src/impexp/SourceTargetConfig.svelte
+++ b/packages/web/src/impexp/SourceTargetConfig.svelte
@@ -141,7 +141,7 @@
         schemaName={schemaNameField}
         databaseName={databaseNameField}
         name={tablesField}
-        label={_t('source.tables_views_collections', { defaultMessage: 'Tables / views / collections' })}
+        label={_t('importExport.tablesViewsCollections', { defaultMessage: 'Tables / views / collections' })}
       />
     {/if}
   {/if}
@@ -166,7 +166,7 @@
 
   {#if storageType == 'archive' && direction == 'source'}
     <FormArchiveFilesSelect
-      label={_t('source.source_files', { defaultMessage: 'Source files' })}
+      label={_t('importExport.sourceFiles', { defaultMessage: 'Source files' })}
       folderName={$values[archiveFolderField]}
       name={tablesField}
     />
diff --git a/packages/web/src/widgets/DatabaseWidget.svelte b/packages/web/src/widgets/DatabaseWidget.svelte
index 166a7a169..7a295761e 100644
--- a/packages/web/src/widgets/DatabaseWidget.svelte
+++ b/packages/web/src/widgets/DatabaseWidget.svelte
@@ -62,7 +62,7 @@
   <WidgetColumnBarItem
     title={driver?.databaseEngineTypes?.includes('document')
       ? (driver?.collectionPluralLabel ?? 'Collections/containers')
-      : _t('widget.tables_views_functions', { defaultMessage: 'Tables, views, functions' })}
+      : _t('widget.tablesViewsFunctions', { defaultMessage: 'Tables, views, functions' })}
     name="dbObjects"
     storageName="dbObjectsWidget"
     skip={!(
@@ -84,7 +84,7 @@
   </WidgetColumnBarItem>
 
   <WidgetColumnBarItem
-    title={_t('widget.database_content', { defaultMessage: 'Database content' })}
+    title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
     name="dbObjects"
     storageName="dbObjectsWidget"
     skip={conid && (database || singleDatabase)}
@@ -97,7 +97,7 @@
   </WidgetColumnBarItem>
 
   <WidgetColumnBarItem
-    title={_t('widget.database_content', { defaultMessage: 'Database content' })}
+    title={_t('widget.databaseContent', { defaultMessage: 'Database content' })}
     name="dbObjects"
     storageName="dbObjectsWidget"
     skip={!(conid && (database || singleDatabase) && !driver)}
@@ -106,7 +106,7 @@
       <FocusedConnectionInfoWidget {conid} {database} connection={$connection} />
 
       <ErrorInfo
-        message={_t('error.driver_not_found', { defaultMessage: 'Invalid database connection, driver not found' })}
+        message={_t('error.driverNotFound', { defaultMessage: 'Invalid database connection, driver not found' })}
       />
     </WidgetsInnerContainer>
   </WidgetColumnBarItem>
diff --git a/packages/web/src/widgets/SchemaSelector.svelte b/packages/web/src/widgets/SchemaSelector.svelte
index ec684b692..678ccf9cd 100644
--- a/packages/web/src/widgets/SchemaSelector.svelte
+++ b/packages/web/src/widgets/SchemaSelector.svelte
@@ -59,9 +59,9 @@
 
   function handleCreateSchema() {
     showModal(InputTextModal, {
-      header: _t('schema.create_schema', { defaultMessage: 'Create schema' }),
+      header: _t('schema.createSchema', { defaultMessage: 'Create schema' }),
       value: 'newschema',
-      label: _t('schema.schema_name', { defaultMessage: 'Schema name' }),
+      label: _t('schema.schemaName', { defaultMessage: 'Schema name' }),
       onConfirm: async name => {
         const dbid = { conid, database };
         await runOperationOnDatabase(
@@ -142,7 +142,7 @@
           selectedSchema = null;
           localStorage.removeItem(valueStorageKey);
         }}
-        title={_t('schema.reset_to_default', { defaultMessage: 'Reset to default' })}
+        title={_t('schema.resetToDefault', { defaultMessage: 'Reset to default' })}
       >
         <FontIcon icon="icon close" />
       </InlineButton>
diff --git a/translations/en.json b/translations/en.json
index aea019c5f..e7e65e679 100644
--- a/translations/en.json
+++ b/translations/en.json
@@ -1,30 +1,30 @@
 {
-  "app.preparing_pluguns": "Preparing plugins ...",
+  "app.preparingPlugins": "Preparing plugins ...",
   "app.starting": "Starting DbGate",
-  "command.datagrid.add_new_column": "Add new column",
-  "command.datagrid.add_new_column.toolbar": "New column",
-  "command.datagrid.clone_rows": "Clone rows",
-  "command.datagrid.clone_rows.toolbar": "Clone row(s)",
-  "command.datagrid.copy_to_clipboard": "Copy to clipboard",
-  "command.datagrid.delete_selected_rows": "Delete selected rows",
-  "command.datagrid.delete_selected_rows.toolbar": "Delete row(s)",
-  "command.datagrid.edit_json_document": "Edit row as JSON document",
-  "command.datagrid.insert_new_row": "Insert new row",
-  "command.datagrid.insert_new_row.toolbar": "New row",
-  "command.datagrid.load_cell_from_file": "Load cell from file",
-  "command.datagrid.open_json_array_in_sheet": "Open array as table",
-  "command.datagrid.open_selection_in_map": "Open selection in map",
+  "command.datagrid.addNewColumn": "Add new column",
+  "command.datagrid.addNewColumn.toolbar": "New column",
+  "command.datagrid.cloneRows": "Clone rows",
+  "command.datagrid.cloneRows.toolbar": "Clone row(s)",
+  "command.datagrid.copyToClipboard": "Copy to clipboard",
+  "command.datagrid.deleteSelectedRows": "Delete selected rows",
+  "command.datagrid.deleteSelectedRows.toolbar": "Delete row(s)",
+  "command.datagrid.editJsonDocument": "Edit row as JSON document",
+  "command.datagrid.insertNewRow": "Insert new row",
+  "command.datagrid.insertNewRow.toolbar": "New row",
+  "command.datagrid.loadCellFromFile": "Load cell from file",
+  "command.datagrid.openJsonArrayInSheet": "Open array as table",
+  "command.datagrid.openSelectionInMap": "Open selection in map",
   "command.datagrid.reconnect": "Reconnect",
   "command.datagrid.redo": "Redo",
-  "command.datagrid.remove_field": "Remove field",
-  "command.datagrid.revert_all_changes": "Revert all changes",
-  "command.datagrid.revert_all_changes.toolbar": "Revert all",
-  "command.datagrid.revert_row_changes": "Revert row changes",
-  "command.datagrid.save_cell_to_file": "Save cell to file",
-  "command.datagrid.set_null": "Set NULL",
+  "command.datagrid.removeField": "Remove field",
+  "command.datagrid.revertAllChanges": "Revert all changes",
+  "command.datagrid.revertAllChanges.toolbar": "Revert all",
+  "command.datagrid.revertRowChanges": "Revert row changes",
+  "command.datagrid.saveCellToFile": "Save cell to file",
+  "command.datagrid.setNull": "Set NULL",
   "command.datagrid.undo": "Undo",
-  "command.datagrid.view_json_document": "View row as JSON document",
-  "command.datagrid.view_json_value": "View cell as JSON document",
+  "command.datagrid.viewJsonDocument": "View row as JSON document",
+  "command.datagrid.viewJsonValue": "View cell as JSON document",
   "command.tabs.addToFavorites": "Add current tab to favorites",
   "command.tabs.closeAll": "Close all tabs",
   "command.tabs.closeTab": "Close tab",
@@ -40,19 +40,19 @@
   "common.refresh": "Refresh",
   "common.save": "Save",
   "common.schema": "Schema",
-  "error.driver_not_found": "Invalid database connection, driver not found",
+  "error.driverNotFound": "Invalid database connection, driver not found",
+  "importExport.sourceFiles": "Source files",
+  "importExport.tablesViewsCollections": "Tables / views / collections",
   "schema.add": "Add new schema",
-  "schema.create_schema": "Create schema",
+  "schema.createSchema": "Create schema",
   "schema.delete": "Delete schema",
-  "schema.reset_to_default": "Reset to default",
-  "schema.schema_name": "Schema name",
+  "schema.resetToDefault": "Reset to default",
+  "schema.schemaName": "Schema name",
   "settings.localization": "Localization",
-  "source.source_files": "Source files",
-  "source.tables_views_collections": "Tables / views / collections",
   "tab.administration": "Administration",
-  "widget.database_content": "Database content",
+  "widget.databaseContent": "Database content",
   "widget.databases": "Databases",
   "widget.keys": "Keys",
   "widget.pinned": "Pinned",
-  "widget.tables_views_functions": "Tables, views, functions"
+  "widget.tablesViewsFunctions": "Tables, views, functions"
 }
\ No newline at end of file