diff --git a/packages/tools/src/diffTools.ts b/packages/tools/src/diffTools.ts
index f32952031..0e9b213c6 100644
--- a/packages/tools/src/diffTools.ts
+++ b/packages/tools/src/diffTools.ts
@@ -1,16 +1,16 @@
 import { TableInfo } from 'dbgate-types';
 import uuidv1 from 'uuid/v1';
 
-export function generateTableGroupId(table: TableInfo): TableInfo {
+export function generateTablePairingId(table: TableInfo): TableInfo {
   if (!table) return table;
-  if (!table.groupId) {
+  if (!table.pairingId) {
     return {
       ...table,
       columns: table.columns.map(col => ({
         ...col,
-        groupid: uuidv1(),
+        pairingId: col.pairingId || uuidv1(),
       })),
-      groupId: uuidv1(),
+      pairingId: table.pairingId || uuidv1(),
     };
   }
   return table;
diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index 1640cd99d..f363e1956 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -9,7 +9,7 @@ export interface ColumnReference {
 }
 
 export interface ConstraintInfo extends NamedObjectInfo {
-  groupId?: string;
+  pairingId?: string;
   constraintName: string;
   constraintType: 'primaryKey' | 'foreignKey' | 'index' | 'check' | 'unique';
 }
@@ -39,7 +39,7 @@ export interface CheckInfo extends ConstraintInfo {
 }
 
 export interface ColumnInfo extends NamedObjectInfo {
-  groupId?: string;
+  pairingId?: string;
   columnName: string;
   notNull: boolean;
   autoIncrement: boolean;
@@ -55,7 +55,7 @@ export interface ColumnInfo extends NamedObjectInfo {
 }
 
 export interface DatabaseObjectInfo extends NamedObjectInfo {
-  groupId?: string;
+  pairingId?: string;
   objectId?: string;
   createDate?: string;
   modifyDate?: string;
diff --git a/packages/web/src/tableeditor/ColumnEditorModal.svelte b/packages/web/src/tableeditor/ColumnEditorModal.svelte
index 7df02a2a0..4fda864a4 100644
--- a/packages/web/src/tableeditor/ColumnEditorModal.svelte
+++ b/packages/web/src/tableeditor/ColumnEditorModal.svelte
@@ -37,12 +37,12 @@
           if (columnInfo) {
             setTableInfo(tbl => ({
               ...tbl,
-              columns: tbl.columns.map(col => (col.groupId == columnInfo.groupId ? e.detail : col)),
+              columns: tbl.columns.map(col => (col.pairingId == columnInfo.pairingId ? e.detail : col)),
             }));
           } else {
             setTableInfo(tbl => ({
               ...tbl,
-              columns: [...tbl.columns, { ...e.detail, groupId: uuidv1() }],
+              columns: [...tbl.columns, { ...e.detail, pairingId: uuidv1() }],
             }));
           }
           // onConfirm();
@@ -57,7 +57,7 @@
             closeCurrentModal();
             setTableInfo(tbl => ({
               ...tbl,
-              columns: tbl.columns.filter(col => col.groupId != columnInfo.groupId),
+              columns: tbl.columns.filter(col => col.pairingId != columnInfo.pairingId),
             }));
           }}
         />
diff --git a/packages/web/src/tabs/TableStructureTab.svelte b/packages/web/src/tabs/TableStructureTab.svelte
index a57ba4f95..d04ee7c28 100644
--- a/packages/web/src/tabs/TableStructureTab.svelte
+++ b/packages/web/src/tabs/TableStructureTab.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <script lang="ts">
-  import { generateTableGroupId } from 'dbgate-tools';
+  import { generateTablePairingId } from 'dbgate-tools';
 
   import _ from 'lodash';
 
@@ -27,11 +27,11 @@
   export let objectTypeField = 'tables';
 
   $: tableInfo = useDbCore({ conid, database, schemaName, pureName, objectTypeField });
-  $: tableInfoWithGroupId = $tableInfo ? generateTableGroupId($tableInfo) : null;
+  $: tableInfoWithPairingId = $tableInfo ? generateTablePairingId($tableInfo) : null;
 
   const { editorState, editorValue, setEditorData } = useEditorData({ tabid });
 
-  $: showTable = $editorValue || tableInfoWithGroupId;
+  $: showTable = $editorValue || tableInfoWithPairingId;
 
 </script>
 
@@ -41,7 +41,7 @@
     ? tableInfoUpdater =>
         setEditorData(tbl => {
           if (tbl) return tableInfoUpdater(tbl);
-          return tableInfoUpdater(tableInfoWithGroupId);
+          return tableInfoUpdater(tableInfoWithPairingId);
         })
     : null}
 />