diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 540b21fa2a869b37f1f36cb558a13cff43e0276c..60b03d3a9cf6bcb609a9b4cb3e799ef0f5dde477 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Thu Apr 16 10:58:21 CEST 2015
+#Mon Apr 20 12:33:48 CEST 2015
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/teetime/framework/Analysis.java b/src/main/java/teetime/framework/Analysis.java
index dfbc4bbb472f3cce5b734574f73556ab83ea7477..7ae760cb15cf3cea4b7a63a59cbfb2a5eeddcc66 100644
--- a/src/main/java/teetime/framework/Analysis.java
+++ b/src/main/java/teetime/framework/Analysis.java
@@ -320,7 +320,7 @@ public final class Analysis<T extends AnalysisConfiguration> implements Uncaught
 	}
 
 	private Set<Stage> traverseIntraStages(final Stage stage) {
-		final Traversor traversor = new Traversor(new IntraStageVisitor());
+		final Traversor traversor = new Traversor(new IntraStageCollector());
 		traversor.traverse(stage);
 		return traversor.getVisitedStage();
 	}
diff --git a/src/main/java/teetime/framework/IStageVisitor.java b/src/main/java/teetime/framework/IPipeVisitor.java
similarity index 91%
rename from src/main/java/teetime/framework/IStageVisitor.java
rename to src/main/java/teetime/framework/IPipeVisitor.java
index e6ff08c7b3d9a0da7d3510e1310af190dd6a508d..00daeaa15d84f7966725948574d32f9c1d1125ce 100644
--- a/src/main/java/teetime/framework/IStageVisitor.java
+++ b/src/main/java/teetime/framework/IPipeVisitor.java
@@ -17,12 +17,12 @@ package teetime.framework;
 
 import teetime.framework.pipe.IPipe;
 
-public interface IStageVisitor {
+public interface IPipeVisitor {
 
 	public enum VisitorBehavior {
 		CONTINUE, STOP
 	}
 
-	VisitorBehavior visit(IPipe inputPipe);
+	VisitorBehavior visit(IPipe outputPipe);
 
 }
diff --git a/src/main/java/teetime/framework/IntraStageVisitor.java b/src/main/java/teetime/framework/IntraStageCollector.java
similarity index 80%
rename from src/main/java/teetime/framework/IntraStageVisitor.java
rename to src/main/java/teetime/framework/IntraStageCollector.java
index b3dba3954ad6bbef4529a5dda4e5d2495aa6a716..fb889d74f3e8ba3ca7b67ff0e64b9db89600b8f0 100644
--- a/src/main/java/teetime/framework/IntraStageVisitor.java
+++ b/src/main/java/teetime/framework/IntraStageCollector.java
@@ -17,13 +17,13 @@ package teetime.framework;
 
 import teetime.framework.pipe.IPipe;
 
-public class IntraStageVisitor implements IStageVisitor {
+public class IntraStageCollector implements IPipeVisitor {
 
-	public IntraStageVisitor() {}
+	public IntraStageCollector() {}
 
 	@Override
-	public VisitorBehavior visit(final IPipe inputPipe) {
-		if (inputPipe instanceof AbstractIntraThreadPipe) {
+	public VisitorBehavior visit(final IPipe outputPipe) {
+		if (outputPipe instanceof AbstractIntraThreadPipe) {
 			return VisitorBehavior.CONTINUE;
 		}
 		return VisitorBehavior.STOP;
diff --git a/src/main/java/teetime/framework/Traversor.java b/src/main/java/teetime/framework/Traversor.java
index f81aaefda3988d82ec88ac3f9ba85d45b1b7fe7a..82ac218e31b10d93a25de53ead1f845b94a333c5 100644
--- a/src/main/java/teetime/framework/Traversor.java
+++ b/src/main/java/teetime/framework/Traversor.java
@@ -18,20 +18,19 @@ package teetime.framework;
 import java.util.HashSet;
 import java.util.Set;
 
-import teetime.framework.IStageVisitor.VisitorBehavior;
+import teetime.framework.IPipeVisitor.VisitorBehavior;
 import teetime.framework.pipe.IPipe;
 
 public class Traversor {
 
-	private final IStageVisitor stageVisitor;
+	private final IPipeVisitor pipeVisitor;
 	private final Set<Stage> visitedStage = new HashSet<Stage>();
 
-	public Traversor(final IStageVisitor stageVisitor) {
-		this.stageVisitor = stageVisitor;
+	public Traversor(final IPipeVisitor pipeVisitor) {
+		this.pipeVisitor = pipeVisitor;
 	}
 
 	public void traverse(final Stage stage) {
-
 		if (!visitedStage.add(stage)) {
 			return;
 		}
@@ -39,7 +38,7 @@ public class Traversor {
 		OutputPort<?>[] outputPorts = stage.getOutputPorts();
 		for (OutputPort<?> outputPort : outputPorts) {
 			IPipe pipe = outputPort.getPipe();
-			if (null != pipe && stageVisitor.visit(pipe) == VisitorBehavior.CONTINUE) {
+			if (null != pipe && pipeVisitor.visit(pipe) == VisitorBehavior.CONTINUE) {
 				Stage owningStage = pipe.getTargetPort().getOwningStage();
 				traverse(owningStage); // recursive call
 			}
diff --git a/src/test/java/teetime/framework/TraversorTest.java b/src/test/java/teetime/framework/TraversorTest.java
index 8427febdef0106495214796a2e2a3edfbc4352cf..14d168e13f61e524582f77c2c7b01c6b733b0b9d 100644
--- a/src/test/java/teetime/framework/TraversorTest.java
+++ b/src/test/java/teetime/framework/TraversorTest.java
@@ -38,7 +38,7 @@ import teetime.stage.util.CountingMap;
 
 public class TraversorTest {
 
-	private final Traversor traversor = new Traversor(new IntraStageVisitor());
+	private final Traversor traversor = new Traversor(new IntraStageCollector());
 
 	@Test
 	public void traverse() {