diff --git a/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java b/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java
index 1868667..c24d08d 100644
--- a/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java
+++ b/src/main/java/de/hsrm/compiler/Klang/ContextAnalysis.java
@@ -5,7 +5,7 @@ import java.util.HashSet;
 
 import de.hsrm.compiler.Klang.nodes.*;
 import de.hsrm.compiler.Klang.nodes.expressions.*;
-import de.hsrm.compiler.Klang.nodes.loops.doWhileLoop;
+import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop;
 import de.hsrm.compiler.Klang.nodes.loops.whileLoop;
 import de.hsrm.compiler.Klang.nodes.statements.*;
 import de.hsrm.compiler.Klang.types.Type;
@@ -70,7 +70,7 @@ public class ContextAnalysis extends KlangBaseVisitor<Node> {
   public Node visitDoWhileLoop(KlangParser.DoWhileLoopContext ctx) {
     Node condition = this.visit(ctx.cond);
     Node block = this.visit(ctx.braced_block());
-    return new doWhileLoop((Expression) condition, (Block) block);
+    return new DoWhileLoop((Expression) condition, (Block) block);
   }
 
 
diff --git a/src/main/java/de/hsrm/compiler/Klang/nodes/loops/doWhileLoop.java b/src/main/java/de/hsrm/compiler/Klang/nodes/loops/DoWhileLoop.java
similarity index 82%
rename from src/main/java/de/hsrm/compiler/Klang/nodes/loops/doWhileLoop.java
rename to src/main/java/de/hsrm/compiler/Klang/nodes/loops/DoWhileLoop.java
index f5f8d1d..360369e 100644
--- a/src/main/java/de/hsrm/compiler/Klang/nodes/loops/doWhileLoop.java
+++ b/src/main/java/de/hsrm/compiler/Klang/nodes/loops/DoWhileLoop.java
@@ -5,13 +5,13 @@ import de.hsrm.compiler.Klang.nodes.statements.Statement;;
 import de.hsrm.compiler.Klang.nodes.expressions.Expression;
 import de.hsrm.compiler.Klang.visitors.Visitor;
 
-public class doWhileLoop extends Statement {
+public class DoWhileLoop extends Statement {
 
     public Expression cond;
     public Block block;
     public Block alt;
 
-    public doWhileLoop(Expression cond, Block block) {
+    public DoWhileLoop(Expression cond, Block block) {
         this.cond = cond;
         this.block = block;
     }
diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java
index 777b923..223ddd2 100644
--- a/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java
+++ b/src/main/java/de/hsrm/compiler/Klang/visitors/EvalVisitor.java
@@ -8,7 +8,7 @@ import de.hsrm.compiler.Klang.nodes.Block;
 import de.hsrm.compiler.Klang.nodes.FunctionDefinition;
 import de.hsrm.compiler.Klang.nodes.Program;
 import de.hsrm.compiler.Klang.nodes.expressions.*;
-import de.hsrm.compiler.Klang.nodes.loops.doWhileLoop;
+import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop;
 import de.hsrm.compiler.Klang.nodes.loops.whileLoop;
 import de.hsrm.compiler.Klang.nodes.statements.*;
 
@@ -165,7 +165,7 @@ public class EvalVisitor implements Visitor<Value> {
   }
 
   @Override
-  public Value visit(doWhileLoop e) {
+  public Value visit(DoWhileLoop e) {
     Value condition = e.cond.welcome(this);
     Value result = null;
     do {
diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java b/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java
index 68cee1e..63a1384 100644
--- a/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java
+++ b/src/main/java/de/hsrm/compiler/Klang/visitors/GenASM.java
@@ -8,7 +8,7 @@ import java.util.TreeSet;
 
 import de.hsrm.compiler.Klang.nodes.*;
 import de.hsrm.compiler.Klang.nodes.expressions.*;
-import de.hsrm.compiler.Klang.nodes.loops.doWhileLoop;
+import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop;
 import de.hsrm.compiler.Klang.nodes.loops.whileLoop;
 import de.hsrm.compiler.Klang.nodes.statements.*;
 
@@ -308,7 +308,7 @@ public class GenASM implements Visitor<Void> {
 
 
   @Override
-  public Void visit(doWhileLoop e) {
+  public Void visit(DoWhileLoop e) {
     int lblStart = ++lCount;
     this.ex.write(".L" + lblStart + ":\n");
     e.block.welcome(this);
diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java b/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java
index 98f1503..1fca9b3 100644
--- a/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java
+++ b/src/main/java/de/hsrm/compiler/Klang/visitors/GetVars.java
@@ -4,7 +4,7 @@ import java.util.Set;
 
 import de.hsrm.compiler.Klang.nodes.*;
 import de.hsrm.compiler.Klang.nodes.expressions.*;
-import de.hsrm.compiler.Klang.nodes.loops.doWhileLoop;
+import de.hsrm.compiler.Klang.nodes.loops.DoWhileLoop;
 import de.hsrm.compiler.Klang.nodes.loops.whileLoop;
 import de.hsrm.compiler.Klang.nodes.statements.*;
 
@@ -129,7 +129,7 @@ class GetVars implements Visitor<Void> {
   }
 
   @Override
-  public Void visit(doWhileLoop e) {
+  public Void visit(DoWhileLoop e) {
     e.cond.welcome(this);
     e.block.welcome(this);
     return null;
diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java
index bdc23ca..37a3da7 100644
--- a/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java
+++ b/src/main/java/de/hsrm/compiler/Klang/visitors/PrettyPrintVisitor.java
@@ -215,7 +215,7 @@ public class PrettyPrintVisitor implements Visitor<Void> {
   }
 
   @Override
-  public Void visit(doWhileLoop e) {
+  public Void visit(DoWhileLoop e) {
     ex.write("do ");
     e.block.welcome(this);
     ex.write(" while (");
diff --git a/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java b/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java
index a25a265..ae12485 100644
--- a/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java
+++ b/src/main/java/de/hsrm/compiler/Klang/visitors/Visitor.java
@@ -24,7 +24,7 @@ public interface Visitor<R> {
     R visit(NegateExpression e);
     R visit(IfStatement e);
     R visit(whileLoop e);
-    R visit(doWhileLoop e);
+    R visit(DoWhileLoop e);
     R visit(PrintStatement e);
     R visit(VariableDeclaration e);
     R visit(VariableAssignment e);