diff --git a/src/main/java/teetime/framework/Pipeline.java b/src/main/java/teetime/framework/Pipeline.java
index e6752171d3473bfe83a7480d07b1f5bb6f1ee0fb..9453c2a656d254edcdaa40ddc817b03c7b27da47 100644
--- a/src/main/java/teetime/framework/Pipeline.java
+++ b/src/main/java/teetime/framework/Pipeline.java
@@ -26,7 +26,7 @@ import java.util.List;
  *            the type of the last stage in this pipeline
  */
 // TODO Consider to move it in the framework
-public final class Pipeline<L extends AbstractStage> extends AbstractCompositeStage {
+public final class Pipeline<L extends AbstractStage> extends CompositeStage {
 
 	private final AbstractStage firstStage;
 	private final List<L> lastStages = new LinkedList<L>();
diff --git a/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java b/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
index 8147158253a488534c07a8df9eecfabccddf4930..51d8d1c91e2f8a342941820883a6e6c536b08575 100644
--- a/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/Dir2RecordsFilter.java
@@ -17,7 +17,7 @@ package teetime.stage.io.filesystem;
 
 import java.io.File;
 
-import teetime.framework.AbstractCompositeStage;
+import teetime.framework.CompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.AbstractStage;
@@ -38,7 +38,7 @@ import kieker.common.util.filesystem.FSUtil;
  *
  * @since 1.0
  */
-public final class Dir2RecordsFilter extends AbstractCompositeStage {
+public final class Dir2RecordsFilter extends CompositeStage {
 
 	private final ClassNameRegistryCreationFilter classNameRegistryCreationFilter;
 	private final Merger<IMonitoringRecord> recordMerger;
diff --git a/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
index b21c5321998b5679294c03ea0923655374d61010..f8cdb52d87e68f338fff857e0884aa9537d825ea 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/binary/DirWithBin2RecordFilter.java
@@ -17,7 +17,7 @@ package teetime.stage.io.filesystem.format.binary;
 
 import java.io.File;
 
-import teetime.framework.AbstractCompositeStage;
+import teetime.framework.CompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.AbstractStage;
@@ -27,7 +27,7 @@ import teetime.stage.io.filesystem.format.binary.file.BinaryFile2RecordFilter;
 
 import kieker.common.record.IMonitoringRecord;
 
-public class DirWithBin2RecordFilter extends AbstractCompositeStage {
+public class DirWithBin2RecordFilter extends CompositeStage {
 
 	private final ClassNameRegistryCreationFilter classNameRegistryCreationFilter;
 	private final BinaryFile2RecordFilter binaryFile2RecordFilter;
diff --git a/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java b/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
index b5cb62c14b2e1d484f37ff96c1ee8bca1fe119d6..55d6a77f0a2aa7941afa713cefc85e5490a46dda 100644
--- a/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
+++ b/src/main/java/teetime/stage/io/filesystem/format/text/file/DatFile2RecordFilter.java
@@ -17,7 +17,7 @@ package teetime.stage.io.filesystem.format.text.file;
 
 import java.io.File;
 
-import teetime.framework.AbstractCompositeStage;
+import teetime.framework.CompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.AbstractStage;
@@ -31,7 +31,7 @@ import kieker.common.record.IMonitoringRecord;
  *
  * @since 1.10
  */
-public class DatFile2RecordFilter extends AbstractCompositeStage {
+public class DatFile2RecordFilter extends CompositeStage {
 
 	private final File2TextLinesFilter file2TextLinesFilter;
 	private final TextLine2RecordFilter textLine2RecordFilter;
diff --git a/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java b/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
index 073ce19955cbe90d8c9b8a8e2cfcb2f70d36dbec..61801171eb5a31c836ae4142bcc2d3a166336464 100644
--- a/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
+++ b/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import kieker.common.record.IMonitoringRecord;
 
-import teetime.framework.AbstractCompositeStage;
+import teetime.framework.CompositeStage;
 import teetime.framework.AbstractStage;
 import teetime.framework.Configuration;
 import teetime.framework.Execution;
@@ -42,7 +42,7 @@ public class Dir2RecordsFilterTest {
 		}
 	}
 
-	class ReadingComposite extends AbstractCompositeStage {
+	class ReadingComposite extends CompositeStage {
 
 		private final InitialElementProducer<File> producer;
 		private final Dir2RecordsFilter reader;