diff --git a/client/trino-client/src/main/java/io/trino/client/QueryDataClientJacksonModule.java b/client/trino-client/src/main/java/io/trino/client/QueryDataClientJacksonModule.java
index b40cc557dfc0..d711a38d284e 100644
--- a/client/trino-client/src/main/java/io/trino/client/QueryDataClientJacksonModule.java
+++ b/client/trino-client/src/main/java/io/trino/client/QueryDataClientJacksonModule.java
@@ -25,12 +25,12 @@
 import java.io.IOException;
 
 /**
- * Decodes the direct and spooled protocols.
+ * Decodes the direct and spooling protocols.
  *
  * If the "data" fields starts with an array - this is the direct protocol which requires obtaining JsonParser
  * and then parsing rows lazily.
  *
- * Otherwise, this is an spooled protocol.
+ * Otherwise, this is a spooling protocol.
  */
 public class QueryDataClientJacksonModule
         extends SimpleModule
diff --git a/client/trino-client/src/main/java/io/trino/client/spooling/encoding/QueryDataDecoders.java b/client/trino-client/src/main/java/io/trino/client/spooling/encoding/QueryDataDecoders.java
index efbe821425d4..667c76c509fb 100644
--- a/client/trino-client/src/main/java/io/trino/client/spooling/encoding/QueryDataDecoders.java
+++ b/client/trino-client/src/main/java/io/trino/client/spooling/encoding/QueryDataDecoders.java
@@ -22,6 +22,7 @@
 
 import static com.google.common.base.Verify.verify;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
+import static java.lang.String.format;
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.joining;
 
@@ -39,7 +40,7 @@ private QueryDataDecoders() {}
     public static Factory get(String encoding)
     {
         if (!encodingMap.containsKey(encoding)) {
-            throw new IllegalArgumentException("Unknown spooled protocol encoding: " + encoding);
+            throw new IllegalArgumentException(format("Unknown spooling protocol encoding '%s'", encoding));
         }
 
         Factory factory = encodingMap.get(encoding);
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/QueryDataEncoders.java b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/QueryDataEncoders.java
index 794fe2ab0ad2..2d0ce9125f8a 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/QueryDataEncoders.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/QueryDataEncoders.java
@@ -39,14 +39,14 @@ public QueryDataEncoders(SpoolingEnabledConfig enabledConfig, Set<QueryDataEncod
                 .collect(toImmutableMap(Map.Entry::getKey, Map.Entry::getValue));
 
         if (enabled) {
-            LOG.info("Spooled client protocol is enabled with encodings: " + getAvailableEncodings());
+            LOG.info("Spooling protocol is enabled with encodings: " + getAvailableEncodings());
         }
     }
 
     public boolean exists(String encoding)
     {
         if (!enabled) {
-            throw new IllegalStateException("Spooled client protocol is not enabled");
+            throw new IllegalStateException("Spooling protocol is not enabled");
         }
         return factories.containsKey(encoding);
     }
@@ -54,10 +54,10 @@ public boolean exists(String encoding)
     public QueryDataEncoder.Factory get(String encoding)
     {
         if (!enabled) {
-            throw new IllegalStateException("Spooled client protocol is not enabled");
+            throw new IllegalStateException("Spooling protocol is not enabled");
         }
         if (!exists(encoding)) {
-            throw new IllegalArgumentException("Unknown spooled protocol encoding: " + encoding);
+            throw new IllegalArgumentException("Unknown spooling protocol encoding: " + encoding);
         }
 
         return factories.get(encoding);
@@ -66,7 +66,7 @@ public QueryDataEncoder.Factory get(String encoding)
     public Set<String> getAvailableEncodings()
     {
         if (!enabled) {
-            throw new IllegalStateException("Spooled client protocol is not enabled");
+            throw new IllegalStateException("Spooling protocol is not enabled");
         }
         return factories.keySet();
     }
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
index f7de6d6ee2b6..3db34cf7e35d 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingConfig.java
@@ -99,7 +99,7 @@ public boolean isAllowInlining()
         return allowInlining;
     }
 
-    @ConfigDescription("Allow spooled protocol to inline data")
+    @ConfigDescription("Allow spooling protocol to inline data")
     @Config("protocol.spooling.inlining.enabled")
     public SpoolingConfig setAllowInlining(boolean allowInlining)
     {
diff --git a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingEnabledConfig.java b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingEnabledConfig.java
index 0589ccb87a47..41b89c4cb905 100644
--- a/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingEnabledConfig.java
+++ b/core/trino-main/src/main/java/io/trino/server/protocol/spooling/SpoolingEnabledConfig.java
@@ -26,7 +26,7 @@ public boolean isEnabled()
     }
 
     @Config("protocol.spooling.enabled")
-    @ConfigDescription("Enable spooled client protocol support")
+    @ConfigDescription("Enable spooling protocol")
     public SpoolingEnabledConfig setEnabled(boolean enabled)
     {
         this.enabled = enabled;