diff --git a/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapter.java b/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapter.java
index 0be4ad393..6fa64dc06 100644
--- a/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapter.java
+++ b/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapter.java
@@ -36,7 +36,7 @@ public interface EsqlAdapter<Result> {
     String format();
 
     /**
-     * For JSON results, whether the result should be organized in rows or columns
+     * For JSON like results, whether the result should be organized in rows or columns
      */
     boolean columnar();
 
diff --git a/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/ObjectsEsqlAdapter.java b/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/objects/ObjectsEsqlAdapter.java
similarity index 90%
rename from java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/ObjectsEsqlAdapter.java
rename to java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/objects/ObjectsEsqlAdapter.java
index 9de683553..243542ebd 100644
--- a/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/ObjectsEsqlAdapter.java
+++ b/java-client/src/main-flavored/java/co/elastic/clients/elasticsearch/_helpers/esql/objects/ObjectsEsqlAdapter.java
@@ -17,9 +17,12 @@
  * under the License.
  */
 
-package co.elastic.clients.elasticsearch._helpers.esql;
+package co.elastic.clients.elasticsearch._helpers.esql.objects;
 
 import co.elastic.clients.ApiClient;
+import co.elastic.clients.elasticsearch._helpers.esql.EsqlAdapter;
+import co.elastic.clients.elasticsearch._helpers.esql.EsqlAdapterBase;
+import co.elastic.clients.elasticsearch._helpers.esql.EsqlMetadata;
 import co.elastic.clients.elasticsearch.esql.QueryRequest;
 import co.elastic.clients.json.BufferingJsonGenerator;
 import co.elastic.clients.json.BufferingJsonpMapper;
@@ -37,7 +40,7 @@
 /**
  * And ES|QL adapter that returns an iterable of domain objects
  */
-class ObjectsEsqlAdapter<T> implements EsqlAdapter<Iterable<T>> {
+public class ObjectsEsqlAdapter<T> implements EsqlAdapter<Iterable<T>> {
 
     public static <T> ObjectsEsqlAdapter<T> of(Class<T> clazz) {
         return new ObjectsEsqlAdapter<>(clazz);
@@ -49,7 +52,7 @@ public static <T> ObjectsEsqlAdapter<T> of(Type type) {
 
     private final Type type;
 
-    ObjectsEsqlAdapter(Type type) {
+    public ObjectsEsqlAdapter(Type type) {
         this.type = type;
     }
 
diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java
index 557d31703..3cfd884bf 100644
--- a/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java
+++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterEndToEndTest.java
@@ -23,6 +23,7 @@
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch.ElasticsearchTestServer;
 import co.elastic.clients.elasticsearch._helpers.esql.jdbc.ResultSetEsqlAdapter;
+import co.elastic.clients.elasticsearch._helpers.esql.objects.ObjectsEsqlAdapter;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.transport.rest_client.RestClientTransport;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterTest.java b/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterTest.java
index 2b67ec1d1..95917ca55 100644
--- a/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterTest.java
+++ b/java-client/src/test/java/co/elastic/clients/elasticsearch/_helpers/esql/EsqlAdapterTest.java
@@ -21,6 +21,7 @@
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import co.elastic.clients.elasticsearch._helpers.esql.jdbc.ResultSetEsqlAdapter;
+import co.elastic.clients.elasticsearch._helpers.esql.objects.ObjectsEsqlAdapter;
 import co.elastic.clients.json.jackson.JacksonJsonpMapper;
 import co.elastic.clients.testkit.MockHttpClient;
 import co.elastic.clients.transport.endpoints.BinaryResponse;