--- a/src/ast/Expr.d	Tue Aug 12 18:21:06 2008 +0200
+++ b/src/ast/Expr.d	Tue Aug 12 19:05:17 2008 +0200
@@ -30,23 +30,23 @@
     ArrayLiteral asArrayLiteral() { return null; }
     bool isArrayLiteral() { return false; }
 
-    Assign asAssign() { return null; }
-    bool isAssign() { return false; }
+    AssignExp asAssignExp() { return null; }
+    bool isAssignExp() { return false; }
 
-    Binary asBinary() { return null; }
-    bool isBinary() { return false; }
+    BinaryExp asBinaryExp() { return null; }
+    bool isBinaryExp() { return false; }
 
-    Negate asNegate() { return null; }
-    bool isNegate() { return false; }
+    NegateExp asNegateExp() { return null; }
+    bool isNegateExp() { return false; }
 
-    Deref asDeref() { return null; }
-    bool isDeref() { return false; }
+    DerefExp asDerefExp() { return null; }
+    bool isDerefExp() { return false; }
 
-    AddressOf asAddressOf() { return null; }
-    bool isAddressOf() { return false; }
+    AddressOfExp asAddressOfExp() { return null; }
+    bool isAddressOfExp() { return false; }
 
-    Index asIndex() { return null; }
-    bool isIndex() { return false; }
+    IndexExp asIndexExp() { return null; }
+    bool isIndexExp() { return false; }
 
     Identifier asIdentifier() { return null; }
     bool isIdentifier() { return false; }
@@ -116,71 +116,71 @@
 }
 
 /**
-  The Assign expression contains two expression, a left and a right side, 
+  The AssignExp expression contains two expression, a left and a right side, 
   left being a lvalue, right being a rvalue. 
 
   If the right side ain't the same type as the left type, the right side will
   try to be promoted through an implicit cast. If this failes, an error must
   be given.
   */
-class Assign : Expr
+class AssignExp : Expr
 {
-    override Assign asAssign() { return this; }
-    override bool isAssign() { return true; }
+    override AssignExp asAssignExp() { return this; }
+    override bool isAssignExp() { return true; }
 
 private:
     Expr left, right;
 }
 
 /**
-  Binary
+  BinaryExp
   */
-class Binary : Expr
+class BinaryExp : Expr
 {
-    override Binary asBinary() { return this; }
-    override bool isBinary() { return true; }
+    override BinaryExp asBinaryExp() { return this; }
+    override bool isBinaryExp() { return true; }
 
 private:
     Expr left, right;
 }
 
 /**
-  Negate
+  NegateExp
   */
-class Negate : Expr
+class NegateExp : Expr
 {
-    override Negate asNegate() { return this; }
-    override bool isNegate() { return true; }
+    override NegateExp asNegateExp() { return this; }
+    override bool isNegateExp() { return true; }
 
 private:
     Expr expr;
 }
 
 /**
-  Deref
+  DerefExp
   */
-class Deref : Expr
+class DerefExp : Expr
 {
-    override Deref asDeref() { return this; }
-    override bool isDeref() { return true; }
+    override DerefExp asDerefExp() { return this; }
+    override bool isDerefExp() { return true; }
 }
 
 /**
-  AddressOf
+  AddressOfExp
   */
-class AddressOf : Expr
+class AddressOfExp : Expr
 {
-    override AddressOf asAddressOf() { return this; }
-    override bool isAddressOf() { return true; }
+    override AddressOfExp asAddressOfExp() { return this; }
+    override bool isAddressOfExp() { return true; }
 }
 
 /**
-  Index
+  IndexExp
   */
-class Index : Expr
+class IndexExp : Expr
 {
-    override Index asIndex() { return this; }
-    override bool isIndex() { return true; }
+    override IndexExp asIndexExp() { return this; }
+    override bool isIndexExp() { return true; }
 }
 
 /**