diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
index a522d27d3a56ff4d414a067cae4ffc51c092fead..e5e053751c2de0e603ffb1ddf664158ba51e98f4 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetListDeliverer.java
@@ -43,7 +43,7 @@ public class SetListDeliverer {
   private boolean textgrid;
   private boolean dariah;
 
-  private OAI_ESClient esClient;
+  private OAI_ESClient oaiEsClient;
 
   /**
    * @param oaiEsClient
@@ -64,7 +64,7 @@ public class SetListDeliverer {
 
     ListSetsType setList = new ListSetsType();
 
-    SearchRequest request = new SearchRequest(this.esClient.getEsIndex());
+    SearchRequest request = new SearchRequest(this.oaiEsClient.getEsIndex());
     SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
     searchSourceBuilder.size(0);
 
@@ -119,7 +119,7 @@ public class SetListDeliverer {
     // Get items with TG or DH request.
     SearchResponse getRecordListItems = null;
     try {
-      getRecordListItems = this.esClient.getEsClient().search(request, RequestOptions.DEFAULT);
+      getRecordListItems = this.oaiEsClient.getEsClient().search(request, RequestOptions.DEFAULT);
 
     } catch (IOException e) {
       // TODO Auto-generated catch block
@@ -343,15 +343,15 @@ public class SetListDeliverer {
   /**
    * @return
    */
-  public OAI_ESClient getEsClient() {
-    return this.esClient;
+  public OAI_ESClient getOaiEsClient() {
+    return this.oaiEsClient;
   }
 
   /**
-   * @param esClient
+   * @param oaiEsClient
    */
-  public void setEsClient(OAI_ESClient esClient) {
-    this.esClient = esClient;
+  public void setOaiEsClient(OAI_ESClient oaiEsClient) {
+    this.oaiEsClient = oaiEsClient;
   }
 
 }