diff --git a/integration-tests/__tests__/schema-tests.spec.js b/integration-tests/__tests__/schema-tests.spec.js
index 9e6c9bb86..71cc97992 100644
--- a/integration-tests/__tests__/schema-tests.spec.js
+++ b/integration-tests/__tests__/schema-tests.spec.js
@@ -63,7 +63,7 @@ describe('Schema tests', () => {
 
       const schemaConnDef = {
         ...extractConnection(engine),
-        database: `${conn._database_name}::myschema`,
+        database: `${conn.__database_name__}::myschema`,
       };
 
       const schemaConn = await driver.connect(schemaConnDef);
diff --git a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js
index 798e0309c..486891f86 100644
--- a/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-clickhouse/src/backend/Analyser.js
@@ -24,7 +24,7 @@ class Analyser extends DatabaseAnalyser {
 
   createQuery(resFileName, typeFields, replacements = {}) {
     let res = sql[resFileName];
-    res = res.replace('#DATABASE#', this.pool._database_name);
+    res = res.replace('#DATABASE#', this.pool.__database_name__);
     return super.createQuery(res, typeFields, replacements);
   }
 
@@ -83,7 +83,7 @@ class Analyser extends DatabaseAnalyser {
     const { pureName } = this.singleObjectFilter;
     const resId = await this.driver.query(
       this.pool,
-      `SELECT uuid as id FROM system.tables WHERE database = '${this.pool._database_name}' AND name='${pureName}'`
+      `SELECT uuid as id FROM system.tables WHERE database = '${this.pool.__database_name__}' AND name='${pureName}'`
     );
     this.singleObjectId = resId.rows[0]?.id;
   }
diff --git a/plugins/dbgate-plugin-clickhouse/src/backend/driver.js b/plugins/dbgate-plugin-clickhouse/src/backend/driver.js
index 266f33b41..f30acf928 100644
--- a/plugins/dbgate-plugin-clickhouse/src/backend/driver.js
+++ b/plugins/dbgate-plugin-clickhouse/src/backend/driver.js
@@ -19,7 +19,7 @@ const driver = {
       database,
     });
 
-    client._database_name = database;
+    client.__database_name__ = database;
     return client;
   },
   // called for retrieve data (eg. browse in data grid) and for update database
diff --git a/plugins/dbgate-plugin-mssql/src/backend/driver.js b/plugins/dbgate-plugin-mssql/src/backend/driver.js
index 3f54ea66d..42f6ef371 100644
--- a/plugins/dbgate-plugin-mssql/src/backend/driver.js
+++ b/plugins/dbgate-plugin-mssql/src/backend/driver.js
@@ -85,7 +85,7 @@ const driver = {
         : await tediousConnect(conn);
 
     if (result) {
-      result._database_name = conn.database;
+      result.__database_name__ = conn.database;
     }
 
     return result;
diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
index 118b55efc..4333272de 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js
@@ -68,7 +68,7 @@ class Analyser extends DatabaseAnalyser {
 
   createQuery(resFileName, typeFields, replacements = {}) {
     let res = sql[resFileName];
-    res = res.replace('#DATABASE#', this.pool._database_name);
+    res = res.replace('#DATABASE#', this.pool.__database_name__);
     return super.createQuery(res, typeFields, replacements);
   }
 
diff --git a/plugins/dbgate-plugin-mysql/src/backend/drivers.js b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
index fafb327b9..68f2be7d1 100644
--- a/plugins/dbgate-plugin-mysql/src/backend/drivers.js
+++ b/plugins/dbgate-plugin-mysql/src/backend/drivers.js
@@ -49,7 +49,7 @@ const drivers = driverBases.map(driverBase => ({
     };
 
     const connection = mysql2.createConnection(options);
-    connection._database_name = database;
+    connection.__database_name__ = database;
     if (isReadOnly) {
       await this.query(connection, 'SET SESSION TRANSACTION READ ONLY');
     }
diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
index b5904dd83..35f91e422 100644
--- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
+++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js
@@ -57,11 +57,11 @@ class Analyser extends DatabaseAnalyser {
 
   createQuery(resFileName, typeFields, replacements = {}) {
     const query = super.createQuery(sql[resFileName], typeFields, replacements);
-    // const dbname = this.pool._database_name;
-    // const schemaCondition = isCompositeDbName(dbname)
-    //   ? `= '${splitCompositeDbName(dbname).schema}' `
-    //   : ' IS NOT NULL   ';
-    const schemaCondition = ' IS NOT NULL   ';
+    const dbname = this.pool.__database_name__;
+    const schemaCondition = isCompositeDbName(dbname)
+      ? `= '${splitCompositeDbName(dbname).schema}' `
+      : ' IS NOT NULL   ';
+    // const schemaCondition = ' IS NOT NULL   ';
 
     return query?.replace(/=SCHEMA_NAME_CONDITION/g, schemaCondition);
   }