diff --git a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
index 5e4d02f7f94bf05d757f34f7fcf7fe36ad5a9bc0..2d7a45d099fa5bec35586b58257eb2c71d61cbe0 100644
--- a/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
+++ b/src/main/java/org/caosdb/server/jobs/core/ExecuteQuery.java
@@ -59,18 +59,18 @@ public class ExecuteQuery extends FlagJob {
       }
       getContainer().addMessage(queryInstance);
 
-      int index = 0;
-      int length = getContainer().size();
+      int startIndex = 0;
+      int endIndex = getContainer().size();
 
       if (((Retrieve) getTransaction()).hasPaging()) {
         Retrieve.Paging paging = ((Retrieve) getTransaction()).getPaging();
-        index = Math.min(getContainer().size(), paging.index);
-        length = Math.min(getContainer().size(), paging.length);
+        startIndex = Math.min(getContainer().size(), paging.startIndex);
+        endIndex = Math.min(getContainer().size(), paging.endIndex);
       }
 
       int ii = 0;
       for (final EntityInterface entity : getContainer()) {
-        if (ii >= index && ii < length) {
+        if (ii >= startIndex && ii < endIndex) {
           getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
         } else {
           entity.setEntityStatus(EntityStatus.IGNORE);
diff --git a/src/main/java/org/caosdb/server/jobs/core/Paging.java b/src/main/java/org/caosdb/server/jobs/core/Paging.java
index d7814b71218756fbe72c46257d658fb516018104..aa918ecfe2ac20b90b019b5ace91bde05ccac9ef 100644
--- a/src/main/java/org/caosdb/server/jobs/core/Paging.java
+++ b/src/main/java/org/caosdb/server/jobs/core/Paging.java
@@ -42,24 +42,24 @@ public class Paging extends FlagJob {
   protected void job(final String value) {
     if (getTransaction() instanceof Retrieve) {
       if (value != null) {
-        int index = DEFAULT_INDEX;
-        int length = index + DEFAULT_LENGTH;
+        int startIndex = DEFAULT_INDEX;
+        int endIndex = startIndex + DEFAULT_LENGTH;
         final Matcher m = pattern.matcher(value);
         if (m.matches()) {
           if (m.group(1) != null) {
-            index = Integer.parseInt(m.group(1));
+            startIndex = Integer.parseInt(m.group(1));
           }
           if (m.group(2) != null) {
-            length = index + Integer.parseInt(m.group(2));
+            endIndex = startIndex + Integer.parseInt(m.group(2));
           }
         }
 
         // this info may be used by other jobs
-        ((Retrieve) getTransaction()).setPaging(index, length);
+        ((Retrieve) getTransaction()).setPaging(startIndex, endIndex);
 
         int i = 0;
         for (final EntityInterface e : getContainer()) {
-          if (i >= length || i < index) {
+          if (i >= endIndex || i < startIndex) {
             // do not retrieve this entity
             e.setEntityStatus(EntityStatus.IGNORE);
           }
diff --git a/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java b/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
index fcd1ee7f48c8421e421046e0bb93b373b41cc865..a89385e29f458ad3ad15eea0d9e6b6bf7640bca6 100644
--- a/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
+++ b/src/main/java/org/caosdb/server/jobs/core/RetrieveAllJob.java
@@ -45,18 +45,20 @@ public class RetrieveAllJob extends FlagJob {
 
       execute(new RetrieveAll(getContainer(), value));
 
-      int index = 0;
-      int length = getContainer().size();
+      int startIndex = 0;
+      int endIndex = getContainer().size();
 
       if (((Retrieve) getTransaction()).hasPaging()) {
-        index = Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().index);
-        length = Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().length);
+        startIndex =
+            Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().startIndex);
+        endIndex =
+            Math.min(getContainer().size(), ((Retrieve) getTransaction()).getPaging().endIndex);
       }
 
       // only add jobs for those which are on this page
       int ii = 0;
       for (EntityInterface entity : getContainer()) {
-        if (ii >= index && ii < length) {
+        if (ii >= startIndex && ii < endIndex) {
           getTransaction().getSchedule().addAll(loadJobs(entity, getTransaction()));
         } else {
           entity.setEntityStatus(EntityStatus.IGNORE);
diff --git a/src/main/java/org/caosdb/server/transaction/Retrieve.java b/src/main/java/org/caosdb/server/transaction/Retrieve.java
index 859a6ad68a1df35f79618f1f7413bb2112d8a0ac..643c1201b530af9821c9a5c1a7b62f7c5d04cf52 100644
--- a/src/main/java/org/caosdb/server/transaction/Retrieve.java
+++ b/src/main/java/org/caosdb/server/transaction/Retrieve.java
@@ -123,13 +123,13 @@ public class Retrieve extends Transaction<RetrieveContainer> {
   }
 
   public static class Paging {
-    public Paging(int index, int length) {
-      this.index = index;
-      this.length = length;
+    public Paging(int startIndex, int endIndex) {
+      this.startIndex = startIndex;
+      this.endIndex = endIndex;
     }
 
-    public final int index;
-    public final int length;
+    public final int startIndex;
+    public final int endIndex;
   }
 
   private Retrieve.Paging paging = null;
@@ -138,8 +138,8 @@ public class Retrieve extends Transaction<RetrieveContainer> {
     return this.paging != null;
   }
 
-  public void setPaging(int index, int length) {
-    this.paging = new Retrieve.Paging(index, length);
+  public void setPaging(int startIndex, int endIndex) {
+    this.paging = new Retrieve.Paging(startIndex, endIndex);
   }
 
   public Retrieve.Paging getPaging() {