diff --git a/install/sql/alter_tables/1.9.20/mysql/DB.1.9.20/step1/db_schema_update.sql b/install/sql/alter_tables/1.9.20/mysql/DB.1.9.20/step1/db_schema_update.sql
index d66a253c2b..8a8c37d012 100644
--- a/install/sql/alter_tables/1.9.20/mysql/DB.1.9.20/step1/db_schema_update.sql
+++ b/install/sql/alter_tables/1.9.20/mysql/DB.1.9.20/step1/db_schema_update.sql
@@ -67,7 +67,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_context (
   end_exec_ts timestamp NOT NULL,
   creation_ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (id),
-  UNIQUE KEY udx1 (testplan_id,platform_id,creation_ts)
+  UNIQUE KEY /*prefix*/udx1_baseline_l1l2_context (testplan_id,platform_id,creation_ts)
 ) DEFAULT CHARSET=utf8;
 
 
@@ -80,7 +80,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_details (
   qty int(10) unsigned NOT NULL DEFAULT '0',
   total_tc int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  UNIQUE KEY udx1 (context_id,top_tsuite_id,child_tsuite_id,status)
+  UNIQUE KEY /*prefix*/udx1_baseline_l1l2_details (context_id,top_tsuite_id,child_tsuite_id,status)
 ) DEFAULT CHARSET=utf8;
 
 #
diff --git a/install/sql/alter_tables/1.9.20/postgres/DB.1.9.20/step1/db_schema_update.sql b/install/sql/alter_tables/1.9.20/postgres/DB.1.9.20/step1/db_schema_update.sql
index 3269465c15..e14e398392 100644
--- a/install/sql/alter_tables/1.9.20/postgres/DB.1.9.20/step1/db_schema_update.sql
+++ b/install/sql/alter_tables/1.9.20/postgres/DB.1.9.20/step1/db_schema_update.sql
@@ -42,7 +42,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_context (
   "creation_ts" timestamp NOT NULL DEFAULT now(),
   PRIMARY KEY ("id")
 );
-CREATE UNIQUE INDEX /*prefix*/udx1 ON /*prefix*/baseline_l1l2_context ("testplan_id","platform_id","creation_ts");
+CREATE UNIQUE INDEX /*prefix*/baseline_l1l2_context_uidx1 ON /*prefix*/baseline_l1l2_context ("testplan_id","platform_id","creation_ts");
 
 
 CREATE TABLE /*prefix*/baseline_l1l2_details (
@@ -55,7 +55,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_details (
   "total_tc" INT NOT NULL DEFAULT '0',
   PRIMARY KEY ("id")
 ) ;
-CREATE UNIQUE INDEX /*prefix*/udx1 
+CREATE UNIQUE INDEX /*prefix*/baseline_l1l2_details_uidx1
 ON /*prefix*/baseline_l1l2_details ("context_id","top_tsuite_id","child_tsuite_id","status");
 
 
@@ -125,4 +125,4 @@ TO_CHAR(E.execution_ts, 'HH24') AS hour,
 E.* FROM /*prefix*/executions E
 JOIN /*prefix*/testplans TPL on TPL.id=E.testplan_id
 JOIN /*prefix*/nodes_hierarchy NHTPL on NHTPL.id = TPL.id);
--- END
\ No newline at end of file
+-- END
diff --git a/install/sql/mysql/testlink_create_tables.sql b/install/sql/mysql/testlink_create_tables.sql
index 949fe27af8..f152c73b35 100644
--- a/install/sql/mysql/testlink_create_tables.sql
+++ b/install/sql/mysql/testlink_create_tables.sql
@@ -806,7 +806,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_context (
   end_exec_ts timestamp NOT NULL,
   creation_ts timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
   PRIMARY KEY (id),
-  UNIQUE KEY udx1 (testplan_id,platform_id,creation_ts)
+  UNIQUE KEY /*prefix*/udx1_baseline_l1l2_context (testplan_id,platform_id,creation_ts)
 ) DEFAULT CHARSET=utf8;
 
 
@@ -819,7 +819,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_details (
   qty int(10) unsigned NOT NULL DEFAULT '0',
   total_tc int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
-  UNIQUE KEY udx1 (context_id,top_tsuite_id,child_tsuite_id,status)
+  UNIQUE KEY /*prefix*/udx1_baseline_l1l2_details (context_id,top_tsuite_id,child_tsuite_id,status)
 ) DEFAULT CHARSET=utf8;
 
 
@@ -959,4 +959,3 @@ DATE_FORMAT(E.execution_ts, '%k') AS hour,
 E.* FROM /*prefix*/executions E
 JOIN /*prefix*/testplans TPL on TPL.id=E.testplan_id
 JOIN /*prefix*/nodes_hierarchy NHTPL on NHTPL.id = TPL.id);
-
diff --git a/install/sql/postgres/testlink_create_tables.sql b/install/sql/postgres/testlink_create_tables.sql
index 309f54b5fc..039b78772a 100644
--- a/install/sql/postgres/testlink_create_tables.sql
+++ b/install/sql/postgres/testlink_create_tables.sql
@@ -925,7 +925,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_context (
   "creation_ts" timestamp NOT NULL DEFAULT now(),
   PRIMARY KEY ("id")
 );
-CREATE UNIQUE INDEX /*prefix*/udx1 ON /*prefix*/baseline_l1l2_context ("testplan_id","platform_id","creation_ts");
+CREATE UNIQUE INDEX /*prefix*/baseline_l1l2_context_uidx1 ON /*prefix*/baseline_l1l2_context ("testplan_id","platform_id","creation_ts");
 
 
 CREATE TABLE /*prefix*/baseline_l1l2_details (
@@ -938,7 +938,7 @@ CREATE TABLE /*prefix*/baseline_l1l2_details (
   "total_tc" INT unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY ("id")
 ) ;
-CREATE UNIQUE INDEX /*prefix*/udx1 
+CREATE UNIQUE INDEX /*prefix*/baseline_l1l2_details_uidx1
 ON /*prefix*/baseline_l1l2_details ("context_id","top_tsuite_id","child_tsuite_id","status");
 
 
@@ -1121,4 +1121,3 @@ TO_CHAR(E.execution_ts, 'HH24') AS hour,
 E.* FROM /*prefix*/executions E
 JOIN /*prefix*/testplans TPL on TPL.id=E.testplan_id
 JOIN /*prefix*/nodes_hierarchy NHTPL on NHTPL.id = TPL.id);
-