diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
index 7a8c99a6d..ec4411e09 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
@@ -45,20 +45,20 @@ class Analyser extends DatabaseAnalyser {
     if (this.singleObjectFilter) {
       const { typeField, pureName } = this.singleObjectFilter;
       if (!typeFields || !typeFields.includes(typeField)) return null;
-      res = res.replace('=[OBJECT_NAME_CONDITION]', ` = '${pureName}'`).replace('#DATABASE#', this.pool._database_name);
+      res = res.replace('=[OBJECT_ID_CONDITION]', ` = '${pureName}'`).replace('#DATABASE#', this.pool._database_name);
       return res;
     }
     if (!this.modifications || !typeFields || this.modifications.length == 0) {
-      res = res.replace('=[OBJECT_NAME_CONDITION]', ' is not null');
+      res = res.replace('=[OBJECT_ID_CONDITION]', ' is not null');
     } else {
       const filterNames = this.modifications
         .filter(x => typeFields.includes(x.objectTypeField) && (x.action == 'add' || x.action == 'change'))
         .map(x => x.newName && x.newName.pureName)
         .filter(Boolean);
       if (filterNames.length == 0) {
-        res = res.replace('=[OBJECT_NAME_CONDITION]', ' IS NULL');
+        res = res.replace('=[OBJECT_ID_CONDITION]', ' IS NULL');
       } else {
-        res = res.replace('=[OBJECT_NAME_CONDITION]', ` in (${filterNames.map(x => `'${x}'`).join(',')})`);
+        res = res.replace('=[OBJECT_ID_CONDITION]', ` in (${filterNames.map(x => `'${x}'`).join(',')})`);
       }
     }
     res = res.replace('#DATABASE#', this.pool._database_name);
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/columns.js b/plugins/dbgate-plugin-mysql/src/backend/sql/columns.js
index 0adb27e2b..9650dde5f 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/columns.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/columns.js
@@ -10,6 +10,6 @@ select
 	COLUMN_DEFAULT as defaultValue,
 	EXTRA as extra
 from INFORMATION_SCHEMA.COLUMNS
-where TABLE_SCHEMA = '#DATABASE#' and TABLE_NAME =[OBJECT_NAME_CONDITION]
+where TABLE_SCHEMA = '#DATABASE#' and TABLE_NAME =[OBJECT_ID_CONDITION]
 order by ORDINAL_POSITION
 `;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/foreignKeys.js b/plugins/dbgate-plugin-mysql/src/backend/sql/foreignKeys.js
index 5b43b4031..5e5625c1c 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/foreignKeys.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/foreignKeys.js
@@ -12,6 +12,6 @@ inner join INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 	on REFERENTIAL_CONSTRAINTS.TABLE_NAME = KEY_COLUMN_USAGE.TABLE_NAME 
 	and REFERENTIAL_CONSTRAINTS.CONSTRAINT_NAME = KEY_COLUMN_USAGE.CONSTRAINT_NAME
 	and REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA = KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA
-where REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA = '#DATABASE#' and REFERENTIAL_CONSTRAINTS.TABLE_NAME =[OBJECT_NAME_CONDITION]
+where REFERENTIAL_CONSTRAINTS.CONSTRAINT_SCHEMA = '#DATABASE#' and REFERENTIAL_CONSTRAINTS.TABLE_NAME =[OBJECT_ID_CONDITION]
 order by KEY_COLUMN_USAGE.ORDINAL_POSITION
 `;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/primaryKeys.js b/plugins/dbgate-plugin-mysql/src/backend/sql/primaryKeys.js
index 2b1b346e8..ba1e4525d 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/primaryKeys.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/primaryKeys.js
@@ -7,6 +7,6 @@ inner join INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 	on TABLE_CONSTRAINTS.TABLE_NAME = KEY_COLUMN_USAGE.TABLE_NAME 
 		and TABLE_CONSTRAINTS.CONSTRAINT_NAME = KEY_COLUMN_USAGE.CONSTRAINT_NAME
 		and TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA = KEY_COLUMN_USAGE.CONSTRAINT_SCHEMA
-where TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA = '#DATABASE#' and TABLE_CONSTRAINTS.TABLE_NAME =[OBJECT_NAME_CONDITION] AND TABLE_CONSTRAINTS.CONSTRAINT_TYPE = 'PRIMARY KEY'
+where TABLE_CONSTRAINTS.CONSTRAINT_SCHEMA = '#DATABASE#' and TABLE_CONSTRAINTS.TABLE_NAME =[OBJECT_ID_CONDITION] AND TABLE_CONSTRAINTS.CONSTRAINT_TYPE = 'PRIMARY KEY'
 order by KEY_COLUMN_USAGE.ORDINAL_POSITION
 `;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js b/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
index dd1b36021..541c690bc 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/programmables.js
@@ -5,5 +5,5 @@ select
     COALESCE(LAST_ALTERED, CREATED) as modifyDate,
     ROUTINE_DEFINITION as createSql
 from information_schema.routines
-where ROUTINE_SCHEMA = '#DATABASE#' and ROUTINE_NAME =[OBJECT_NAME_CONDITION]
+where ROUTINE_SCHEMA = '#DATABASE#' and ROUTINE_NAME =[OBJECT_ID_CONDITION]
 `;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/tables.js b/plugins/dbgate-plugin-mysql/src/backend/sql/tables.js
index eed928431..d060d86da 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/tables.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/tables.js
@@ -3,5 +3,5 @@ select
 	TABLE_NAME as pureName, 
 	case when ENGINE='InnoDB' then CREATE_TIME else coalesce(UPDATE_TIME, CREATE_TIME) end as modifyDate 
 from information_schema.tables 
-where TABLE_SCHEMA = '#DATABASE#' and TABLE_TYPE='BASE TABLE' and TABLE_NAME =[OBJECT_NAME_CONDITION];
+where TABLE_SCHEMA = '#DATABASE#' and TABLE_TYPE='BASE TABLE' and TABLE_NAME =[OBJECT_ID_CONDITION];
 `;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/views.js b/plugins/dbgate-plugin-mysql/src/backend/sql/views.js
index ea4d8ef35..d4f123931 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/sql/views.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/sql/views.js
@@ -3,5 +3,5 @@ select
 	TABLE_NAME as pureName, 
     coalesce(UPDATE_TIME, CREATE_TIME) as modifyDate
 from information_schema.tables 
-where TABLE_SCHEMA = '#DATABASE#' and TABLE_NAME =[OBJECT_NAME_CONDITION] and TABLE_TYPE = 'VIEW';
+where TABLE_SCHEMA = '#DATABASE#' and TABLE_NAME =[OBJECT_ID_CONDITION] and TABLE_TYPE = 'VIEW';
 `;