diff --git a/src/main/java/kieker/analysis/dev/DependencyCreator.java b/src/main/java/kieker/analysis/dev/SoftwareSystemCreator.java
similarity index 92%
rename from src/main/java/kieker/analysis/dev/DependencyCreator.java
rename to src/main/java/kieker/analysis/dev/SoftwareSystemCreator.java
index 6a30da11eb30e5bbb941d751f0ca44581043b2df..6b5698323b53fef573144dbde2e5065c6446fa9b 100644
--- a/src/main/java/kieker/analysis/dev/DependencyCreator.java
+++ b/src/main/java/kieker/analysis/dev/SoftwareSystemCreator.java
@@ -8,11 +8,11 @@ import kieker.analysis.domain.systemdependency.SoftwareSystem;
 import kieker.analysis.trace.traversal.OperationCallVisitor;
 
 //TODO Rename
-public class DependencyCreator extends OperationCallVisitor<AggregatedOperationCall> {
+public class SoftwareSystemCreator extends OperationCallVisitor<AggregatedOperationCall> {
 
 	private final SoftwareSystem softwareSystem;
 
-	public DependencyCreator(final SoftwareSystem softwareSystem) {
+	public SoftwareSystemCreator(final SoftwareSystem softwareSystem) {
 		this.softwareSystem = softwareSystem;
 	}
 
diff --git a/src/main/java/kieker/analysis/dev/SoftwareSystemCreatorStage.java b/src/main/java/kieker/analysis/dev/SoftwareSystemCreatorStage.java
index f4ea474cbfb3fb53a52f8eb54fb57ffe48a2d73e..cad5108a9134b32bccd8bcf1fa9bb75f31f009a7 100644
--- a/src/main/java/kieker/analysis/dev/SoftwareSystemCreatorStage.java
+++ b/src/main/java/kieker/analysis/dev/SoftwareSystemCreatorStage.java
@@ -9,7 +9,7 @@ import teetime.stage.basic.AbstractTransformation;
 public class SoftwareSystemCreatorStage extends AbstractTransformation<AggregatedTrace, SoftwareSystem> {
 
 	private final SoftwareSystem softwareSystem = new SoftwareSystem();
-	private final DependencyCreator dependencyCreator = new DependencyCreator(softwareSystem);
+	private final SoftwareSystemCreator dependencyCreator = new SoftwareSystemCreator(softwareSystem);
 
 	@Override
 	protected void execute(final AggregatedTrace trace) {