diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.1.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.1.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.1.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.2.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.2.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.2.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.3.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.3.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.3.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.1.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.1.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.1.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.2.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.2.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.2.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.3.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.3.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.3.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.1.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.1.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.1.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.2.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.2.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.2.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.3.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.3.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.3.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.4.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.4.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.4.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.4.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.1.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.1.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.1.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.2.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.2.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.2.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.3.out b/regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.3.out
rename to regression-test/data/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.3.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/test_delete_sign_delete_bitmap.out b/regression-test/data/unique_with_mow_p0_cluster/test_delete_sign_delete_bitmap.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/test_delete_sign_delete_bitmap.out
rename to regression-test/data/unique_with_mow_p0_cluster/test_delete_sign_delete_bitmap.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/test_mow_with_null_sequence.out b/regression-test/data/unique_with_mow_p0_cluster/test_mow_with_null_sequence.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/test_mow_with_null_sequence.out
rename to regression-test/data/unique_with_mow_p0_cluster/test_mow_with_null_sequence.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/test_schema_change.out b/regression-test/data/unique_with_mow_p0_cluster/test_schema_change.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/test_schema_change.out
rename to regression-test/data/unique_with_mow_p0_cluster/test_schema_change.out
diff --git a/regression-test/data/unique_with_mow_p0_cluster_key/test_unique_mow_sequence.out b/regression-test/data/unique_with_mow_p0_cluster/test_unique_mow_sequence.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p0_cluster_key/test_unique_mow_sequence.out
rename to regression-test/data/unique_with_mow_p0_cluster/test_unique_mow_sequence.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.1.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.1.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.1.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.2.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.2.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.2.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.3.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.3.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.3.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.1.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.1.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.1.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.2.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.2.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.2.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.3.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.3.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.3.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.1.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.1.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.1.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.2.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.2.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.2.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.3.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.3.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.3.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.4.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.4.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.4.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.4.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.1.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.1.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.1.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.1.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.2.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.2.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.2.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.2.out
diff --git a/regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.3.out b/regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.3.out
similarity index 100%
rename from regression-test/data/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.3.out
rename to regression-test/data/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.3.out
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_sequence_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_sequence_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/date_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/date_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_sequence_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/part_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/part_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/four/load_four_step.groovy b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/four/load_four_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/four/load_four_step.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/four/load_four_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/one/load_one_step.groovy b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/one/load_one_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/one/load_one_step.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/one/load_one_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/three/load_three_step.groovy b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/three/load_three_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/three/load_three_step.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/three/load_three_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/two/load_two_step.groovy b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/two/load_two_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_load_zstd/two/load_two_step.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_load_zstd/two/load_two_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/customer_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/customer_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/customer_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/customer_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/date_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/date_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/date_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/date_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/lineorder_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/part_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/part_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/part_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/supplier_create.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/supplier_create.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/ddl/supplier_delete.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/ddl/supplier_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/load.groovy b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/load.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/load.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/load.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.1.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.1.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.1.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.2.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.2.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.2.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.3.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q1.3.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q1.3.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.1.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.1.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.1.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.2.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.2.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.2.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.3.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q2.3.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q2.3.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.1.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.1.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.1.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.2.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.2.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.2.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.3.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.3.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.3.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.4.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.4.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q3.4.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q3.4.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.1.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.1.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.1.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.2.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.2.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.2.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.3.sql b/regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/ssb_unique_sql_zstd/sql/q4.3.sql
rename to regression-test/suites/unique_with_mow_p0_cluster/ssb_unique_sql_zstd/sql/q4.3.sql
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_create_table.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_create_table.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_create_table.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_create_table.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_delete_sign_delete_bitmap.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_delete_sign_delete_bitmap.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_delete_sign_delete_bitmap.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_delete_sign_delete_bitmap.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_mow_with_null_sequence.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_mow_with_null_sequence.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_mow_with_null_sequence.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_mow_with_null_sequence.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_pk_uk_case.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_pk_uk_case.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_pk_uk_case.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_pk_uk_case.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_primary_key_simple_case.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_primary_key_simple_case.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_primary_key_simple_case.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_primary_key_simple_case.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_schema_change.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_schema_change.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_schema_change.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_schema_change.groovy
diff --git a/regression-test/suites/unique_with_mow_p0_cluster_key/test_unique_mow_sequence.groovy b/regression-test/suites/unique_with_mow_p0_cluster/test_unique_mow_sequence.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p0_cluster_key/test_unique_mow_sequence.groovy
rename to regression-test/suites/unique_with_mow_p0_cluster/test_unique_mow_sequence.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_sequence_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/customer_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_sequence_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/date_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/date_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/lineorder_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_sequence_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/part_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/part_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/ddl/supplier_sequence_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/four/load_four_step.groovy b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/four/load_four_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/four/load_four_step.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/four/load_four_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/one/load_one_step.groovy b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/one/load_one_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/one/load_one_step.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/one/load_one_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/three/load_three_step.groovy b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/three/load_three_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/three/load_three_step.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/three/load_three_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/two/load_two_step.groovy b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/two/load_two_step.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_load_zstd/two/load_two_step.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_load_zstd/two/load_two_step.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/customer_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/customer_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/customer_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/customer_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/customer_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/customer_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/customer_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/customer_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/date_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/date_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/date_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/date_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/date_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/date_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/date_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/date_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/lineorder_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/lineorder_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/lineorder_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/part_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/part_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/part_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/part_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/part_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/part_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/part_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/part_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/supplier_create.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/supplier_create.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/supplier_create.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/supplier_create.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/supplier_delete.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/supplier_delete.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/ddl/supplier_delete.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/ddl/supplier_delete.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/load.groovy b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/load.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/load.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/load.groovy
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.1.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.1.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.1.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.2.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.2.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.2.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.3.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q1.3.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q1.3.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.1.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.1.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.1.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.2.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.2.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.2.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.3.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q2.3.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q2.3.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.1.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.1.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.1.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.2.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.2.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.2.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.3.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.3.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.3.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.4.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.4.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q3.4.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q3.4.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.1.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.1.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.1.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.1.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.2.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.2.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.2.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.2.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.3.sql b/regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.3.sql
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/ssb_unique_sql_zstd/sql/q4.3.sql
rename to regression-test/suites/unique_with_mow_p2_cluster/ssb_unique_sql_zstd/sql/q4.3.sql
diff --git a/regression-test/suites/unique_with_mow_p2_cluster_key/test_pk_uk_case.groovy b/regression-test/suites/unique_with_mow_p2_cluster/test_pk_uk_case.groovy
similarity index 100%
rename from regression-test/suites/unique_with_mow_p2_cluster_key/test_pk_uk_case.groovy
rename to regression-test/suites/unique_with_mow_p2_cluster/test_pk_uk_case.groovy