diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index 03f3445d01ea429ebd652eda596ef9d9bbbe7f6c..125eee2fe7b654a0696a2b73963d703ce4b502ee 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -43,7 +43,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -64,7 +64,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -82,7 +82,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -102,7 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -122,7 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index 73ff7718d9b889497d38656e34a8187c1ecc557f..8d9eac3bd08327fa3cf38192408bffda169f3dcc 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -43,7 +43,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -64,7 +64,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
-#            --totalcalls ${TOTALCALLS} \
+#            --totalcalls ${TOTAL_CALLS} \
 #            --methodtime ${METHODTIME} \
 #            --totalthreads ${THREADS} \
 #            --recursiondepth ${j}
@@ -82,7 +82,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
-#            --totalcalls ${TOTALCALLS} \
+#            --totalcalls ${TOTAL_CALLS} \
 #            --methodtime ${METHODTIME} \
 #            --totalthreads ${THREADS} \
 #            --recursiondepth ${j}
@@ -102,7 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
 #        ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
 #            --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
-#            --totalcalls ${TOTALCALLS} \
+#            --totalcalls ${TOTAL_CALLS} \
 #            --methodtime ${METHODTIME} \
 #            --totalthreads ${THREADS} \
 #            --recursiondepth ${j}
@@ -122,7 +122,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh
index e3c3b0d40740d1bb7b9f3fab9635c1200148c35b..83189ee34420f0d8e246995982e59d58798f9201 100644
--- a/bin/2012-msept/run-benchmark-recursive-jmx.sh
+++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh
@@ -12,10 +12,10 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSION_DEPTH=10    ## 10
-TOTALCALLS=2000000      ## 2000000
+TOTAL_CALLS=2000000      ## 2000000
 METHODTIME=500000       ## 500000
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 2 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 2 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 2 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
 echo "Experiment will take circa ${TIME} seconds."
 
 # determine correct classpath separator
@@ -58,7 +58,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -79,7 +79,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index a7f4b3d575edc6ef2267625103a624270ef0ef5e..9e8bb797cb248deb2f4ed9e8234f42d30044e8eb 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -12,10 +12,10 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSION_DEPTH=10    ## 10
-TOTALCALLS=2000000      ## 2000000
+TOTAL_CALLS=2000000      ## 2000000
 METHODTIME=500000       ## 500000
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
 echo "Experiment will take circa ${TIME} seconds."
 
 # determine correct classpath separator
@@ -59,7 +59,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -81,7 +81,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${RECDEPTH}
@@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${RECDEPTH}
@@ -119,7 +119,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${RECDEPTH}
@@ -139,7 +139,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${RECDEPTH}
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index 8073e985a49efedb2517797d1ffe7acbe4c1a557..1b1be03c2e11ef10a6829091c9c38079a7692c9d 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -12,10 +12,10 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSION_DEPTH=10    ## 10
-TOTALCALLS=2000000      ## 2000000
+TOTAL_CALLS=2000000      ## 2000000
 METHODTIME=500000       ## 500000
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
 echo "Experiment will take circa ${TIME} seconds."
 
 # determine correct classpath separator
@@ -59,7 +59,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-1.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_NOINSTR} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-1.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -98,7 +98,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-2.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-2.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -118,7 +118,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-3.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-3.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
@@ -138,7 +138,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-4.txt &
         ${BINDJAVA} java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
             --output-filename ${RESULTSFN}-${i}-${j}-4.csv \
-            --totalcalls ${TOTALCALLS} \
+            --totalcalls ${TOTAL_CALLS} \
             --methodtime ${METHODTIME} \
             --totalthreads ${THREADS} \
             --recursiondepth ${j}
diff --git a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
index 1f29e29a8b7501954f96156f79afe9236c6686b5..409ac80d4642bd31d2b2483ad9720c430ed6e2d1 100644
--- a/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
+++ b/bin/2012-msept/run-cycle-experiment-singlethreaded.sh
@@ -6,10 +6,10 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSION_DEPTH=1     ## 10
-TOTALCALLS=2000000      ## 200000
+TOTAL_CALLS=2000000      ## 200000
 METHODTIME=500000       ## 500000
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
 echo "Each experiment will take circa ${TIME} seconds."
 
 
diff --git a/bin/2012-msept/run-cycle.sh b/bin/2012-msept/run-cycle.sh
index 85cf8525132f18fc128ccff61c5da941aad4c510..dc7ab97c877fe5e0b0d9624bb63f282305be2f77 100644
--- a/bin/2012-msept/run-cycle.sh
+++ b/bin/2012-msept/run-cycle.sh
@@ -5,10 +5,10 @@ SUDOCMD="pfexec"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 RECURSION_DEPTH=1     ## 10
-TOTALCALLS=2000000      ## 2000000
+TOTAL_CALLS=2000000      ## 2000000
 METHODTIME=500000       ## 500000
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH}`
 echo "Each experiment will take circa ${TIME} seconds."
 
 ${SUDOCMD} psrset -c -F 0 1 2 3 # one chip no hyperthreading
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
index 36c54e0427a67488865eae201eaf242ce18b649a..f4c5f0a731b04494e52d8ea8d3d7fb06a92b2ab6 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi-remote.sh
@@ -13,13 +13,13 @@ SLEEP_TIME=1            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=2000000     ## 20000000
+TOTAL_CALLS=2000000     ## 20000000
 METHODTIME=0            ## 0
 
 #MOREPARAMS=""
 MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -55,7 +55,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -74,7 +74,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -92,7 +92,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -112,7 +112,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -132,7 +132,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -152,7 +152,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -172,7 +172,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -199,7 +199,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -212,7 +212,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -225,7 +225,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -236,7 +236,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -247,8 +247,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
index 8e76457fffbbba6e23982d2c559df5e73c220e55..1414edb50ea07a9e5bfc4966ece10da11e1420c2 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
@@ -10,13 +10,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=20000000     ## 20000000
+TOTAL_CALLS=20000000     ## 20000000
 METHODTIME=0            ## 0
 
 MOREPARAMS=""
 #MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -49,7 +49,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -68,7 +68,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -86,7 +86,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -105,7 +105,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -124,7 +124,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -143,7 +143,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -162,7 +162,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -188,7 +188,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -201,7 +201,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -214,7 +214,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -225,7 +225,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -236,8 +236,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
index 280f1e7e5cee0e17a797900f27eabdefcb402bdb..b73e55207ccdc20cadfe4a34e5de79f93a96d0a0 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
@@ -10,13 +10,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=2000000     ## 20000000
+TOTAL_CALLS=2000000     ## 20000000
 METHODTIME=0            ## 0
 
 #MOREPARAMS=""
 MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -53,7 +53,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -75,7 +75,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -98,7 +98,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -121,7 +121,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -146,7 +146,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -173,7 +173,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -200,7 +200,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -232,7 +232,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -245,7 +245,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -258,7 +258,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -269,7 +269,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -280,8 +280,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
index 331c1eb4e73eb4d4c4eab3eb31bf2da2bff43c2d..c83407ffc73f7446e0678e46c32244bb61eb75b8 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
@@ -13,13 +13,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=100000000     ## 20000000
+TOTAL_CALLS=100000000     ## 20000000
 METHODTIME=0            ## 0
 
 MOREPARAMS=""
 #MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -55,7 +55,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -73,7 +73,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -91,7 +91,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -111,7 +111,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -131,7 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -151,7 +151,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -171,7 +171,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -198,8 +198,8 @@ configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 source("${R_SCRIPT_DIR}stats.r")
 EOF
 
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
index 8e76457fffbbba6e23982d2c559df5e73c220e55..1414edb50ea07a9e5bfc4966ece10da11e1420c2 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
@@ -10,13 +10,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=20000000     ## 20000000
+TOTAL_CALLS=20000000     ## 20000000
 METHODTIME=0            ## 0
 
 MOREPARAMS=""
 #MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -49,7 +49,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -68,7 +68,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JARNoInstru} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -86,7 +86,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -105,7 +105,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -124,7 +124,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -143,7 +143,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -162,7 +162,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -188,7 +188,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -201,7 +201,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -214,7 +214,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -225,7 +225,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -236,8 +236,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
index 1d7aba1c3b743c6f78074a806051431a0752eafa..3cb4b50b32abeb2bb4fe92ba93a52d9157524e37 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
@@ -13,13 +13,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=4000000     ## 20000000
+TOTAL_CALLS=4000000     ## 20000000
 METHODTIME=0            ## 0
 
 MOREPARAMS=""
 #MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -59,7 +59,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -79,7 +79,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -98,7 +98,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -117,7 +117,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -138,7 +138,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -162,7 +162,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -186,7 +186,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -217,8 +217,8 @@ configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 source("${R_SCRIPT_DIR}stats.r")
 EOF
 
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
index 280f1e7e5cee0e17a797900f27eabdefcb402bdb..b73e55207ccdc20cadfe4a34e5de79f93a96d0a0 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
@@ -10,13 +10,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=2000000     ## 20000000
+TOTAL_CALLS=2000000     ## 20000000
 METHODTIME=0            ## 0
 
 #MOREPARAMS=""
 MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -53,7 +53,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -75,7 +75,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -98,7 +98,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -121,7 +121,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -146,7 +146,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -173,7 +173,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -200,7 +200,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -232,7 +232,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -245,7 +245,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -258,7 +258,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -269,7 +269,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -280,8 +280,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+40
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh
index c6146df720d364db73933d29a48bb902b067f115..750fa60c55ed0d2f7325b1577c0455f22d97464f 100644
--- a/bin/2013-kieker-days/only_r.sh
+++ b/bin/2013-kieker-days/only_r.sh
@@ -10,7 +10,7 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=20000000     ## 20000000
+TOTAL_CALLS=20000000     ## 20000000
 METHODTIME=0            ## 0
 
 RAWFN="${RESULTS_DIR}raw"
@@ -23,7 +23,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=0
 tsconf.max=25
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -36,7 +36,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=0
 tsconf.max=25
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -49,7 +49,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -60,6 +60,6 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh
index 3db96474681d0a36c1b8f6fcbb6d649ab4fcbb33..69fca7e38c8e9a99c4c7781d991cceaf2f0154af 100644
--- a/bin/2014-icpe/benchmark-disk-writer.sh
+++ b/bin/2014-icpe/benchmark-disk-writer.sh
@@ -10,13 +10,13 @@ SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
 RECURSIONDEPTH=10       ## 10
-TOTALCALLS=2000000      ## 2000000
+TOTAL_CALLS=2000000      ## 2000000
 METHODTIME=0            ## 0
 
 MOREPARAMS=""
 #MOREPARAMS="--quickstart"
 
-TIME=`expr ${METHODTIME} \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTALCALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHODTIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -55,7 +55,7 @@ echo "Runtime: circa ${TIME} seconds" >>${RESULTS_DIR}configuration.txt
 echo "" >>${RESULTS_DIR}configuration.txt
 echo "SLEEP_TIME=${SLEEP_TIME}" >>${RESULTS_DIR}configuration.txt
 echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}configuration.txt
-echo "TOTALCALLS=${TOTALCALLS}" >>${RESULTS_DIR}configuration.txt
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}configuration.txt
 echo "METHODTIME=${METHODTIME}" >>${RESULTS_DIR}configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}configuration.txt
 echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}configuration.txt
@@ -77,7 +77,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -100,7 +100,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_DEACTV} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -123,7 +123,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_NOLOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -146,7 +146,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING1} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -170,7 +170,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING2} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -194,7 +194,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}stat/iostat-${i}-${j}-${k}.txt &
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING3} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTALCALLS} \
+        --totalcalls ${TOTAL_CALLS} \
         --methodtime ${METHODTIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
@@ -225,7 +225,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+200
 source("${R_SCRIPT_DIR}timeseries.r")
@@ -238,7 +238,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 tsconf.min=(${METHODTIME}/1000)
 tsconf.max=(${METHODTIME}/1000)+200
 source("${R_SCRIPT_DIR}timeseries-average.r")
@@ -251,7 +251,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput.r")
 EOF
 # Throughput-Average
@@ -262,7 +262,7 @@ configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
-results.count=${TOTALCALLS}
+results.count=${TOTAL_CALLS}
 source("${R_SCRIPT_DIR}throughput-average.r")
 EOF
 # Bars
@@ -273,8 +273,8 @@ outtxt_fn="${RESULTS_DIR}results-text.txt"
 configs.loop=${NUM_LOOPS}
 configs.recursion=c(${RECURSIONDEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
-results.count=${TOTALCALLS}
-results.skip=${TOTALCALLS}/2
+results.count=${TOTAL_CALLS}
+results.skip=${TOTAL_CALLS}/2
 bars.minval=(${METHODTIME}/1000)
 bars.maxval=(${METHODTIME}/1000)+200
 source("${R_SCRIPT_DIR}bar.r")
diff --git a/frameworks/SPASSmeter/benchmark-causes.sh b/frameworks/SPASSmeter/benchmark-causes.sh
index 462c6ce250380b9cd726dd666197afb2a95ba161..7803ce95133530a044336b2178f49bd7fe3883d5 100644
--- a/frameworks/SPASSmeter/benchmark-causes.sh
+++ b/frameworks/SPASSmeter/benchmark-causes.sh
@@ -54,7 +54,7 @@ echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
 echo "" >> "${RESULTS_DIR}/configuration.txt"
 echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
-echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
diff --git a/frameworks/SPASSmeter/benchmark.sh b/frameworks/SPASSmeter/benchmark.sh
index 8bf82e5eaee740c429d1c444edbadab5b9cfcc0c..963e83f9a15dc21d5a1cf87eb0bed8d0db4deeb1 100644
--- a/frameworks/SPASSmeter/benchmark.sh
+++ b/frameworks/SPASSmeter/benchmark.sh
@@ -54,7 +54,7 @@ echo "Runtime: circa ${TIME} seconds" >> "${RESULTS_DIR}/configuration.txt"
 echo "" >> "${RESULTS_DIR}/configuration.txt"
 echo "SLEEP_TIME=${SLEEP_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
-echo "TOTALCALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
+echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "METHODTIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
@@ -112,7 +112,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #sar -o ${RESULTS_DIR}/stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
     ${JAVA_BIN} ${JAVA_ARGS_LTW_ASM} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --total-calls ${TOTALCALLS} \
+        --total-calls ${TOTAL_CALLS} \
         --method-time ${METHODTIME} \
         --total-threads ${THREADS} \
         --recursion-depth ${j} \