diff --git a/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java b/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
index 5ede4e0668b1d26aae6feba637ff78f8a7c4a9e8..67859b98eb76a6adbf8f5b57e1b38879cf9c59ba 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/AbstractDotWriter.java
@@ -7,14 +7,14 @@ import kieker.analysis.graph.Edge;
 import kieker.analysis.graph.Graph;
 import kieker.analysis.graph.Vertex;
 import kieker.analysis.graph.export.AbstractWriter;
-import kieker.analysis.graph.util.dot.DotWriter;
+import kieker.analysis.graph.util.dot.DotGraphWriter;
 
 //TODo rename, extends AbstractWriter
 class AbstractDotWriter extends AbstractWriter {
 
-	protected final DotWriter dotWriter;
+	protected final DotGraphWriter dotWriter;
 
-	protected AbstractDotWriter(final Graph graph, final DotWriter dotWriter) {
+	protected AbstractDotWriter(final Graph graph, final DotGraphWriter dotWriter) {
 		super(graph);
 		this.dotWriter = dotWriter;
 	}
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java b/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
index 514182bd14f9d641a123723e89aae13feecc1ee9..fa8b2a2af901ad742fdf991fea137f446b236593 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/DotSubgraphWriter.java
@@ -7,14 +7,14 @@ import kieker.analysis.graph.Edge;
 import kieker.analysis.graph.Graph;
 import kieker.analysis.graph.Vertex;
 import kieker.analysis.graph.export.AbstractTransformer;
-import kieker.analysis.graph.util.dot.DotWriter;
+import kieker.analysis.graph.util.dot.DotGraphWriter;
 
 //TODO not used
 class DotSubgraphWriter extends AbstractTransformer<Void> {
 
-	private final DotWriter dotWriter;
+	private final DotGraphWriter dotWriter;
 
-	protected DotSubgraphWriter(final Graph graph, final DotWriter dotWriter) {
+	protected DotSubgraphWriter(final Graph graph, final DotGraphWriter dotWriter) {
 		super(graph);
 		this.dotWriter = dotWriter;
 	}
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java b/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
index ed83a3cfc3a3063b054806166c02994f8b8c49e3..c1ba90a7f94ec45413dbb33fa8f2be0575e3867d 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/DotWriter2.java
@@ -4,13 +4,13 @@ import java.io.IOException;
 import java.io.Writer;
 
 import kieker.analysis.graph.Graph;
-import kieker.analysis.graph.util.dot.DotWriter;
+import kieker.analysis.graph.util.dot.DotGraphWriter;
 
 //TODO rename
 public class DotWriter2 extends AbstractDotWriter {
 
 	public DotWriter2(final Graph graph, final Writer writer) {
-		super(graph, new DotWriter(writer));
+		super(graph, new DotGraphWriter(writer));
 	}
 
 	// TODO does not work so far
diff --git a/src/main/java/kieker/analysis/graph/util/dot/DotWriter.java b/src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java
similarity index 95%
rename from src/main/java/kieker/analysis/graph/util/dot/DotWriter.java
rename to src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java
index cbc13ca4e750ffc457e8ec327fecb8b52365a104..087e09ccf6c433ee2e8133c19f0b59281523aa95 100644
--- a/src/main/java/kieker/analysis/graph/util/dot/DotWriter.java
+++ b/src/main/java/kieker/analysis/graph/util/dot/DotGraphWriter.java
@@ -13,7 +13,7 @@ import kieker.analysis.graph.util.IndentWriter;
  * @author Sören Henning
  *
  */
-public class DotWriter {
+public class DotGraphWriter {
 
 	private final IndentWriter writer;
 	private DotWriterState state = DotWriterState.CREATED;
@@ -21,7 +21,7 @@ public class DotWriter {
 
 	private DotGraphType graphType = DotGraphType.DIRECTED;
 
-	public DotWriter(final Writer writer) {
+	public DotGraphWriter(final Writer writer) {
 		this.writer = new IndentWriter(writer);
 	}
 
diff --git a/src/main/java/kieker/analysis/util/DotBuilder.java b/src/main/java/kieker/analysis/util/DotBuilder.java
index f4944902ee84594547f0ac92db9623afbe5a9db2..22dd04b4ca32f91f976cf8c1dca60da0f114705b 100644
--- a/src/main/java/kieker/analysis/util/DotBuilder.java
+++ b/src/main/java/kieker/analysis/util/DotBuilder.java
@@ -9,7 +9,7 @@ import com.google.common.base.Joiner;
 /**
  * Simple class for building and representing dot graph files.
  *
- * @deprecated use {@link dot.DotWriter} instead.
+ * @deprecated use {@link DotGraphWriter.DotWriter} instead.
  *
  * @author Sören Henning
  *