diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
index 3522f6e1b6944..b90fc56d0de78 100644
--- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal/index.tsx
@@ -928,8 +928,8 @@ const DatabaseModal: FunctionComponent<DatabaseModalProps> = ({
           ?.sort((a: DatabaseForm, b: DatabaseForm) =>
             a.name.localeCompare(b.name),
           )
-          .map((database: DatabaseForm) => (
-            <AntdSelect.Option value={database.name} key={database.name}>
+          .map((database: DatabaseForm, index: number) => (
+            <AntdSelect.Option value={database.name} key={`database-${index}`}>
               {database.name}
             </AntdSelect.Option>
           ))}
diff --git a/superset/db_engine_specs/clickhouse.py b/superset/db_engine_specs/clickhouse.py
index e4af52d22702d..8de1cef3bcdd5 100644
--- a/superset/db_engine_specs/clickhouse.py
+++ b/superset/db_engine_specs/clickhouse.py
@@ -246,7 +246,7 @@ class ClickHouseConnectEngineSpec(ClickHouseEngineSpec, BasicParametersMixin):
     """Engine spec for clickhouse-connect connector"""
 
     engine = "clickhousedb"
-    engine_name = "ClickHouse Connect"
+    engine_name = "ClickHouse Connect (Superset)"
 
     default_driver = "connect"
     _function_names: List[str] = []