4 files changed, 9 insertions, 9 deletions
diff --git a/test/expression/expr_pickle.py b/test/expression/expr_pickle.py
index 84ad0b9f..870f761a 100644
--- a/test/expression/expr_pickle.py
+++ b/test/expression/expr_pickle.py
@@ -1,5 +1,5 @@
 import pickle
-from miasm2.expression.expression import ExprInt, ExprAff, ExprId, \
+from miasm2.expression.expression import ExprInt, ExprAssign, ExprId, \
     Expr, ExprCompose, ExprMem
 
 
@@ -9,7 +9,7 @@ c = a + b
 d = ExprCompose(a, b)
 e = ExprMem(a, 32)
 f = a[:8]
-aff = ExprAff(a, b)
+aff = ExprAssign(a, b)
 
 
 print 'Pickling'
diff --git a/test/expression/expression.py b/test/expression/expression.py
index b998d4a5..1b39ab9f 100644
--- a/test/expression/expression.py
+++ b/test/expression/expression.py
@@ -61,12 +61,12 @@ for expr in [
         A + cst1,
         ExprCompose(A, cst1),
         A.msb(),
-        ExprAff(A, cst1),
+        ExprAssign(A, cst1),
 ]:
     print repr(expr)
     assert expr == eval(repr(expr))
 
 
-aff = ExprAff(A[0:32], cst1)
+aff = ExprAssign(A[0:32], cst1)
 
 assert aff.dst == A and aff.src == cst1
diff --git a/test/expression/parser.py b/test/expression/parser.py
index 1d5889fb..ccae49b0 100644
--- a/test/expression/parser.py
+++ b/test/expression/parser.py
@@ -1,6 +1,6 @@
 from miasm2.expression.parser import str_to_expr
 from miasm2.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \
-    ExprCond, ExprCompose, ExprOp, ExprAff, ExprLoc, LocKey
+    ExprCond, ExprCompose, ExprOp, ExprAssign, ExprLoc, LocKey
 
 for expr_test in [ExprInt(0x12, 32),
                   ExprId('test', 32),
@@ -10,7 +10,7 @@ for expr_test in [ExprInt(0x12, 32),
                   ExprCond(ExprInt(0x10, 32), ExprInt(0x11, 32), ExprInt(0x12, 32)),
                   ExprCompose(ExprInt(0x10, 16), ExprInt(0x11, 8), ExprInt(0x12, 8)),
                   ExprInt(0x11, 8) + ExprInt(0x12, 8),
-                  ExprAff(ExprId('EAX', 32),  ExprInt(0x12, 32)),
+                  ExprAssign(ExprId('EAX', 32),  ExprInt(0x12, 32)),
                   ]:
 
     print 'Test: %s' % expr_test
diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index 046c948e..68dc0437 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -575,9 +575,9 @@ for test, res in match_tests:
 
 
 get_tests = [
-    (ExprAff(ExprMem(a, 32), ExprMem(b, 32)).get_r(True), set([a, b, ExprMem(b, 32)])),
-    (ExprAff(ExprMem(a, 32), ExprMem(b, 32)).get_w(), set([ExprMem(a, 32)])),
-    (ExprAff(ExprMem(ExprMem(a, 32), 32), ExprMem(b, 32))
+    (ExprAssign(ExprMem(a, 32), ExprMem(b, 32)).get_r(True), set([a, b, ExprMem(b, 32)])),
+    (ExprAssign(ExprMem(a, 32), ExprMem(b, 32)).get_w(), set([ExprMem(a, 32)])),
+    (ExprAssign(ExprMem(ExprMem(a, 32), 32), ExprMem(b, 32))
      .get_r(True), set([a, b, ExprMem(b, 32), ExprMem(a, 32)])),
 ]