diff --git a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
index 88f76fad1be1..c80eadc2b53b 100644
--- a/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
+++ b/core/trino-main/src/main/java/io/trino/SystemSessionProperties.java
@@ -200,7 +200,7 @@ public SystemSessionProperties(
                 integerProperty(
                         HASH_PARTITION_COUNT,
                         "Number of partitions for distributed joins and aggregations",
-                        queryManagerConfig.getInitialHashPartitions(),
+                        queryManagerConfig.getHashPartitionCount(),
                         false),
                 booleanProperty(
                         GROUPED_EXECUTION,
diff --git a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
index f56dbe86fe61..70320021dd43 100644
--- a/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
+++ b/core/trino-main/src/main/java/io/trino/execution/QueryManagerConfig.java
@@ -51,7 +51,7 @@ public class QueryManagerConfig
     private int maxConcurrentQueries = 1000;
     private int maxQueuedQueries = 5000;
 
-    private int initialHashPartitions = 100;
+    private int hashPartitionCount = 100;
     private Duration minQueryExpireAge = new Duration(15, TimeUnit.MINUTES);
     private int maxQueryHistory = 100;
     private int maxQueryLength = 1_000_000;
@@ -144,15 +144,17 @@ public QueryManagerConfig setMaxQueuedQueries(int maxQueuedQueries)
     }
 
     @Min(1)
-    public int getInitialHashPartitions()
+    public int getHashPartitionCount()
     {
-        return initialHashPartitions;
+        return hashPartitionCount;
     }
 
-    @Config("query.initial-hash-partitions")
-    public QueryManagerConfig setInitialHashPartitions(int initialHashPartitions)
+    @Config("query.hash-partition-count")
+    @LegacyConfig("query.initial-hash-partitions")
+    @ConfigDescription("Number of partitions for distributed joins and aggregations")
+    public QueryManagerConfig setHashPartitionCount(int hashPartitionCount)
     {
-        this.initialHashPartitions = initialHashPartitions;
+        this.hashPartitionCount = hashPartitionCount;
         return this;
     }
 
diff --git a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
index 3250afadddcc..fc1fb144c766 100644
--- a/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
+++ b/core/trino-main/src/test/java/io/trino/execution/TestQueryManagerConfig.java
@@ -49,7 +49,7 @@ public void testDefaults()
                 .setMinScheduleSplitBatchSize(100)
                 .setMaxConcurrentQueries(1000)
                 .setMaxQueuedQueries(5000)
-                .setInitialHashPartitions(100)
+                .setHashPartitionCount(100)
                 .setQueryManagerExecutorPoolSize(5)
                 .setRemoteTaskMinErrorDuration(new Duration(5, MINUTES))
                 .setRemoteTaskMaxErrorDuration(new Duration(5, MINUTES))
@@ -87,7 +87,7 @@ public void testExplicitPropertyMappings()
                 .put("query.min-schedule-split-batch-size", "9")
                 .put("query.max-concurrent-queries", "10")
                 .put("query.max-queued-queries", "15")
-                .put("query.initial-hash-partitions", "16")
+                .put("query.hash-partition-count", "16")
                 .put("query.manager-executor-pool-size", "11")
                 .put("query.remote-task.min-error-duration", "30s")
                 .put("query.remote-task.max-error-duration", "60s")
@@ -122,7 +122,7 @@ public void testExplicitPropertyMappings()
                 .setMinScheduleSplitBatchSize(9)
                 .setMaxConcurrentQueries(10)
                 .setMaxQueuedQueries(15)
-                .setInitialHashPartitions(16)
+                .setHashPartitionCount(16)
                 .setQueryManagerExecutorPoolSize(11)
                 .setRemoteTaskMinErrorDuration(new Duration(60, SECONDS))
                 .setRemoteTaskMaxErrorDuration(new Duration(60, SECONDS))
diff --git a/core/trino-spi/src/main/java/io/trino/spi/connector/Constraint.java b/core/trino-spi/src/main/java/io/trino/spi/connector/Constraint.java
index dd4e162f809f..f346b38cd61a 100644
--- a/core/trino-spi/src/main/java/io/trino/spi/connector/Constraint.java
+++ b/core/trino-spi/src/main/java/io/trino/spi/connector/Constraint.java
@@ -53,7 +53,7 @@ private Constraint(TupleDomain<ColumnHandle> summary, Optional<Predicate<Map<Col
     {
         this.summary = requireNonNull(summary, "summary is null");
         this.predicate = requireNonNull(predicate, "predicate is null");
-        this.predicateColumns = requireNonNull(predicateColumns, "predicateColumns is null");
+        this.predicateColumns = requireNonNull(predicateColumns, "predicateColumns is null").map(Set::copyOf);
 
         if (predicateColumns.isPresent() && predicate.isEmpty()) {
             throw new IllegalArgumentException("predicateColumns cannot be present when predicate is not present");