diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index ed5b6f0f70428551b77e79dc778bb2e5f9bb4723..ab6b636c1e060a5478bba954deeb923e52d1edf1 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -64,10 +64,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -82,10 +82,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -102,10 +102,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -122,10 +122,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index 5a7b3387f3605572c80c39f94dcca67d9e56b9fd..b6d73b0bf42ad28814dc2773add838fb7937c611 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -122,10 +122,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index 0f0d898235a12418e6bd2a1fb91cd991a9adfe3f..5bc62567fb760f751a84862972c89d014f952b40 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -81,10 +81,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${RECDEPTH}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${RECDEPTH}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -99,10 +99,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${RECDEPTH}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${RECDEPTH}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -119,10 +119,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${RECDEPTH}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${RECDEPTH}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -139,10 +139,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${RECDEPTH}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${RECDEPTH}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -167,3 +167,5 @@ mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
 [ -f ${RESULTS_DIR}/hotspot-1-1-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/nohup.out ] && mv ${BASE_DIR}/nohup.out ${RESULTS_DIR}
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
+
+# end
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index 49d4530a96d9fb566dcbd18001eb5f52f639bd2e..d35445da05d1882cd73690deba32dfb9ea335fc2 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -80,10 +80,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -98,10 +98,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -118,10 +118,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
@@ -138,10 +138,10 @@ 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 ${TOTAL_CALLS} \
-            --methodtime ${METHOD_TIME} \
-            --totalthreads ${THREADS} \
-            --recursiondepth ${j}
+            --total-calls ${TOTAL_CALLS} \
+            --method-time ${METHOD_TIME} \
+            --total-threads ${THREADS} \
+            --recursion-depth ${j}
         kill %mpstat
         kill %vmstat
         kill %iostat
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 0119207280f0f2a9ed05bd8df490b8b88e37550e..1c92f08c7f6d8e8c8508bd1babd903ecd44b8596 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
@@ -12,14 +12,14 @@ REMOTERESULTS_DIR="${REMOTEBASE_DIR}/tmp/results-benchmark-kieker-days-ffi/"
 SLEEP_TIME=1            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=2000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-#MOREPARAMS=""
-MOREPARAMS="--quickstart"
+#MORE_PARAMS=""
+MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -58,13 +58,13 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
 
@@ -78,7 +78,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
@@ -96,7 +96,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
@@ -116,7 +116,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
@@ -136,7 +136,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
@@ -156,7 +156,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
@@ -176,7 +176,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
@@ -187,7 +187,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -196,7 +196,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -209,7 +209,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -222,7 +222,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -233,7 +233,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -245,7 +245,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
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 3d4dd78bcb02b157a1ae4cbb17bb462b9bd9e318..dbc3393f304a93bcc52ba46f707c90a6ee1aee9d 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
@@ -9,14 +9,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-kieker-days-ffi/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=20000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-MOREPARAMS=""
-#MOREPARAMS="--quickstart"
+MORE_PARAMS=""
+#MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -52,13 +52,13 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
 
@@ -72,7 +72,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
@@ -90,7 +90,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -109,7 +109,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -128,7 +128,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -166,7 +166,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -176,7 +176,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -185,7 +185,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -198,7 +198,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -211,7 +211,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -222,7 +222,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -234,7 +234,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
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 2e534dc35473873f27163348742403854ca43afd..39b84d35e6275d147f4d92e4dc6b265983cfe58a 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
@@ -9,14 +9,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-kieker-days-kieker/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=2000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-#MOREPARAMS=""
-MOREPARAMS="--quickstart"
+#MORE_PARAMS=""
+MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -56,12 +56,12 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}/kieker.log
@@ -79,7 +79,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -102,7 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -125,7 +125,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -150,7 +150,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -177,7 +177,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -204,7 +204,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -220,7 +220,7 @@ done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -229,7 +229,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -242,7 +242,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -255,7 +255,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -266,7 +266,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -278,7 +278,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
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 f9cec2f9409ced9702d63290b029da3c8316ecf8..69ba00da37837b0ba746d2da16033095c0684434 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
@@ -12,14 +12,14 @@ REMOTERESULTS_DIR="${REMOTEBASE_DIR}/tmp/results-benchmark-kieker-days-ffi/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=100000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-MOREPARAMS=""
-#MOREPARAMS="--quickstart"
+MORE_PARAMS=""
+#MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -58,13 +58,13 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     # No instrumentation
@@ -77,7 +77,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
@@ -95,7 +95,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -115,7 +115,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -135,7 +135,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -155,7 +155,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -175,7 +175,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -186,7 +186,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -196,7 +196,7 @@ results_fn="${RAWFN}"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
index 3d4dd78bcb02b157a1ae4cbb17bb462b9bd9e318..dbc3393f304a93bcc52ba46f707c90a6ee1aee9d 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
@@ -9,14 +9,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-kieker-days-ffi/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=20000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-MOREPARAMS=""
-#MOREPARAMS="--quickstart"
+MORE_PARAMS=""
+#MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -52,13 +52,13 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
 
@@ -72,7 +72,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     sync
@@ -90,7 +90,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -109,7 +109,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -128,7 +128,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -166,7 +166,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %sar
     pkill -f 'java -jar'
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
@@ -176,7 +176,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -185,7 +185,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -198,7 +198,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -211,7 +211,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -222,7 +222,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -234,7 +234,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
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 3f8ed5b1bdb3062896b22f179a86c4756ce03d2c..e80bce0d2f8570e51cc200f6ed10e834fa72ecd7 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
@@ -12,14 +12,14 @@ REMOTERESULTS_DIR="${REMOTEBASE_DIR}/tmp/results-benchmark-kieker-days-kieker/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=4000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-MOREPARAMS=""
-#MOREPARAMS="--quickstart"
+MORE_PARAMS=""
+#MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -62,12 +62,12 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}/kieker.log
@@ -83,7 +83,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}/kieker.log
@@ -102,7 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}/kieker.log
@@ -121,7 +121,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     [ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-${j}-${k}.log
     echo >>${BASE_DIR}/kieker.log
@@ -142,7 +142,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -166,7 +166,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
 	#kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -190,7 +190,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
 	#kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
@@ -205,7 +205,7 @@ done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -215,7 +215,7 @@ results_fn="${RAWFN}"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.threads=${THREADS}
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
index 2e534dc35473873f27163348742403854ca43afd..39b84d35e6275d147f4d92e4dc6b265983cfe58a 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
@@ -9,14 +9,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-kieker-days-kieker/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=1            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=2000000     ## 20000000
 METHOD_TIME=0            ## 0
 
-#MOREPARAMS=""
-MOREPARAMS="--quickstart"
+#MORE_PARAMS=""
+MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -56,12 +56,12 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}/kieker.log
@@ -79,7 +79,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -102,7 +102,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -125,7 +125,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -150,7 +150,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -177,7 +177,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -204,7 +204,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -220,7 +220,7 @@ done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -229,7 +229,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -242,7 +242,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -255,7 +255,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -266,7 +266,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -278,7 +278,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh
index cdbc31c900a89818059fa9fd098832df3f2b5e6f..635775b8dfc1eb48d88aab26ba1adc0424f1aafb 100644
--- a/bin/2013-kieker-days/only_r.sh
+++ b/bin/2013-kieker-days/only_r.sh
@@ -9,7 +9,7 @@ RESULTS_DIR="${BASE_DIR}/tmp/ffi-exp/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=20000000     ## 20000000
 METHOD_TIME=0            ## 0
 
@@ -20,7 +20,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -33,7 +33,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -46,7 +46,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
@@ -57,7 +57,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","TCP Writer","Reconstruction","Reduction")
 configs.colors=c("black","red","blue","green","yellow","purple")
 results.count=${TOTAL_CALLS}
diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh
index 511a977ce9906c8cd11c53328d8396172ce275d9..3d41c388673fd2e1c989f028fe6da4cbf0309054 100644
--- a/bin/2014-icpe/benchmark-disk-writer.sh
+++ b/bin/2014-icpe/benchmark-disk-writer.sh
@@ -9,14 +9,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-disk/"
 SLEEP_TIME=30            ## 30
 NUM_LOOPS=10            ## 10
 THREADS=1               ## 1
-RECURSIONDEPTH=10       ## 10
+RECURSION_DEPTH=10       ## 10
 TOTAL_CALLS=2000000      ## 2000000
 METHOD_TIME=0            ## 0
 
-MOREPARAMS=""
-#MOREPARAMS="--quickstart"
+MORE_PARAMS=""
+#MORE_PARAMS="--quickstart"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -58,12 +58,12 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}/kieker.log
@@ -81,7 +81,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -104,7 +104,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -127,7 +127,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -150,7 +150,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -174,7 +174,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -198,7 +198,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --methodtime ${METHOD_TIME} \
         --totalthreads ${THREADS} \
         --recursiondepth ${j} \
-        ${MOREPARAMS}
+        ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
     kill %iostat
@@ -213,7 +213,7 @@ done
 zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/kieker.log ${RESULTS_DIR}/kieker.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
@@ -222,7 +222,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
 results.count=${TOTAL_CALLS}
@@ -235,7 +235,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-timeseries-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
 results.count=${TOTAL_CALLS}
@@ -248,7 +248,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
 results.count=${TOTAL_CALLS}
@@ -259,7 +259,7 @@ R --vanilla --silent <<EOF
 results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-throughput-average.pdf"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 configs.colors=c("black","red","blue","green","purple","pink")
 results.count=${TOTAL_CALLS}
@@ -271,7 +271,7 @@ results_fn="${RAWFN}"
 output_fn="${RESULTS_DIR}/results-bars.pdf"
 outtxt_fn="${RESULTS_DIR}/results-text.txt"
 configs.loop=${NUM_LOOPS}
-configs.recursion=c(${RECURSIONDEPTH})
+configs.recursion=c(${RECURSION_DEPTH})
 configs.labels=c("No Probe","Deactivated Probe","Collecting Data","Writer1","Writer2","Writer3")
 results.count=${TOTAL_CALLS}
 results.skip=${TOTAL_CALLS}/2
diff --git a/bin/2014-icpe/benchmark-tcp-kieker.sh b/bin/2014-icpe/benchmark-tcp-kieker.sh
index be06e17b7d32c070ba5875df676b2d1385693f69..8204d72d7c2aaace5a763be323e106ad727584d7 100644
--- a/bin/2014-icpe/benchmark-tcp-kieker.sh
+++ b/bin/2014-icpe/benchmark-tcp-kieker.sh
@@ -75,10 +75,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVA_BIN}  ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
-        --totalcalls ${TOTAL_CALLS} \
-        --methodtime ${METHOD_TIME} \
-        --totalthreads ${THREADS} \
-        --recursiondepth ${j} \
+        --total-calls ${TOTAL_CALLS} \
+        --method-time ${METHOD_TIME} \
+        --total-threads ${THREADS} \
+        --recursion-depth ${j} \
         ${MORE_PARAMS}
     kill %mpstat
     kill %vmstat
@@ -139,7 +139,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
     echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}/kieker.log
-    mpstat 1 > "${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt &
+    mpstat 1 > "${RESULTS_DIR}/stat/mpstat-${i}-${j}-${k}.txt" &
     vmstat 1 > ${RESULTS_DIR}/stat/vmstat-${i}-${j}-${k}.txt &
     iostat -xn 10 > ${RESULTS_DIR}/stat/iostat-${i}-${j}-${k}.txt &
     ${JAVA_BIN} -jar dist/KiekerTCPReader.jar >${RESULTS_DIR}/worker-${i}-${j}-${k}.log &
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
index 075caef4332127893ede72239260f538d4d79d62..fc607760fb94257a286c8461f1547e0c309d1059 100644
--- a/frameworks/OpenTelemetry/benchmark.sh
+++ b/frameworks/OpenTelemetry/benchmark.sh
@@ -126,7 +126,7 @@ source ../common-functions.sh
 source labels.sh
 
 #MORE_PARAMS="--quickstart"
-MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MOREPARAMS}"
+MORE_PARAMS="--application moobench.application.MonitoredClassSimple ${MORE_PARAMS}"
 
 TIME=`expr ${METHOD_TIME} \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_OF_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_NUM_OF_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_OF_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
diff --git a/frameworks/SPASSmeter/benchmark-causes.sh b/frameworks/SPASSmeter/benchmark-causes.sh
index f8b487e56fec98058737c51ad27920844e4a21fc..81ccc69d717c92fc258059385885ba8a7797926b 100644
--- a/frameworks/SPASSmeter/benchmark-causes.sh
+++ b/frameworks/SPASSmeter/benchmark-causes.sh
@@ -57,7 +57,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
-echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
 sync
 
 ## Execute Benchmark
@@ -154,7 +154,7 @@ done
 #zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 #rm -rf ${RESULTS_DIR}/stat/
 mv "${BASE_DIR}/spassmeter.log" "${RESULTS_DIR}/spassmeter.log"
-[ -f "${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log > "${RESULTS_DIR}/log.log"
+[ -f "${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log" ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log > "${RESULTS_DIR}/log.log"
 [ -f "${BASE_DIR}/errorlog.txt" ] && mv "${BASE_DIR}/errorlog.txt" "${RESULTS_DIR}/"
 
 ## Clean up raw results
diff --git a/frameworks/SPASSmeter/benchmark-tcp.sh b/frameworks/SPASSmeter/benchmark-tcp.sh
index 92db530c365d40bef219aa6f9e4318b0f3071bbd..7de3ca9b40f106bee68dec7e94f0737d49503880 100644
--- a/frameworks/SPASSmeter/benchmark-tcp.sh
+++ b/frameworks/SPASSmeter/benchmark-tcp.sh
@@ -10,14 +10,14 @@ RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter/"
 SLEEP_TIME=30           ## 30
 NUM_LOOPS=10           ## 10
 THREADS=1              ## 1
-RECURSIONDEPTH=10      ## 10
+RECURSION_DEPTH=10      ## 10
 TOTAL_CALLS=2000000     ## 2000000
 METHOD_TIME=0      ## 500000
 
 #MORE_PARAMS="--quickstart"
 MORE_PARAMS="--application mooBench.monitoredApplication.MonitoredClassSimple ${MORE_PARAMS}"
 
-TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSIONDEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSIONDEPTH} \* ${NUM_LOOPS} `
+TIME=`expr ${METHOD_TIME} \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} + ${SLEEP_TIME} \* 4 \* ${NUM_LOOPS}  \* ${RECURSION_DEPTH} + 50 \* ${TOTAL_CALLS} / 1000000000 \* 4 \* ${RECURSION_DEPTH} \* ${NUM_LOOPS} `
 echo "Experiment will take circa ${TIME} seconds."
 
 echo "Removing and recreating '${RESULTS_DIR}'"
@@ -57,12 +57,12 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >>${RESULTS_DIR}/configuration.txt
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >>${RESULTS_DIR}/configuration.txt
 echo "METHOD_TIME=${METHOD_TIME}" >>${RESULTS_DIR}/configuration.txt
 echo "THREADS=${THREADS}" >>${RESULTS_DIR}/configuration.txt
-echo "RECURSIONDEPTH=${RECURSIONDEPTH}" >>${RESULTS_DIR}/configuration.txt
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >>${RESULTS_DIR}/configuration.txt
 sync
 
 ## Execute Benchmark
 for ((i=1;i<=${NUM_LOOPS};i+=1)); do
-    j=${RECURSIONDEPTH}
+    j=${RECURSION_DEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
     echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}/spassmeter.log
@@ -130,7 +130,7 @@ done
 #zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 #rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/spassmeter.log ${RESULTS_DIR}/spassmeter.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
 
 ## Clean up raw results
diff --git a/frameworks/SPASSmeter/benchmark.sh b/frameworks/SPASSmeter/benchmark.sh
index 09d1b43bae87b4a99514d3b86eef5d8e01f9f592..50bf6dc3e43eb6afa8efba422de04b9b724038bf 100644
--- a/frameworks/SPASSmeter/benchmark.sh
+++ b/frameworks/SPASSmeter/benchmark.sh
@@ -57,7 +57,7 @@ echo "NUM_LOOPS=${NUM_LOOPS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "TOTAL_CALLS=${TOTAL_CALLS}" >> "${RESULTS_DIR}/configuration.txt"
 echo "METHOD_TIME=${METHOD_TIME}" >> "${RESULTS_DIR}/configuration.txt"
 echo "THREADS=${THREADS}" >> "${RESULTS_DIR}/configuration.txt"
-echo "RECURSIONDEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
+echo "RECURSION_DEPTH=${RECURSION_DEPTH}" >> "${RESULTS_DIR}/configuration.txt"
 sync
 
 ## Execute Benchmark
@@ -128,7 +128,7 @@ done
 #zip -jqr ${RESULTS_DIR}/stat.zip ${RESULTS_DIR}/stat
 #rm -rf ${RESULTS_DIR}/stat/
 mv ${BASE_DIR}/spassmeter.log ${RESULTS_DIR}/spassmeter.log
-[ -f ${RESULTS_DIR}/hotspot-1-${RECURSIONDEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
+[ -f ${RESULTS_DIR}/hotspot-1-${RECURSION_DEPTH}-1.log ] && grep "<task " ${RESULTS_DIR}/hotspot-*.log >${RESULTS_DIR}/log.log
 [ -f ${BASE_DIR}/errorlog.txt ] && mv ${BASE_DIR}/errorlog.txt ${RESULTS_DIR}/
 
 ## Clean up raw results