diff --git a/engine/src/main/java/com/arcadedb/query/sql/SQLQueryEngine.java b/engine/src/main/java/com/arcadedb/query/sql/SQLQueryEngine.java
index 362dcd46b5..c1d45733c0 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/SQLQueryEngine.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/SQLQueryEngine.java
@@ -187,7 +187,7 @@ public SQLFunction getFunction(final String name) {
           // WRAP LIBRARY FUNCTION TO SQL FUNCTION TO BE EXECUTED BY SQL ENGINE
           sqlFunction = new SQLFunctionAbstract(name) {
             @Override
-            public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+            public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult,
                 final Object[] params,
                 final CommandContext context) {
               return function.execute(params);
diff --git a/engine/src/main/java/com/arcadedb/query/sql/executor/SQLFunction.java b/engine/src/main/java/com/arcadedb/query/sql/executor/SQLFunction.java
index 4d42b54bca..bd37fdefa8 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/executor/SQLFunction.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/executor/SQLFunction.java
@@ -35,7 +35,7 @@ public interface SQLFunction {
   /**
    * Process a record.
    *
-   * @param iThis
+   * @param self
    * @param currentRecord : current record
    * @param currentResult TODO
    * @param params        : function parameters, number is ensured to be within minParams and maxParams.
@@ -44,7 +44,7 @@ public interface SQLFunction {
    * @return function result, can be null. Special cases : can be null if function aggregate results, can be null if function filter
    * results : this mean result is excluded
    */
-  Object execute(Object iThis, Identifiable currentRecord, Object currentResult, Object[] params, CommandContext context);
+  Object execute(Object self, Identifiable currentRecord, Object currentResult, Object[] params, CommandContext context);
 
   /**
    * Configure the function.
diff --git a/engine/src/main/java/com/arcadedb/query/sql/executor/SQLMethod.java b/engine/src/main/java/com/arcadedb/query/sql/executor/SQLMethod.java
index 51530344ca..db616186eb 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/executor/SQLMethod.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/executor/SQLMethod.java
@@ -66,14 +66,14 @@ public interface SQLMethod extends Comparable<SQLMethod> {
   /**
    * Process a record.
    *
-   * @param iThis          current object
+   * @param self          current object
    * @param currentRecord : current record
    * @param context       execution context
    * @param params        : function parameters, number is ensured to be within minParams and maxParams.
    *
    * @return evaluation result
    */
-  Object execute(Object iThis, Identifiable currentRecord, CommandContext context, Object[] params);
+  Object execute(Object self, Identifiable currentRecord, CommandContext context, Object[] params);
 
   boolean evaluateParameters();
 }
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionDifference.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionDifference.java
index 108472188a..9b1ac35b01 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionDifference.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionDifference.java
@@ -37,7 +37,7 @@ public SQLFunctionDifference() {
   }
 
   @SuppressWarnings("unchecked")
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params[0] == null)
       return null;
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionFirst.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionFirst.java
index d1f982a820..50c9507e4a 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionFirst.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionFirst.java
@@ -35,7 +35,7 @@ public SQLFunctionFirst() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     final Object value = params[0];
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionIntersect.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionIntersect.java
index fa4868af23..eb5b4dd4c0 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionIntersect.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionIntersect.java
@@ -37,7 +37,7 @@ public SQLFunctionIntersect() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     Object value = params[0];
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionLast.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionLast.java
index 0397945888..c19ddcb91c 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionLast.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionLast.java
@@ -35,7 +35,7 @@ public SQLFunctionLast() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     final Object value = params[0];
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionList.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionList.java
index 126e94a563..bbe59a3ab5 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionList.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionList.java
@@ -36,7 +36,7 @@ public SQLFunctionList() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     if (params.length > 1)
       // IN LINE MODE
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionMap.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionMap.java
index a752ca32f1..e619a6872d 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionMap.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionMap.java
@@ -36,7 +36,7 @@ public SQLFunctionMap() {
   }
 
   @SuppressWarnings("unchecked")
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
 
     if (params.length > 2)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSet.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSet.java
index ac648224a6..4a4afc6e37 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSet.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSet.java
@@ -38,7 +38,7 @@ public SQLFunctionSet() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     if (params.length > 1)
       // IN LINE MODE
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSymmetricDifference.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSymmetricDifference.java
index 9fa2d054a0..23e35a700a 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSymmetricDifference.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionSymmetricDifference.java
@@ -54,7 +54,7 @@ private static void addItemsToResult(final Collection<Object> co, final Set<Obje
   }
 
   @SuppressWarnings("unchecked")
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     if (params[0] == null)
       return null;
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionUnionAll.java b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionUnionAll.java
index f6efa2e80b..6fc6ceadb4 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionUnionAll.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/coll/SQLFunctionUnionAll.java
@@ -39,7 +39,7 @@ public SQLFunctionUnionAll() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     if (params.length == 1) {
       // AGGREGATION MODE (STATEFUL)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionCircle.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionCircle.java
index 4dd960b0f3..1a2e08f8bd 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionCircle.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionCircle.java
@@ -35,7 +35,7 @@ public SQLFunctionCircle() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length != 3)
       throw new IllegalArgumentException("circle() requires 3 parameters");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionDistance.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionDistance.java
index a029fb7f90..88860a01b4 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionDistance.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionDistance.java
@@ -37,7 +37,7 @@ public SQLFunctionDistance() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     double distance;
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionLineString.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionLineString.java
index c65efeb015..d613c74f5a 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionLineString.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionLineString.java
@@ -39,7 +39,7 @@ public SQLFunctionLineString() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length != 1)
       throw new IllegalArgumentException("lineString() requires array of points as parameters");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPoint.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPoint.java
index 369c2b0bd7..60454f6ff8 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPoint.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPoint.java
@@ -34,7 +34,7 @@ public SQLFunctionPoint() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length != 2)
       throw new IllegalArgumentException("point() requires X and Y as parameters");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPolygon.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPolygon.java
index 8b4a9a3e0e..e1478d96ee 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPolygon.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionPolygon.java
@@ -39,7 +39,7 @@ public SQLFunctionPolygon() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length != 1)
       throw new IllegalArgumentException("polygon() requires array of points as parameters");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionRectangle.java b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionRectangle.java
index b829f9d98b..f1678b5c4a 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionRectangle.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/geo/SQLFunctionRectangle.java
@@ -36,7 +36,7 @@ public SQLFunctionRectangle() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length != 4)
       throw new IllegalArgumentException("rectangle() requires 4 parameters");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionAstar.java b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionAstar.java
index ee74e9aa40..477bb713a5 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionAstar.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionAstar.java
@@ -66,7 +66,7 @@ public SQLFunctionAstar() {
     super(NAME);
   }
 
-  public LinkedList<Vertex> execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+  public LinkedList<Vertex> execute(final Object self, final Identifiable currentRecord, final Object currentResult,
       final Object[] params, final CommandContext ctx) {
     context = ctx;
     final SQLFunctionAstar context = this;
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMove.java b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMove.java
index 8448b7671c..b4dc2a55d0 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMove.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMove.java
@@ -45,7 +45,7 @@ public String getSyntax() {
     return "Syntax error: " + name + "([<labels>])";
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult,
       final Object[] iParameters, final CommandContext context) {
 
     final String[] labels;
@@ -54,7 +54,7 @@ public Object execute(final Object iThis, final Identifiable currentRecord, fina
     else
       labels = null;
 
-    return SQLQueryEngine.foreachRecord(iArgument -> move(context.getDatabase(), iArgument, labels), iThis, context);
+    return SQLQueryEngine.foreachRecord(iArgument -> move(context.getDatabase(), iArgument, labels), self, context);
   }
 
   protected Object v2v(final Database graph, final Identifiable iRecord, final Vertex.DIRECTION iDirection,
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMoveFiltered.java b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMoveFiltered.java
index 97f3c782a4..0e78542cc0 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMoveFiltered.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionMoveFiltered.java
@@ -38,7 +38,7 @@ protected SQLFunctionMoveFiltered(final String name) {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult,
       final Object[] iParameters, final Iterable<Identifiable> iPossibleResults, final CommandContext context) {
     final String[] labels;
     if (iParameters != null && iParameters.length > 0 && iParameters[0] != null)
@@ -46,7 +46,7 @@ public Object execute(final Object iThis, final Identifiable currentRecord, fina
     else
       labels = null;
 
-    return SQLQueryEngine.foreachRecord(iArgument -> move(context.getDatabase(), iArgument, labels, iPossibleResults), iThis,
+    return SQLQueryEngine.foreachRecord(iArgument -> move(context.getDatabase(), iArgument, labels, iPossibleResults), self,
         context);
   }
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionShortestPath.java b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionShortestPath.java
index d55c179cfc..3b3889c775 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionShortestPath.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/graph/SQLFunctionShortestPath.java
@@ -82,7 +82,7 @@ private static class ShortestPathContext {
     public Boolean edge;
   }
 
-  public List<RID> execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public List<RID> execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
 
     final ShortestPathContext shortestPathContext = new ShortestPathContext();
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAbsoluteValue.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAbsoluteValue.java
index 029a95df02..d0b7ffcf14 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAbsoluteValue.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAbsoluteValue.java
@@ -41,7 +41,7 @@ public SQLFunctionAbsoluteValue() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable record, final Object currentResult, final Object[] params, final CommandContext context) {
+  public Object execute(final Object self, final Identifiable record, final Object currentResult, final Object[] params, final CommandContext context) {
     final Object inputValue = params[0];
 
     if (inputValue == null) {
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAverage.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAverage.java
index 5686bc3c98..4df6f364cd 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAverage.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionAverage.java
@@ -41,7 +41,7 @@ public SQLFunctionAverage() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length == 1) {
       if (params[0] instanceof Number number)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionCount.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionCount.java
index b338de7bc2..4423714050 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionCount.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionCount.java
@@ -36,7 +36,7 @@ public SQLFunctionCount() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length == 0 || params[0] != null)
       total++;
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionEval.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionEval.java
index 4028245e4c..70a47cfac3 100755
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionEval.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionEval.java
@@ -42,7 +42,7 @@ public SQLFunctionEval() {
     super(NAME);
   }
 
-  public Object execute(Object iThis, final Identifiable record, final Object currentResult, final Object[] params, CommandContext context) {
+  public Object execute(Object self, final Identifiable record, final Object currentResult, final Object[] params, CommandContext context) {
     if (params.length < 1)
       throw new CommandExecutionException("invalid expression");
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMax.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMax.java
index 7c41183a01..40092f314f 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMax.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMax.java
@@ -40,7 +40,7 @@ public SQLFunctionMax() {
   }
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
     // calculate max value for current record
     // consider both collection of parameters and collection in each parameter
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMin.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMin.java
index 7c4c3a165a..7a072849ea 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMin.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMin.java
@@ -40,7 +40,7 @@ public SQLFunctionMin() {
   }
 
   @SuppressWarnings({ "unchecked", "rawtypes" })
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext ctx) {
 
     // calculate min value for current record
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMode.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMode.java
index 0045b59582..344a7762b0 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMode.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionMode.java
@@ -44,7 +44,7 @@ public SQLFunctionMode() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
 
     if (MultiValue.isMultiValue(params[0])) {
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionPercentile.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionPercentile.java
index 6e7b9341a7..a46e10477f 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionPercentile.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionPercentile.java
@@ -45,7 +45,7 @@ public SQLFunctionPercentile(final String iName) {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
 
     if (quantiles.isEmpty()) { // set quantiles once
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionRandomInt.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionRandomInt.java
index 7a75708d78..2614e24e5d 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionRandomInt.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionRandomInt.java
@@ -40,7 +40,7 @@ public SQLFunctionRandomInt() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params == null || params.length < 1)
       throw new CommandSQLParsingException("Expected maximum value in function");
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSquareRoot.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSquareRoot.java
index 250f6bedfd..71d0a55492 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSquareRoot.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSquareRoot.java
@@ -32,7 +32,7 @@ public SQLFunctionSquareRoot() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable record, final Object currentResult, final Object[] params, final CommandContext context) {
+  public Object execute(final Object self, final Identifiable record, final Object currentResult, final Object[] params, final CommandContext context) {
     final Object inputValue = params[0];
 
     if (inputValue == null) {
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSum.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSum.java
index db0fbc9f33..a2f091749a 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSum.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionSum.java
@@ -38,7 +38,7 @@ public SQLFunctionSum() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length == 1) {
       if (params[0] instanceof Number number)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionVariance.java b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionVariance.java
index 1a4747a151..4b771c9566 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionVariance.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/math/SQLFunctionVariance.java
@@ -65,7 +65,7 @@ protected SQLFunctionVariance(final String name) {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params[0] instanceof Number number) {
       addValue(number);
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolAnd.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolAnd.java
index 9535b4915b..9f1b5cf87b 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolAnd.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolAnd.java
@@ -37,7 +37,7 @@ public SQLFunctionBoolAnd() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length == 1) {
       if (params[0] instanceof Boolean boolean1)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolOr.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolOr.java
index 1e32c090a6..6f958c3657 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolOr.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionBoolOr.java
@@ -37,7 +37,7 @@ public SQLFunctionBoolOr() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params.length == 1) {
       if (params[0] instanceof Boolean boolean1)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionCoalesce.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionCoalesce.java
index 2786db598e..8b9ca9f0e1 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionCoalesce.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionCoalesce.java
@@ -65,7 +65,7 @@ public SQLFunctionCoalesce() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     final int length = params.length;
     for (int i = 0; i < length; i++) {
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionDecode.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionDecode.java
index 6503214c74..fe40df9453 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionDecode.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionDecode.java
@@ -42,7 +42,7 @@ public SQLFunctionDecode() {
   }
 
   @Override
-  public Object execute( final Object iThis, final Identifiable currentRecord, final Object currentResult,
+  public Object execute( final Object self, final Identifiable currentRecord, final Object currentResult,
       final Object[] params, final CommandContext context) {
 
     final String candidate = params[0].toString();
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionEncode.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionEncode.java
index 1ae26b5664..51be54fdd5 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionEncode.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionEncode.java
@@ -46,7 +46,7 @@ public SQLFunctionEncode() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
 
     final Object candidate = params[0];
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIf.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIf.java
index f37302102c..cee9ad5f43 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIf.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIf.java
@@ -57,7 +57,7 @@ public SQLFunctionIf() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params, final CommandContext context) {
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params, final CommandContext context) {
 
     final boolean result;
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIfNull.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIfNull.java
index 8175407a7c..a95841bffe 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIfNull.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionIfNull.java
@@ -66,7 +66,7 @@ public SQLFunctionIfNull() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     /*
      * iFuncParams [0] field/value to check for null [1] return value if [0] is null [2] optional return value if [0] is not null
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionUUID.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionUUID.java
index 1b444d63bf..e0aaec8a21 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionUUID.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionUUID.java
@@ -40,7 +40,7 @@ public SQLFunctionUUID() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     return UUID.randomUUID().toString();
   }
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionVersion.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionVersion.java
index f56669c178..89b5a6500c 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionVersion.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLFunctionVersion.java
@@ -39,7 +39,7 @@ public SQLFunctionVersion() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     return Constants.getVersion();
   }
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLStaticReflectiveFunction.java b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLStaticReflectiveFunction.java
index 46d9fc8b55..9ff210ea8c 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLStaticReflectiveFunction.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/misc/SQLStaticReflectiveFunction.java
@@ -100,7 +100,7 @@ public SQLStaticReflectiveFunction(final String name, final Method... methods) {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
 
     final Supplier<String> paramsPrettyPrint = () -> Arrays.stream(params).map(p -> p + " [ " + p.getClass().getName() + " ]")
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionConcat.java b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionConcat.java
index b8b04fa41d..9584bbdc59 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionConcat.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionConcat.java
@@ -31,7 +31,7 @@ public SQLFunctionConcat() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (sb == null) {
       sb = new StringBuilder();
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionFormat.java b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionFormat.java
index c80e7e0c42..41a84452f3 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionFormat.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionFormat.java
@@ -34,7 +34,7 @@ public SQLFunctionFormat() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     final Object[] args = new Object[params.length - 1];
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionStrcmpci.java b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionStrcmpci.java
index dce0310307..32b367dff3 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionStrcmpci.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/text/SQLFunctionStrcmpci.java
@@ -34,7 +34,7 @@ public SQLFunctionStrcmpci() {
   }
 
   @Override
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     String s1 = null;
     if (params[0] != null && params[0] instanceof String string)
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/time/SQLFunctionDate.java b/engine/src/main/java/com/arcadedb/query/sql/function/time/SQLFunctionDate.java
index 1bc3f17ca0..31181a6b86 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/time/SQLFunctionDate.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/time/SQLFunctionDate.java
@@ -44,7 +44,7 @@ public SQLFunctionDate() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     final LocalDateTime date;
 
diff --git a/engine/src/main/java/com/arcadedb/query/sql/function/vector/SQLFunctionVectorNeighbors.java b/engine/src/main/java/com/arcadedb/query/sql/function/vector/SQLFunctionVectorNeighbors.java
index c349c73cbf..cb5b8fb986 100644
--- a/engine/src/main/java/com/arcadedb/query/sql/function/vector/SQLFunctionVectorNeighbors.java
+++ b/engine/src/main/java/com/arcadedb/query/sql/function/vector/SQLFunctionVectorNeighbors.java
@@ -44,7 +44,7 @@ public SQLFunctionVectorNeighbors() {
     super(NAME);
   }
 
-  public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+  public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
       final CommandContext context) {
     if (params == null || params.length != 3)
       throw new CommandSQLParsingException(getSyntax());
diff --git a/engine/src/test/java/com/arcadedb/graph/BasicGraphTest.java b/engine/src/test/java/com/arcadedb/graph/BasicGraphTest.java
index 62d855c936..0d582909e3 100644
--- a/engine/src/test/java/com/arcadedb/graph/BasicGraphTest.java
+++ b/engine/src/test/java/com/arcadedb/graph/BasicGraphTest.java
@@ -488,7 +488,7 @@ public void customFunction() {
     try {
       ((SQLQueryEngine) database.getQueryEngine("sql")).getFunctionFactory().register(new SQLFunctionAbstract("ciao") {
         @Override
-        public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+        public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult,
             final Object[] params,
             final CommandContext context) {
           return "Ciao";
diff --git a/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java b/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
index 7b3c850d92..0bd6d9f193 100644
--- a/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
+++ b/engine/src/test/java/com/arcadedb/query/sql/executor/ScriptExecutionTest.java
@@ -32,7 +32,7 @@ public SQLFunctionThrowCME() {
       super(NAME);
     }
 
-    public Object execute(Object iThis, final Identifiable currentRecord, final Object currentResult, final Object[] params,
+    public Object execute(Object self, final Identifiable currentRecord, final Object currentResult, final Object[] params,
         CommandContext context) {
       throw new ConcurrentModificationException("" + params[0]);
     }
diff --git a/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java b/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
index a7420e5ebe..df3fec6f84 100644
--- a/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
+++ b/engine/src/test/java/com/arcadedb/query/sql/executor/SelectStatementExecutionTest.java
@@ -4043,7 +4043,7 @@ public void testCountGroupBy() {
 //
 //                            @Override
 //                            public Object execute(
-//                                    Object iThis,
+//                                    Object self,
 //                                    Identifiable currentRecord,
 //                                    Object currentResult,
 //                                    Object[] params,
diff --git a/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java b/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java
index a6d33487db..cbaec9c686 100755
--- a/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java
+++ b/engine/src/test/java/com/arcadedb/query/sql/function/sql/SQLFunctionsTest.java
@@ -439,7 +439,7 @@ public String getSyntax() {
       }
 
       @Override
-      public Object execute(final Object iThis, final Identifiable currentRecord, final Object currentResult,
+      public Object execute(final Object self, final Identifiable currentRecord, final Object currentResult,
           final Object[] params, final CommandContext context) {
         if (params[0] == null || params[1] == null)
           // CHECK BOTH EXPECTED PARAMETERS
diff --git a/studio/src/main/resources/static/components/DataTables/DataTables-1.10.20/js/jquery.dataTables.js b/studio/src/main/resources/static/components/DataTables/DataTables-1.10.20/js/jquery.dataTables.js
index 75a440ad1f..3cc9fdc033 100644
--- a/studio/src/main/resources/static/components/DataTables/DataTables-1.10.20/js/jquery.dataTables.js
+++ b/studio/src/main/resources/static/components/DataTables/DataTables-1.10.20/js/jquery.dataTables.js
@@ -8430,19 +8430,19 @@
   DataTable.versionCheck = DataTable.fnVersionCheck = function (version) {
     var aThis = DataTable.version.split(".");
     var aThat = version.split(".");
-    var iThis, iThat;
+    var self, iThat;
 
     for (var i = 0, iLen = aThat.length; i < iLen; i++) {
-      iThis = parseInt(aThis[i], 10) || 0;
+      self = parseInt(aThis[i], 10) || 0;
       iThat = parseInt(aThat[i], 10) || 0;
 
       // Parts are the same, keep comparing
-      if (iThis === iThat) {
+      if (self === iThat) {
         continue;
       }
 
       // Parts are different, return immediately
-      return iThis > iThat;
+      return self > iThat;
     }
 
     return true;
diff --git a/studio/src/main/resources/static/components/DataTables/datatables.js b/studio/src/main/resources/static/components/DataTables/datatables.js
index d04257bf75..0af7dbcd9e 100644
--- a/studio/src/main/resources/static/components/DataTables/datatables.js
+++ b/studio/src/main/resources/static/components/DataTables/datatables.js
@@ -78875,19 +78875,19 @@ this.pdfMake.vfs = {
   DataTable.versionCheck = DataTable.fnVersionCheck = function (version) {
     var aThis = DataTable.version.split(".");
     var aThat = version.split(".");
-    var iThis, iThat;
+    var self, iThat;
 
     for (var i = 0, iLen = aThat.length; i < iLen; i++) {
-      iThis = parseInt(aThis[i], 10) || 0;
+      self = parseInt(aThis[i], 10) || 0;
       iThat = parseInt(aThat[i], 10) || 0;
 
       // Parts are the same, keep comparing
-      if (iThis === iThat) {
+      if (self === iThat) {
         continue;
       }
 
       // Parts are different, return immediately
-      return iThis > iThat;
+      return self > iThat;
     }
 
     return true;