diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Analysis.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Analysis.java
index ad9b44dd4474d90ef720f9a0d0c1eadc2bc27aaf..785751161c7a78460b7509615a401b4227067940 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Analysis.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Analysis.java
@@ -15,7 +15,7 @@ public class Analysis implements UncaughtExceptionHandler {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(Analysis.class);
 
-	private final Configuration configuration;
+	private final AnalysisConfiguration configuration;
 
 	private final List<Thread> consumerThreads = new LinkedList<Thread>();
 	private final List<Thread> finiteProducerThreads = new LinkedList<Thread>();
@@ -23,7 +23,7 @@ public class Analysis implements UncaughtExceptionHandler {
 
 	private final Collection<Pair<Thread, Throwable>> exceptions = new ConcurrentLinkedQueue<Pair<Thread, Throwable>>();
 
-	public Analysis(final Configuration configuration) {
+	public Analysis(final AnalysisConfiguration configuration) {
 		this.configuration = configuration;
 	}
 
@@ -93,7 +93,7 @@ public class Analysis implements UncaughtExceptionHandler {
 		return this.exceptions;
 	}
 
-	public Configuration getConfiguration() {
+	public AnalysisConfiguration getConfiguration() {
 		return this.configuration;
 	}
 
diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Configuration.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AnalysisConfiguration.java
similarity index 94%
rename from src/main/java/teetime/variant/methodcallWithPorts/framework/core/Configuration.java
rename to src/main/java/teetime/variant/methodcallWithPorts/framework/core/AnalysisConfiguration.java
index 97667505787dbd220f793f3dcf18d104fcb46bab..158cb892f5c59cced61467ffb83f6b866039a96f 100644
--- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/Configuration.java
+++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/AnalysisConfiguration.java
@@ -3,7 +3,7 @@ package teetime.variant.methodcallWithPorts.framework.core;
 import java.util.LinkedList;
 import java.util.List;
 
-public class Configuration {
+public class AnalysisConfiguration {
 
 	private final List<HeadStage> consumerStages = new LinkedList<HeadStage>();
 	private final List<HeadStage> finiteProducerStages = new LinkedList<HeadStage>();
diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/loopStage/LoopStageAnalysisConfiguration.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/loopStage/LoopStageAnalysisConfiguration.java
index 0ed395946272c756ff4856e4771fa9459022412f..8fd8a5ade876939a37654198e18060b642740e12 100644
--- a/src/test/java/teetime/variant/methodcallWithPorts/examples/loopStage/LoopStageAnalysisConfiguration.java
+++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/loopStage/LoopStageAnalysisConfiguration.java
@@ -1,10 +1,10 @@
 package teetime.variant.methodcallWithPorts.examples.loopStage;
 
-import teetime.variant.methodcallWithPorts.framework.core.Configuration;
+import teetime.variant.methodcallWithPorts.framework.core.AnalysisConfiguration;
 import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory;
 import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.ThreadCommunication;
 
-public class LoopStageAnalysisConfiguration extends Configuration {
+public class LoopStageAnalysisConfiguration extends AnalysisConfiguration {
 
 	public LoopStageAnalysisConfiguration() {
 		Countdown countdown = new Countdown(10);
diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/recordReader/RecordReaderConfiguration.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/recordReader/RecordReaderConfiguration.java
index 485c02816dcab1abfedc1e89d17de53d33aa6af1..39a18b2e0f6cb0d1b6e78a7c46ddaf2f20692b41 100644
--- a/src/test/java/teetime/variant/methodcallWithPorts/examples/recordReader/RecordReaderConfiguration.java
+++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/recordReader/RecordReaderConfiguration.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.util.LinkedList;
 import java.util.List;
 
-import teetime.variant.methodcallWithPorts.framework.core.Configuration;
+import teetime.variant.methodcallWithPorts.framework.core.AnalysisConfiguration;
 import teetime.variant.methodcallWithPorts.framework.core.HeadStage;
 import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory;
 import teetime.variant.methodcallWithPorts.framework.core.pipe.PipeFactory.PipeOrdering;
@@ -36,7 +36,7 @@ import kieker.common.record.IMonitoringRecord;
  *
  * @since 1.10
  */
-public class RecordReaderConfiguration extends Configuration {
+public class RecordReaderConfiguration extends AnalysisConfiguration {
 
 	private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>();
 	private final PipeFactory pipeFactory = PipeFactory.INSTANCE;
diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
index a04d5e919fbf535cbd6e223107568e1d79ba1520..06c17f0530f20da6eedc530b1c8e585ac64e90f1 100644
--- a/src/test/java/teetime/variant/methodcallWithPorts/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
+++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
@@ -8,7 +8,7 @@ import java.util.List;
 
 import teetime.util.concurrent.hashmap.ConcurrentHashMapWithDefault;
 import teetime.util.concurrent.hashmap.TraceBuffer;
-import teetime.variant.methodcallWithPorts.framework.core.Configuration;
+import teetime.variant.methodcallWithPorts.framework.core.AnalysisConfiguration;
 import teetime.variant.methodcallWithPorts.framework.core.HeadPipeline;
 import teetime.variant.methodcallWithPorts.framework.core.StageWithPort;
 import teetime.variant.methodcallWithPorts.framework.core.pipe.SingleElementPipe;
@@ -30,7 +30,7 @@ import kieker.common.record.IMonitoringRecord;
 import kieker.common.record.flow.IFlowRecord;
 import kieker.common.record.flow.trace.TraceMetadata;
 
-public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Configuration {
+public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends AnalysisConfiguration {
 
 	private static final int NUM_VIRTUAL_CORES = Runtime.getRuntime().availableProcessors();
 	private static final int MIO = 1000000;