From ab40816e097b82894108a5045cf70ce858d92828 Mon Sep 17 00:00:00 2001
From: Reiner Jung <reiner.jung@email.uni-kiel.de>
Date: Wed, 22 Jun 2022 16:05:07 +0200
Subject: [PATCH] Fixed BASE_DIR variable

---
 bin/2012-msept/run-benchmark-cycle-async.sh   | 44 +++++-----
 bin/2012-msept/run-benchmark-cycle-sync.sh    | 44 +++++-----
 bin/2012-msept/run-benchmark-recursive-jmx.sh | 28 +++----
 .../run-benchmark-recursive-linear.sh         | 42 +++++-----
 bin/2012-msept/run-benchmark-recursive.sh     | 42 +++++-----
 .../benchmark-kieker-days-ffi-remote.sh       | 26 +++---
 .../benchmark-kieker-days-ffi.sh              | 22 ++---
 .../benchmark-kieker-days-kieker.sh           | 72 ++++++++--------
 .../benchmark-kieker-days-ffi-remote.sh       | 36 ++++----
 .../benchmark-kieker-days-ffi.sh              | 22 ++---
 .../benchmark-kieker-days-kieker-remote.sh    | 82 +++++++++----------
 .../benchmark-kieker-days-kieker.sh           | 72 ++++++++--------
 bin/2013-kieker-days/only_r.sh                |  4 +-
 bin/2014-icpe/benchmark-disk-writer-slow.sh   |  2 +-
 bin/2014-icpe/benchmark-disk-writer.sh        | 78 +++++++++---------
 bin/2014-icpe/benchmark-tcp-kieker.sh         |  2 +-
 frameworks/OpenTelemetry/benchmark.sh         | 26 +++---
 .../OpenTelemetry/runExponentialSizes.sh      |  4 +-
 frameworks/SPASSmeter/benchmark-causes.sh     |  2 +-
 frameworks/SPASSmeter/benchmark-tcp.sh        |  2 +-
 20 files changed, 327 insertions(+), 325 deletions(-)

diff --git a/bin/2012-msept/run-benchmark-cycle-async.sh b/bin/2012-msept/run-benchmark-cycle-async.sh
index 3f1790a..00b155c 100644
--- a/bin/2012-msept/run-benchmark-cycle-async.sh
+++ b/bin/2012-msept/run-benchmark-cycle-async.sh
@@ -1,21 +1,21 @@
 #!/bin/bash
 
 BIN_DIR=bin/
-BASEDIR=
+BASE_DIR=
 
 # determine correct classpath separator
 CPSEPCHAR=":" # default :, ; for windows
 if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 # echo "Classpath separator: '${CPSEPCHAR}'"
 
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/"
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RESULTSFN="${RESULTS_DIR}results.csv"
 
@@ -29,10 +29,10 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
-JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASEDIR}tmp"
+JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}tmp"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEPTIME}
 
@@ -89,9 +89,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -109,9 +109,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -130,10 +130,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %vmstat
         kill %iostat
         mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASEDIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
     
@@ -146,9 +146,9 @@ gzip -9 ${RESULTS_DIR}kiekerlog.tar
 tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
 gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}nohup.out ] && cp ${BASEDIR}nohup.out ${RESULTS_DIR}
-echo -n "" > ${BASEDIR}nohup.out
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
-echo -n "" > ${BASEDIR}errorlog.txt
+[ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
+echo -n "" > ${BASE_DIR}nohup.out
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
+echo -n "" > ${BASE_DIR}errorlog.txt
diff --git a/bin/2012-msept/run-benchmark-cycle-sync.sh b/bin/2012-msept/run-benchmark-cycle-sync.sh
index 8ff6931..d8e49dc 100644
--- a/bin/2012-msept/run-benchmark-cycle-sync.sh
+++ b/bin/2012-msept/run-benchmark-cycle-sync.sh
@@ -1,21 +1,21 @@
 #!/bin/bash
 
 BIN_DIR=bin/
-BASEDIR=
+BASE_DIR=
 
 # determine correct classpath separator
 CPSEPCHAR=":" # default :, ; for windows
 if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 # echo "Classpath separator: '${CPSEPCHAR}'"
 
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/"
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RESULTSFN="${RESULTS_DIR}results.csv"
 
@@ -29,10 +29,10 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
-JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.SyncFsWriter -Dkieker.monitoring.writer.filesystem.SyncFsWriter.customStoragePath=${BASEDIR}tmp"
+JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.SyncFsWriter -Dkieker.monitoring.writer.filesystem.SyncFsWriter.customStoragePath=${BASE_DIR}tmp"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -71,7 +71,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
 #        sync
 #        sleep ${SLEEPTIME}
 #
@@ -89,9 +89,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
-#        echo >>${BASEDIR}kieker.log
-#        echo >>${BASEDIR}kieker.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+#        echo >>${BASE_DIR}kieker.log
+#        echo >>${BASE_DIR}kieker.log
 #        sync
 #        sleep ${SLEEPTIME}
 #
@@ -109,9 +109,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 #        kill %mpstat
 #        kill %vmstat
 #        kill %iostat
-#        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
-#        echo >>${BASEDIR}kieker.log
-#        echo >>${BASEDIR}kieker.log
+#        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+#        echo >>${BASE_DIR}kieker.log
+#        echo >>${BASE_DIR}kieker.log
 #        sync
 #        sleep ${SLEEPTIME}
 
@@ -130,10 +130,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %vmstat
         kill %iostat
         mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASEDIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
     
@@ -146,9 +146,9 @@ gzip -9 ${RESULTS_DIR}kiekerlog.tar
 tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
 gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}nohup.out ] && cp ${BASEDIR}nohup.out ${RESULTS_DIR}
-echo -n "" > ${BASEDIR}nohup.out
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
-echo -n "" > ${BASEDIR}errorlog.txt
+[ -f ${BASE_DIR}nohup.out ] && cp ${BASE_DIR}nohup.out ${RESULTS_DIR}
+echo -n "" > ${BASE_DIR}nohup.out
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
+echo -n "" > ${BASE_DIR}errorlog.txt
diff --git a/bin/2012-msept/run-benchmark-recursive-jmx.sh b/bin/2012-msept/run-benchmark-recursive-jmx.sh
index bef23d5..b6f9784 100644
--- a/bin/2012-msept/run-benchmark-recursive-jmx.sh
+++ b/bin/2012-msept/run-benchmark-recursive-jmx.sh
@@ -6,7 +6,7 @@ SUDOCMD=""
 BINDJAVA=""
 
 BIN_DIR=bin/
-BASEDIR=
+BASE_DIR=
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -23,14 +23,14 @@ CPSEPCHAR=":" # default :, ; for windows
 if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 # echo "Classpath separator: '${CPSEPCHAR}'"
 
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/"
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RESULTSFN="${RESULTS_DIR}results.csv"
 
@@ -44,7 +44,7 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.jmx=true -Dkieker.monitoring.jmx.remote=true -Dkieker.monitoring.writer=kieker.monitoring.writer.jmx.JMXWriter""
@@ -86,9 +86,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -107,9 +107,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %vmstat
         kill %iostat
         mkdir -p ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
     
@@ -119,7 +119,7 @@ done
 tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
 gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-recursive-linear.sh b/bin/2012-msept/run-benchmark-recursive-linear.sh
index bdd5b05..46fae73 100644
--- a/bin/2012-msept/run-benchmark-recursive-linear.sh
+++ b/bin/2012-msept/run-benchmark-recursive-linear.sh
@@ -6,7 +6,7 @@ SUDOCMD=""
 BINDJAVA=""
 
 BIN_DIR=bin/
-BASEDIR=
+BASE_DIR=
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -23,14 +23,14 @@ CPSEPCHAR=":" # default :, ; for windows
 if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 # echo "Classpath separator: '${CPSEPCHAR}'"
 
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive-linear/"
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive-linear/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RESULTSFN="${RESULTS_DIR}results.csv"
 
@@ -44,11 +44,11 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
-#JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASEDIR}tmp"
-JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASEDIR}tmp"
+#JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}tmp"
+JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASE_DIR}tmp"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -88,7 +88,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEPTIME}
 
@@ -106,9 +106,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -126,9 +126,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -147,10 +147,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %vmstat
         kill %iostat
         mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASEDIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
     
@@ -163,7 +163,7 @@ gzip -9 ${RESULTS_DIR}kiekerlog.tar
 tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
 gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
diff --git a/bin/2012-msept/run-benchmark-recursive.sh b/bin/2012-msept/run-benchmark-recursive.sh
index c48f6fd..2f7a191 100644
--- a/bin/2012-msept/run-benchmark-recursive.sh
+++ b/bin/2012-msept/run-benchmark-recursive.sh
@@ -6,7 +6,7 @@ SUDOCMD=""
 BINDJAVA=""
 
 BIN_DIR=bin/
-BASEDIR=
+BASE_DIR=
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -23,14 +23,14 @@ CPSEPCHAR=":" # default :, ; for windows
 if [ ! -z "$(uname | grep -i WIN)" ]; then CPSEPCHAR=";"; fi
 # echo "Classpath separator: '${CPSEPCHAR}'"
 
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-recursive/"
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-recursive/"
 echo "Removing and recreating '${RESULTS_DIR}'"
 (${SUDOCMD} rm -rf ${RESULTS_DIR}) && mkdir ${RESULTS_DIR}
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RESULTSFN="${RESULTS_DIR}results.csv"
 
@@ -44,11 +44,11 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar MooBench.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.adaptiveMonitoring.configFile=META-INF/kieker.monitoring.adaptiveMonitoring.disabled.conf -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
-#JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASEDIR}tmp"
-JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASEDIR}tmp"
+#JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}tmp"
+JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASE_DIR}tmp"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -87,7 +87,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-1.log
         sync
         sleep ${SLEEPTIME}
 
@@ -105,9 +105,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-2.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -125,9 +125,9 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %mpstat
         kill %vmstat
         kill %iostat
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-3.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
 
@@ -146,10 +146,10 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         kill %vmstat
         kill %iostat
         mkdir -p ${RESULTS_DIR}kiekerlog/
-        mv ${BASEDIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
-        [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
-        echo >>${BASEDIR}kieker.log
-        echo >>${BASEDIR}kieker.log
+        mv ${BASE_DIR}tmp/kieker-* ${RESULTS_DIR}kiekerlog/
+        [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-4.log
+        echo >>${BASE_DIR}kieker.log
+        echo >>${BASE_DIR}kieker.log
         sync
         sleep ${SLEEPTIME}
     
@@ -162,7 +162,7 @@ gzip -9 ${RESULTS_DIR}kiekerlog.tar
 tar cf ${RESULTS_DIR}stat.tar ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
 gzip -9 ${RESULTS_DIR}stat.tar
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
-[ -f ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
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 ce74a0f..f9d3fb9 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
@@ -2,12 +2,12 @@
 
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 REMOTEHOST="blade1"
-REMOTEBASEDIR="/localhome/ffi/"
+REMOTEBASE_DIR="/localhome/ffi/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/"
-REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-ffi/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
+REMOTERESULTS_DIR="${REMOTEBASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
 
 SLEEPTIME=1            ## 30
 NUM_LOOPS=1            ## 10
@@ -44,7 +44,7 @@ JARCollecting="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiCollecting.jar"
 JARNORMAL="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiNormal.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -80,7 +80,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -100,7 +100,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -120,7 +120,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -140,7 +140,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -160,7 +160,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -180,7 +180,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %sar
     pkill -f 'java -jar'
 	ssh ${REMOTEHOST} "pkill -f 'java -jar'"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -188,7 +188,7 @@ 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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -259,4 +259,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
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 de179e7..2b9b5ad 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-ffi.sh
@@ -3,8 +3,8 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=1            ## 10
@@ -38,7 +38,7 @@ JARCollecting="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiCollecting.jar"
 JARNORMAL="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiNormal.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -74,7 +74,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -93,7 +93,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -112,7 +112,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -131,7 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -150,7 +150,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -169,7 +169,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -177,7 +177,7 @@ 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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -248,4 +248,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
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 fe9e142..a192931 100644
--- a/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days-ffi/benchmark-kieker-days-kieker.sh
@@ -3,8 +3,8 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-kieker/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=1            ## 10
@@ -24,8 +24,8 @@ echo "Removing and recreating '${RESULTS_DIR}'"
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RAWFN="${RESULTS_DIR}raw"
 
@@ -39,7 +39,7 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar dist/OverheadEvaluationMicrobenchmarkKieker.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.enabled=false -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueSize=100000 -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1"
@@ -64,12 +64,12 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     j=${RECURSIONDEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}kieker.log
+    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}kieker.log
 
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
     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 &
@@ -83,16 +83,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Deactivated probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
-    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
     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 &
@@ -106,16 +106,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # No logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
-    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
     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 &
@@ -129,16 +129,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -155,17 +155,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -182,17 +182,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -209,19 +209,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
 done
 zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -292,4 +292,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
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 2713e7b..7ef0560 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi-remote.sh
@@ -2,12 +2,12 @@
 
 JAVABIN=""
 REMOTEHOST="ubuntu@10.50.0.4"
-REMOTEBASEDIR="/home/ubuntu/"
+REMOTEBASE_DIR="/home/ubuntu/"
 
 R_SCRIPT_DIR=bin/r-scripts/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/"
-REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-ffi/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
+REMOTERESULTS_DIR="${REMOTEBASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -44,7 +44,7 @@ JARCollecting="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiCollecting.jar"
 JARNORMAL="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiNormal.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -79,7 +79,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -87,7 +87,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated Probe"
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARDeactived} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -99,7 +99,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -107,7 +107,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Collecting"
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARCollecting} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -119,7 +119,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -127,7 +127,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_worker.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -139,7 +139,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -147,7 +147,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reconstruction"
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/explorviz_workerReconstruction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReconstruction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -159,7 +159,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -167,7 +167,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Reduction"
 	#sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/explorviz_workerReduction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+    ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/explorviz_workerReduction.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_LTW} ${JARNORMAL} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -179,7 +179,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -187,7 +187,7 @@ 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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Bars
@@ -208,4 +208,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
index de179e7..2b9b5ad 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-ffi.sh
@@ -3,8 +3,8 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-ffi/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-ffi/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=1            ## 10
@@ -38,7 +38,7 @@ JARCollecting="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiCollecting.jar"
 JARNORMAL="-jar dist/OverheadEvaluationMicrobenchmarkTCPffiNormal.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/aspectjweaver.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker-overhead-benchmark.aop.xml"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -74,7 +74,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -93,7 +93,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -112,7 +112,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -131,7 +131,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -150,7 +150,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 
@@ -169,7 +169,7 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         ${MOREPARAMS}
     kill %sar
     pkill -f 'java -jar'
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
     sync
     sleep ${SLEEPTIME}
 	
@@ -177,7 +177,7 @@ 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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -248,4 +248,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
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 805739d..3529221 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker-remote.sh
@@ -2,12 +2,12 @@
 
 JAVABIN=""
 REMOTEHOST="ubuntu@10.50.0.7"
-REMOTEBASEDIR="/home/ubuntu/"
+REMOTEBASE_DIR="/home/ubuntu/"
 
 R_SCRIPT_DIR=bin/r-scripts/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/"
-REMOTERESULTS_DIR="${REMOTEBASEDIR}tmp/results-benchmark-kieker-days-kieker/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-kieker/"
+REMOTERESULTS_DIR="${REMOTEBASE_DIR}tmp/results-benchmark-kieker-days-kieker/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -30,8 +30,8 @@ ssh ${REMOTEHOST} "(rm -rf ${REMOTERESULTS_DIR}) && mkdir ${REMOTERESULTS_DIR}"
 ssh ${REMOTEHOST} "mkdir ${REMOTERESULTS_DIR}stat/"
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RAWFN="${RESULTS_DIR}raw"
 
@@ -45,7 +45,7 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar dist/OverheadEvaluationMicrobenchmarkKieker.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.enabled=false -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueSize=100000 -Dkieker.monitoring.writer.tcp.TCPWriter.hostname=10.50.0.7 -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1"
@@ -70,12 +70,12 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     j=${RECURSIONDEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}kieker.log
+    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}kieker.log
 
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
     #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 \
@@ -85,16 +85,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Deactivated probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
-    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
     #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 \
@@ -104,16 +104,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # No logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
-    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
     #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 \
@@ -123,18 +123,18 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
         --recursiondepth ${j} \
         ${MOREPARAMS}
     #kill %sar
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/KiekerTCPReader1.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader1.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -146,19 +146,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     #kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/KiekerTCPReader2.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader2.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -170,19 +170,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	#kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     #sar -o ${RESULTS_DIR}stat/sar-${i}-${j}-${k}.data 5 2000 1>/dev/null 2>&1 &
-	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASEDIR}dist/KiekerTCPReader3.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
+	ssh ${REMOTEHOST} "${JAVABIN}java ${JAVA_ARGS} -jar ${REMOTEBASE_DIR}dist/KiekerTCPReader3.jar </dev/null >${REMOTERESULTS_DIR}worker-${i}-${j}-${k}.log 2>&1 &"
     sleep 5
     ${JAVABIN}java  ${JAVA_ARGS_KIEKER_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-${j}-${k}.csv \
@@ -194,19 +194,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
 	#kill %sar
     killall java
 	ssh ${REMOTEHOST} "killall java"
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
 done
 zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Bars
@@ -227,4 +227,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
index fe9e142..a192931 100644
--- a/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
+++ b/bin/2013-kieker-days/benchmark-kieker-days-kieker.sh
@@ -3,8 +3,8 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-kieker-days-kieker/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-kieker-days-kieker/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=1            ## 10
@@ -24,8 +24,8 @@ echo "Removing and recreating '${RESULTS_DIR}'"
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RAWFN="${RESULTS_DIR}raw"
 
@@ -39,7 +39,7 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar dist/OverheadEvaluationMicrobenchmarkKieker.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.9-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.enabled=false -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_LOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.tcp.TCPWriter -Dkieker.monitoring.writer.tcp.TCPWriter.QueueSize=100000 -Dkieker.monitoring.writer.tcp.TCPWriter.QueueFullBehavior=1"
@@ -64,12 +64,12 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     j=${RECURSIONDEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}kieker.log
+    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}kieker.log
 
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
     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 &
@@ -83,16 +83,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Deactivated probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
-    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
     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 &
@@ -106,16 +106,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # No logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
-    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
     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 &
@@ -129,16 +129,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -155,17 +155,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Reconstruction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -182,17 +182,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
     # Reduction
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging"
-    echo " # ${i}.${j}.${k} Logging" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging" >>${BASE_DIR}kieker.log
     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 &
@@ -209,19 +209,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %vmstat
     kill %iostat
     pkill -f 'java -jar'
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 	
 done
 zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -292,4 +292,4 @@ zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
 zip -jqr ${RESULTS_DIR}worker.zip ${RESULTS_DIR}worker*.log
 rm -f ${RESULTS_DIR}worker*.log
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2013-kieker-days/only_r.sh b/bin/2013-kieker-days/only_r.sh
index 930d1fd..97281c7 100644
--- a/bin/2013-kieker-days/only_r.sh
+++ b/bin/2013-kieker-days/only_r.sh
@@ -3,8 +3,8 @@
 JAVABIN=""
 
 R_SCRIPT_DIR=bin/r-scripts/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/ffi-exp/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/ffi-exp/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
diff --git a/bin/2014-icpe/benchmark-disk-writer-slow.sh b/bin/2014-icpe/benchmark-disk-writer-slow.sh
index 07671a1..0b361ff 100644
--- a/bin/2014-icpe/benchmark-disk-writer-slow.sh
+++ b/bin/2014-icpe/benchmark-disk-writer-slow.sh
@@ -3,7 +3,7 @@
 JAVA_BIN="/localhome/ffi/jdk1.7.0_25/bin/java"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
+BASE_DIR=./
 RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-disk-slow/"
 
 SLEEP_TIME=30            ## 30
diff --git a/bin/2014-icpe/benchmark-disk-writer.sh b/bin/2014-icpe/benchmark-disk-writer.sh
index 6127a94..175fcc0 100644
--- a/bin/2014-icpe/benchmark-disk-writer.sh
+++ b/bin/2014-icpe/benchmark-disk-writer.sh
@@ -3,8 +3,8 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
-RESULTS_DIR="${BASEDIR}tmp/results-benchmark-disk/"
+BASE_DIR=./
+RESULTS_DIR="${BASE_DIR}tmp/results-benchmark-disk/"
 
 SLEEPTIME=30            ## 30
 NUM_LOOPS=10            ## 10
@@ -24,8 +24,8 @@ echo "Removing and recreating '${RESULTS_DIR}'"
 mkdir ${RESULTS_DIR}stat/
 
 # Clear kieker.log and initialize logging
-rm -f ${BASEDIR}kieker.log
-touch ${BASEDIR}kieker.log
+rm -f ${BASE_DIR}kieker.log
+touch ${BASE_DIR}kieker.log
 
 RAWFN="${RESULTS_DIR}raw"
 
@@ -39,12 +39,12 @@ JAVA_ARGS="${JAVA_ARGS} -verbose:gc -XX:+PrintCompilation"
 JAR="-jar dist/OverheadEvaluationMicrobenchmarkKieker.jar"
 
 JAVA_ARGS_NOINSTR="${JAVA_ARGS}"
-JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASEDIR}lib/kieker-1.8-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
+JAVA_ARGS_LTW="${JAVA_ARGS} -javaagent:${BASE_DIR}lib/kieker-1.8-SNAPSHOT_aspectj.jar -Dorg.aspectj.weaver.showWeaveInfo=false -Daj.weaving.verbose=false -Dkieker.monitoring.adaptiveMonitoring.enabled=false -Dorg.aspectj.weaver.loadtime.configuration=META-INF/kieker.aop.xml"
 JAVA_ARGS_KIEKER_DEACTV="${JAVA_ARGS_LTW} -Dkieker.monitoring.enabled=false -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
 JAVA_ARGS_KIEKER_NOLOGGING="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.DummyWriter"
-JAVA_ARGS_KIEKER_LOGGING1="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASEDIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.QueueFullBehavior=1"
-JAVA_ARGS_KIEKER_LOGGING2="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryZipWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.customStoragePath=${BASEDIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.QueueFullBehavior=1"
-JAVA_ARGS_KIEKER_LOGGING3="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASEDIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.QueueFullBehavior=1"
+JAVA_ARGS_KIEKER_LOGGING1="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryFsWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.customStoragePath=${BASE_DIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncBinaryFsWriter.QueueFullBehavior=1"
+JAVA_ARGS_KIEKER_LOGGING2="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncBinaryZipWriter -Dkieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.customStoragePath=${BASE_DIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncBinaryZipWriter.QueueFullBehavior=1"
+JAVA_ARGS_KIEKER_LOGGING3="${JAVA_ARGS_LTW} -Dkieker.monitoring.writer=kieker.monitoring.writer.filesystem.AsyncFsWriter -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.customStoragePath=${BASE_DIR}tmp -Dkieker.monitoring.writer.filesystem.AsyncFsWriter.QueueFullBehavior=1"
 
 ## Write configuration
 uname -a >${RESULTS_DIR}configuration.txt
@@ -66,12 +66,12 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     j=${RECURSIONDEPTH}
     k=0
     echo "## Starting iteration ${i}/${NUM_LOOPS}"
-    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASEDIR}kieker.log
+    echo "## Starting iteration ${i}/${NUM_LOOPS}" >>${BASE_DIR}kieker.log
 
     # No instrumentation
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No instrumentation"
-    echo " # ${i}.${j}.${k} No instrumentation" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No instrumentation" >>${BASE_DIR}kieker.log
     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 &
@@ -85,16 +85,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Deactivated probe
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Deactivated probe"
-    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Deactivated probe" >>${BASE_DIR}kieker.log
     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 &
@@ -108,16 +108,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # No logging
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} No logging (null writer)"
-    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} No logging (null writer)" >>${BASE_DIR}kieker.log
     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 &
@@ -131,16 +131,16 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging 1
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 1"
-    echo " # ${i}.${j}.${k} Logging 1" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging 1" >>${BASE_DIR}kieker.log
     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 &
@@ -154,17 +154,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging 2
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 2"
-    echo " # ${i}.${j}.${k} Logging 2" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging 2" >>${BASE_DIR}kieker.log
     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 &
@@ -178,17 +178,17 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
     # Logging 3
     k=`expr ${k} + 1`
     echo " # ${i}.${j}.${k} Logging 3"
-    echo " # ${i}.${j}.${k} Logging 3" >>${BASEDIR}kieker.log
+    echo " # ${i}.${j}.${k} Logging 3" >>${BASE_DIR}kieker.log
     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 &
@@ -202,19 +202,19 @@ for ((i=1;i<=${NUM_LOOPS};i+=1)); do
     kill %mpstat
     kill %vmstat
     kill %iostat
-    rm -rf ${BASEDIR}tmp/kieker-*
-    [ -f ${BASEDIR}hotspot.log ] && mv ${BASEDIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
-    echo >>${BASEDIR}kieker.log
-    echo >>${BASEDIR}kieker.log
+    rm -rf ${BASE_DIR}tmp/kieker-*
+    [ -f ${BASE_DIR}hotspot.log ] && mv ${BASE_DIR}hotspot.log ${RESULTS_DIR}hotspot-${i}-${j}-${k}.log
+    echo >>${BASE_DIR}kieker.log
+    echo >>${BASE_DIR}kieker.log
     sync
     sleep ${SLEEPTIME}
 
 done
 zip -jqr ${RESULTS_DIR}stat.zip ${RESULTS_DIR}stat
 rm -rf ${RESULTS_DIR}stat/
-mv ${BASEDIR}kieker.log ${RESULTS_DIR}kieker.log
+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 ${BASEDIR}errorlog.txt ] && mv ${BASEDIR}errorlog.txt ${RESULTS_DIR}
+[ -f ${BASE_DIR}errorlog.txt ] && mv ${BASE_DIR}errorlog.txt ${RESULTS_DIR}
 
 ## Generate Results file
 # Timeseries
@@ -283,4 +283,4 @@ EOF
 ## Clean up raw results
 zip -jqr ${RESULTS_DIR}results.zip ${RAWFN}*
 rm -f ${RAWFN}*
-[ -f ${BASEDIR}nohup.out ] && mv ${BASEDIR}nohup.out ${RESULTS_DIR}
+[ -f ${BASE_DIR}nohup.out ] && mv ${BASE_DIR}nohup.out ${RESULTS_DIR}
diff --git a/bin/2014-icpe/benchmark-tcp-kieker.sh b/bin/2014-icpe/benchmark-tcp-kieker.sh
index d26112e..be06e17 100644
--- a/bin/2014-icpe/benchmark-tcp-kieker.sh
+++ b/bin/2014-icpe/benchmark-tcp-kieker.sh
@@ -3,7 +3,7 @@
 JAVABIN="/localhome/ffi/jdk1.7.0_25/bin/"
 
 R_SCRIPT_DIR=bin/icpe/r/
-BASEDIR=./
+BASE_DIR=./
 RESULTS_DIR="${BASE_DIR}/tmp/results-benchmark-tcp-kieker/"
 
 SLEEP_TIME=30            ## 30
diff --git a/frameworks/OpenTelemetry/benchmark.sh b/frameworks/OpenTelemetry/benchmark.sh
index 0ecd2ee..19bb214 100644
--- a/frameworks/OpenTelemetry/benchmark.sh
+++ b/frameworks/OpenTelemetry/benchmark.sh
@@ -13,24 +13,24 @@ function startJaeger {
 }
 
 function cleanup {
-	[ -f ${BASE_DIR}/hotspot.log ] && mv ${BASE_DIR}/hotspot.log ${RESULTS_DIR}/hotspot-${i}-$RECURSION_DEPTH-${k}.log
-	echo >>${BASE_DIR}/OpenTelemetry.log
-	echo >>${BASE_DIR}/OpenTelemetry.log
+	[ -f "${BASE_DIR}/hotspot.log" ] && mv "${BASE_DIR}/hotspot.log" "${RESULTS_DIR}/hotspot-${i}-$RECURSION_DEPTH-${k}.log"
+	echo >> "${BASE_DIR}/OpenTelemetry.log"
+	echo >> "${BASE_DIR}/OpenTelemetry.log"
 	sync
-	sleep ${SLEEP_TIME}
+	sleep "${SLEEP_TIME}"
 }
 
 function runNoInstrumentation {
     # No instrumentation
-    echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
-    echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
+    echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
+    echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
     ${JAVA_BIN} ${JAVA_ARGS_NOINSTR} ${JAR} \
         --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
         --recursion-depth $RECURSION_DEPTH \
-        ${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+        ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
 }
 
 function runOpenTelemetryNoLogging {
@@ -39,19 +39,19 @@ function runOpenTelemetryNoLogging {
     echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
     echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
     ${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_LOGGING_DEACTIVATED} ${JAR} \
-        --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
+        --output-filename "${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv" \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
         --method-time ${METHOD_TIME} \
         --total-threads ${THREADS} \
-        --recursion-depth $RECURSION_DEPTH \
-        ${MORE_PARAMS} &> ${RESULTS_DIR}/output_"$i"_"$RECURSION_DEPTH"_$k.txt
+        --recursion-depth ${RECURSION_DEPTH} \
+        ${MORE_PARAMS} &> "${RESULTS_DIR}/output_${i}_${RECURSION_DEPTH}_${k}.txt"
 }
 
 function runOpenTelemetryLogging {
     # OpenTelemetry Instrumentation Logging
     k=`expr ${k} + 1`
-    echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]}
-    echo " # ${i}.$RECURSION_DEPTH.${k} "${TITLE[$k]} >>${BASE_DIR}/OpenTelemetry.log
+    echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}"
+    echo " # ${i}.$RECURSION_DEPTH.${k} ${TITLE[$k]}" >> "${BASE_DIR}/OpenTelemetry.log"
     ${JAVA_BIN} ${JAVA_ARGS_OPENTELEMETRY_LOGGING} ${JAR} \
         --output-filename ${RAWFN}-${i}-$RECURSION_DEPTH-${k}.csv \
         --total-calls ${TOTAL_NUM_OF_CALLS} \
@@ -195,3 +195,5 @@ mv ${BASE_DIR}/OpenTelemetry.log ${RESULTS_DIR}/OpenTelemetry.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}
 
+# end
+
diff --git a/frameworks/OpenTelemetry/runExponentialSizes.sh b/frameworks/OpenTelemetry/runExponentialSizes.sh
index 90a6bee..9f0c430 100644
--- a/frameworks/OpenTelemetry/runExponentialSizes.sh
+++ b/frameworks/OpenTelemetry/runExponentialSizes.sh
@@ -7,6 +7,6 @@ for depth in 2 4 8 16 32 64 128
 do
 	export RECURSION_DEPTH=$depth
 	echo "Running $depth"
-	./benchmark.sh &> ${RESULTS_DIR}/$depth.txt
-	mv ${RESULTS_DIR}/results.zip ${RESULTS_DIR}/results-$RECURSION_DEPTH.zip
+	./benchmark.sh &> "${RESULTS_DIR}/$depth.txt"
+	mv "${RESULTS_DIR}/results.zip" "${RESULTS_DIR}/results-$RECURSION_DEPTH.zip"
 done
diff --git a/frameworks/SPASSmeter/benchmark-causes.sh b/frameworks/SPASSmeter/benchmark-causes.sh
index e2efe8d..149f82a 100644
--- a/frameworks/SPASSmeter/benchmark-causes.sh
+++ b/frameworks/SPASSmeter/benchmark-causes.sh
@@ -3,7 +3,7 @@
 
 JAVA_BIN=""
 
-RSCRIPT_DIR=r
+R_SCRIPT_DIR=r
 BASE_DIR=.
 RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter"
 
diff --git a/frameworks/SPASSmeter/benchmark-tcp.sh b/frameworks/SPASSmeter/benchmark-tcp.sh
index 9169cd8..7525fa7 100644
--- a/frameworks/SPASSmeter/benchmark-tcp.sh
+++ b/frameworks/SPASSmeter/benchmark-tcp.sh
@@ -4,7 +4,7 @@
 JAVABIN=""
 
 R_SCRIPT_DIR=r/
-BASEDIR=./
+BASE_DIR=./
 RESULTS_DIR="${BASE_DIR}/tmp/results-spassmeter/"
 
 SLEEPTIME=30           ## 30
-- 
GitLab