diff --git a/src/main/java/teetime/framework/CompositeStage.java b/src/main/java/teetime/framework/AbstractCompositeStage.java
similarity index 98%
rename from src/main/java/teetime/framework/CompositeStage.java
rename to src/main/java/teetime/framework/AbstractCompositeStage.java
index ea50ced3f6bf54b612b1fbe1fedf0d57e6deea33..d430d233f9933104c9e62bd9fd22a85e569755ed 100644
--- a/src/main/java/teetime/framework/CompositeStage.java
+++ b/src/main/java/teetime/framework/AbstractCompositeStage.java
@@ -33,7 +33,7 @@ import teetime.framework.validation.InvalidPortConnection;
  *
  */
 @SuppressWarnings("PMD.AbstractNaming")
-public abstract class CompositeStage extends Stage {
+public abstract class AbstractCompositeStage extends Stage {
 
 	private static final IPipeFactory INTRA_PIPE_FACTORY = PipeFactoryRegistry.INSTANCE
 			.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
diff --git a/src/main/java/teetime/stage/io/EveryXthPrinter.java b/src/main/java/teetime/stage/io/EveryXthPrinter.java
index a06f38d81fdf78f7dcd913f6f3be1491ad094f82..ab1648bce3fa9413d2967026828afcaaf92d3824 100644
--- a/src/main/java/teetime/stage/io/EveryXthPrinter.java
+++ b/src/main/java/teetime/stage/io/EveryXthPrinter.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import teetime.framework.CompositeStage;
+import teetime.framework.AbstractCompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.Stage;
@@ -27,7 +27,7 @@ import teetime.stage.EveryXthStage;
 import teetime.stage.basic.distributor.CopyByReferenceStrategy;
 import teetime.stage.basic.distributor.Distributor;
 
-public final class EveryXthPrinter<T> extends CompositeStage {
+public final class EveryXthPrinter<T> extends AbstractCompositeStage {
 
 	private final Distributor<T> distributor;
 	private final List<Stage> lastStages = new ArrayList<Stage>();
diff --git a/src/main/java/teetime/stage/string/WordCounter.java b/src/main/java/teetime/stage/string/WordCounter.java
index 263b1e5cb0a9fb2c66e540005ef2719f6eb49e63..57d196a5f440c09d83e33365a4a53831769a4adb 100644
--- a/src/main/java/teetime/stage/string/WordCounter.java
+++ b/src/main/java/teetime/stage/string/WordCounter.java
@@ -18,7 +18,7 @@ package teetime.stage.string;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import teetime.framework.CompositeStage;
+import teetime.framework.AbstractCompositeStage;
 import teetime.framework.InputPort;
 import teetime.framework.OutputPort;
 import teetime.framework.Stage;
@@ -34,7 +34,7 @@ import teetime.stage.util.CountingMap;
  * @author Nelson Tavares de Sousa
  *
  */
-public final class WordCounter extends CompositeStage {
+public final class WordCounter extends AbstractCompositeStage {
 
 	// This fields are needed for the methods to work.
 	private final Tokenizer tokenizer = new Tokenizer(" ");
diff --git a/src/performancetest/java/teetime/framework/OldPipeline.java b/src/performancetest/java/teetime/framework/OldPipeline.java
index 5ab88cb7cd09ccb228b163927a743582361c205e..2d666cdc5af96f178346e322348b8a715c3e5c58 100644
--- a/src/performancetest/java/teetime/framework/OldPipeline.java
+++ b/src/performancetest/java/teetime/framework/OldPipeline.java
@@ -20,7 +20,7 @@ import java.util.Collection;
 import java.util.List;
 
 @Deprecated
-public class OldPipeline<FirstStage extends Stage, LastStage extends Stage> extends CompositeStage {
+public class OldPipeline<FirstStage extends Stage, LastStage extends Stage> extends AbstractCompositeStage {
 
 	protected FirstStage firstStage;
 	private final List<LastStage> lastStages = new ArrayList<LastStage>();