Rename miasm2 to miasm

79 files changed, 256 insertions, 255 deletions

diff --git a/test/analysis/data_flow.py b/test/analysis/data_flow.py
index 288f4bd6..ecca3eac 100644
--- a/test/analysis/data_flow.py
+++ b/test/analysis/data_flow.py
@@ -3,11 +3,11 @@ from __future__ import print_function
 
 from future.utils import viewitems
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem
-from miasm2.core.locationdb import LocationDB
-from miasm2.analysis.data_flow import *
-from miasm2.ir.analysis import ira
-from miasm2.ir.ir import IRBlock, AssignBlock
+from miasm.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem
+from miasm.core.locationdb import LocationDB
+from miasm.analysis.data_flow import *
+from miasm.ir.analysis import ira
+from miasm.ir.ir import IRBlock, AssignBlock
 
 loc_db = LocationDB()
 
diff --git a/test/analysis/depgraph.py b/test/analysis/depgraph.py
index c229caf2..345f979a 100644
--- a/test/analysis/depgraph.py
+++ b/test/analysis/depgraph.py
@@ -3,13 +3,13 @@ from __future__ import print_function
 
 from future.utils import viewitems
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, \
+from miasm.expression.expression import ExprId, ExprInt, ExprAssign, \
     ExprCond, ExprLoc, LocKey
-from miasm2.core.locationdb import LocationDB
-from miasm2.ir.analysis import ira
-from miasm2.ir.ir import IRBlock, AssignBlock
-from miasm2.core.graph import DiGraph
-from miasm2.analysis.depgraph import DependencyNode, DependencyGraph
+from miasm.core.locationdb import LocationDB
+from miasm.ir.analysis import ira
+from miasm.ir.ir import IRBlock, AssignBlock
+from miasm.core.graph import DiGraph
+from miasm.analysis.depgraph import DependencyNode, DependencyGraph
 from itertools import count
 from pdb import pm
 import re
diff --git a/test/analysis/dse.py b/test/analysis/dse.py
index 82668ea8..8691551c 100644
--- a/test/analysis/dse.py
+++ b/test/analysis/dse.py
@@ -4,12 +4,12 @@ from pdb import pm
 from future.utils import viewitems
 
 from elfesteem.strpatchwork import StrPatchwork
-from miasm2.core import parse_asm
-from miasm2.expression.expression import ExprCompose, ExprOp, ExprInt, ExprId
-from miasm2.core.asmblock import asm_resolve_final
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
-from miasm2.analysis.dse import DSEEngine
+from miasm.core import parse_asm
+from miasm.expression.expression import ExprCompose, ExprOp, ExprInt, ExprId
+from miasm.core.asmblock import asm_resolve_final
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.dse import DSEEngine
 
 
 class DSETest(object):
diff --git a/test/analysis/modularintervals.py b/test/analysis/modularintervals.py
index cf286e3a..2d877567 100644
--- a/test/analysis/modularintervals.py
+++ b/test/analysis/modularintervals.py
@@ -1,10 +1,10 @@
 from builtins import range
 from random import shuffle, seed
 
-from miasm2.core.interval import interval
-from miasm2.analysis.modularintervals import ModularIntervals
-from miasm2.expression.expression import *
-from miasm2.expression.simplifications import expr_simp
+from miasm.core.interval import interval
+from miasm.analysis.modularintervals import ModularIntervals
+from miasm.expression.expression import *
+from miasm.expression.simplifications import expr_simp
 
 
 def gen_all_intervals(size):
diff --git a/test/analysis/range.py b/test/analysis/range.py
index 946d0116..6dc109ac 100644
--- a/test/analysis/range.py
+++ b/test/analysis/range.py
@@ -1,7 +1,7 @@
 from __future__ import print_function
-from miasm2.expression.expression import *
-from miasm2.analysis.expression_range import expr_range
-from miasm2.ir.translators import Translator
+from miasm.expression.expression import *
+from miasm.analysis.expression_range import expr_range
+from miasm.ir.translators import Translator
 import z3
 
 trans = Translator.to_language("z3")
diff --git a/test/analysis/unssa.py b/test/analysis/unssa.py
index 42e56246..55ceac9e 100644
--- a/test/analysis/unssa.py
+++ b/test/analysis/unssa.py
@@ -1,12 +1,12 @@
 """ Test cases for dead code elimination"""
 from future.utils import viewvalues
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem, \
+from miasm.expression.expression import ExprId, ExprInt, ExprAssign, ExprMem, \
     ExprCond, ExprLoc
-from miasm2.core.locationdb import LocationDB
-from miasm2.analysis.simplifier import IRCFGSimplifierSSA
-from miasm2.ir.analysis import ira
-from miasm2.ir.ir import IRCFG, IRBlock, AssignBlock
+from miasm.core.locationdb import LocationDB
+from miasm.analysis.simplifier import IRCFGSimplifierSSA
+from miasm.ir.analysis import ira
+from miasm.ir.ir import IRCFG, IRBlock, AssignBlock
 
 loc_db = LocationDB()
 
diff --git a/test/arch/aarch64/arch.py b/test/arch/aarch64/arch.py
index 948ee489..70a44053 100644
--- a/test/arch/aarch64/arch.py
+++ b/test/arch/aarch64/arch.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 import sys
 import time
 from pdb import pm
-from miasm2.core.utils import decode_hex
-from miasm2.arch.aarch64.arch import *
-from miasm2.core.locationdb import LocationDB
+from miasm.core.utils import decode_hex
+from miasm.arch.aarch64.arch import *
+from miasm.core.locationdb import LocationDB
 
 loc_db = LocationDB()
 
diff --git a/test/arch/aarch64/unit/asm_test.py b/test/arch/aarch64/unit/asm_test.py
index e49a2a62..65a537a0 100644
--- a/test/arch/aarch64/unit/asm_test.py
+++ b/test/arch/aarch64/unit/asm_test.py
@@ -3,13 +3,13 @@ import os
 
 from future.utils import viewitems
 
-from miasm2.arch.aarch64.arch import mn_aarch64, base_expr, variable
-from miasm2.core import parse_asm
-from miasm2.expression.expression import *
-from miasm2.core import asmblock
+from miasm.arch.aarch64.arch import mn_aarch64, base_expr, variable
+from miasm.core import parse_asm
+from miasm.expression.expression import *
+from miasm.core import asmblock
 from elfesteem.strpatchwork import StrPatchwork
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import *
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import *
 
 reg_and_id = dict(mn_aarch64.regs.all_regs_ids_byname)
 
diff --git a/test/arch/arm/arch.py b/test/arch/arm/arch.py
index bf2b1a02..c8f2d433 100644
--- a/test/arch/arm/arch.py
+++ b/test/arch/arm/arch.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import time
 
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.arch.arm.arch import *
-from miasm2.core.locationdb import LocationDB
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.arch.arm.arch import *
+from miasm.core.locationdb import LocationDB
 from pdb import pm
 
 
diff --git a/test/arch/arm/sem.py b/test/arch/arm/sem.py
index 9c19431b..f38d48e9 100755
--- a/test/arch/arm/sem.py
+++ b/test/arch/arm/sem.py
@@ -7,12 +7,12 @@ import logging
 
 from future.utils import viewitems
 
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.arch.arm.arch import mn_arm as mn
-from miasm2.arch.arm.sem import ir_arml as ir_arch
-from miasm2.arch.arm.regs import *
-from miasm2.expression.expression import *
-from miasm2.core.locationdb import LocationDB
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.arch.arm.arch import mn_arm as mn
+from miasm.arch.arm.sem import ir_arml as ir_arch
+from miasm.arch.arm.regs import *
+from miasm.expression.expression import *
+from miasm.core.locationdb import LocationDB
 from pdb import pm
 
 logging.getLogger('cpuhelper').setLevel(logging.ERROR)
diff --git a/test/arch/mep/asm/test_asm.py b/test/arch/mep/asm/test_asm.py
index 217def86..7762669a 100644
--- a/test/arch/mep/asm/test_asm.py
+++ b/test/arch/mep/asm/test_asm.py
@@ -2,8 +2,8 @@
 # Guillaume Valadon <guillaume@valadon.net>
 
 from __future__ import print_function
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.arch.mep.arch import mn_mep
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.arch.mep.arch import mn_mep
 
 class TestMisc(object):
 
diff --git a/test/arch/mep/asm/ut_helpers_asm.py b/test/arch/mep/asm/ut_helpers_asm.py
index 26520787..9f6dc5c2 100644
--- a/test/arch/mep/asm/ut_helpers_asm.py
+++ b/test/arch/mep/asm/ut_helpers_asm.py
@@ -5,11 +5,11 @@ from __future__ import print_function
 
 from builtins import range
 
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.arch.mep.arch import mn_mep
-from miasm2.core.cpu import Disasm_Exception
-from miasm2.core.locationdb import LocationDB
-from miasm2.expression.expression import ExprId, ExprInt, ExprLoc
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.arch.mep.arch import mn_mep
+from miasm.core.cpu import Disasm_Exception
+from miasm.core.locationdb import LocationDB
+from miasm.expression.expression import ExprId, ExprInt, ExprLoc
 
 import re
 
diff --git a/test/arch/mep/ir/test_arithmetic.py b/test/arch/mep/ir/test_arithmetic.py
index 2e0dbf32..d404f51c 100644
--- a/test/arch/mep/ir/test_arithmetic.py
+++ b/test/arch/mep/ir/test_arithmetic.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestArithmetic(object):
diff --git a/test/arch/mep/ir/test_bitmanipulation.py b/test/arch/mep/ir/test_bitmanipulation.py
index f4ea2f29..6ec200c5 100644
--- a/test/arch/mep/ir/test_bitmanipulation.py
+++ b/test/arch/mep/ir/test_bitmanipulation.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprMem
+from miasm.expression.expression import ExprId, ExprInt, ExprMem
 
 
 class TestBitManipulation(object):
diff --git a/test/arch/mep/ir/test_branchjump.py b/test/arch/mep/ir/test_branchjump.py
index 7e0953fd..828b172f 100644
--- a/test/arch/mep/ir/test_branchjump.py
+++ b/test/arch/mep/ir/test_branchjump.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt
+from miasm.expression.expression import ExprId, ExprInt
 
 
 class TestBranchJump(object):
diff --git a/test/arch/mep/ir/test_control.py b/test/arch/mep/ir/test_control.py
index 92dcb371..04c8b4d0 100644
--- a/test/arch/mep/ir/test_control.py
+++ b/test/arch/mep/ir/test_control.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestControl(object):
diff --git a/test/arch/mep/ir/test_coprocessor.py b/test/arch/mep/ir/test_coprocessor.py
index e9829c08..bd8fd39c 100644
--- a/test/arch/mep/ir/test_coprocessor.py
+++ b/test/arch/mep/ir/test_coprocessor.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprMem, ExprInt
+from miasm.expression.expression import ExprId, ExprMem, ExprInt
 
 
 class TestCoprocessor(object):
diff --git a/test/arch/mep/ir/test_debug.py b/test/arch/mep/ir/test_debug.py
index b25e3a19..0c1026de 100644
--- a/test/arch/mep/ir/test_debug.py
+++ b/test/arch/mep/ir/test_debug.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestDebug(object):
diff --git a/test/arch/mep/ir/test_divide.py b/test/arch/mep/ir/test_divide.py
index e3e4cb99..424a9876 100644
--- a/test/arch/mep/ir/test_divide.py
+++ b/test/arch/mep/ir/test_divide.py
@@ -3,8 +3,8 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
-from miasm2.jitter.csts import EXCEPT_DIV_BY_ZERO
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.jitter.csts import EXCEPT_DIV_BY_ZERO
 
 
 class TestDivide(object):
diff --git a/test/arch/mep/ir/test_extension.py b/test/arch/mep/ir/test_extension.py
index 10f16ebf..72ad8c22 100644
--- a/test/arch/mep/ir/test_extension.py
+++ b/test/arch/mep/ir/test_extension.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprMem, ExprInt
+from miasm.expression.expression import ExprId, ExprMem, ExprInt
 
 
 class TestExtension(object):
diff --git a/test/arch/mep/ir/test_ir.py b/test/arch/mep/ir/test_ir.py
index be717db8..be8e24e1 100644
--- a/test/arch/mep/ir/test_ir.py
+++ b/test/arch/mep/ir/test_ir.py
@@ -3,13 +3,13 @@
 
 from __future__ import print_function
 
-from miasm2.core.utils import decode_hex
-from miasm2.arch.mep.arch import mn_mep
-from miasm2.arch.mep.regs import regs_init
-from miasm2.arch.mep.ira import ir_mepb, ir_a_mepb
-from miasm2.expression.expression import ExprId, ExprInt, ExprMem
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.core.locationdb import LocationDB
+from miasm.core.utils import decode_hex
+from miasm.arch.mep.arch import mn_mep
+from miasm.arch.mep.regs import regs_init
+from miasm.arch.mep.ira import ir_mepb, ir_a_mepb
+from miasm.expression.expression import ExprId, ExprInt, ExprMem
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.core.locationdb import LocationDB
 
 
 class TestMisc(object):
diff --git a/test/arch/mep/ir/test_ldz.py b/test/arch/mep/ir/test_ldz.py
index 668030c8..f14172b2 100644
--- a/test/arch/mep/ir/test_ldz.py
+++ b/test/arch/mep/ir/test_ldz.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestLdz(object):
diff --git a/test/arch/mep/ir/test_loadstore.py b/test/arch/mep/ir/test_loadstore.py
index 22cb4304..87343fcb 100644
--- a/test/arch/mep/ir/test_loadstore.py
+++ b/test/arch/mep/ir/test_loadstore.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprMem, ExprInt
+from miasm.expression.expression import ExprId, ExprMem, ExprInt
 
 
 class TestLoadStore(object):
diff --git a/test/arch/mep/ir/test_logical.py b/test/arch/mep/ir/test_logical.py
index e78b5488..0e5aef76 100644
--- a/test/arch/mep/ir/test_logical.py
+++ b/test/arch/mep/ir/test_logical.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestLogical(object):
diff --git a/test/arch/mep/ir/test_move.py b/test/arch/mep/ir/test_move.py
index 8da7a18a..30af1a74 100644
--- a/test/arch/mep/ir/test_move.py
+++ b/test/arch/mep/ir/test_move.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprMem, ExprInt
+from miasm.expression.expression import ExprId, ExprMem, ExprInt
 
 
 class TestMove(object):
diff --git a/test/arch/mep/ir/test_multiply.py b/test/arch/mep/ir/test_multiply.py
index 5673994c..065f1a59 100644
--- a/test/arch/mep/ir/test_multiply.py
+++ b/test/arch/mep/ir/test_multiply.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestMultiply(object):
diff --git a/test/arch/mep/ir/test_repeat.py b/test/arch/mep/ir/test_repeat.py
index 1e0e2f86..e684ef87 100644
--- a/test/arch/mep/ir/test_repeat.py
+++ b/test/arch/mep/ir/test_repeat.py
@@ -3,7 +3,7 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
 
 
 class TestRepeat(object):
diff --git a/test/arch/mep/ir/test_shift.py b/test/arch/mep/ir/test_shift.py
index 99755ba5..cac48660 100644
--- a/test/arch/mep/ir/test_shift.py
+++ b/test/arch/mep/ir/test_shift.py
@@ -3,8 +3,8 @@
 
 from ut_helpers_ir import exec_instruction
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
-from miasm2.core.cpu import sign_ext
+from miasm.expression.expression import ExprId, ExprInt, ExprCond, ExprOp
+from miasm.core.cpu import sign_ext
 
 
 class TestShift(object):
diff --git a/test/arch/mep/ir/ut_helpers_ir.py b/test/arch/mep/ir/ut_helpers_ir.py
index 26eebeda..c5bf36b9 100644
--- a/test/arch/mep/ir/ut_helpers_ir.py
+++ b/test/arch/mep/ir/ut_helpers_ir.py
@@ -3,16 +3,16 @@
 
 from __future__ import print_function
 
-from miasm2.arch.mep.arch import mn_mep
-from miasm2.arch.mep.sem import ir_mepb
-from miasm2.arch.mep.regs import regs_init
-
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.core.locationdb import LocationDB
-from miasm2.core.utils import Disasm_Exception
-from miasm2.ir.ir import AssignBlock
-from miasm2.arch.mep.ira import ir_a_mepb
-from miasm2.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \
+from miasm.arch.mep.arch import mn_mep
+from miasm.arch.mep.sem import ir_mepb
+from miasm.arch.mep.regs import regs_init
+
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.core.locationdb import LocationDB
+from miasm.core.utils import Disasm_Exception
+from miasm.ir.ir import AssignBlock
+from miasm.arch.mep.ira import ir_a_mepb
+from miasm.expression.expression import ExprId, ExprInt, ExprOp, ExprMem, \
     ExprAssign, ExprLoc
 
 
diff --git a/test/arch/mep/jit/ut_helpers_jit.py b/test/arch/mep/jit/ut_helpers_jit.py
index 999ead42..0c756e39 100644
--- a/test/arch/mep/jit/ut_helpers_jit.py
+++ b/test/arch/mep/jit/ut_helpers_jit.py
@@ -3,14 +3,14 @@
 
 from __future__ import print_function
 
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 
 def jit_instructions(mn_str):
     """JIT instructions and return the jitter object."""
 
-    # Get the miasm2 Machine
+    # Get the miasm Machine
     machine = Machine("mepb")
     mn_mep = machine.mn()
 
diff --git a/test/arch/mips32/arch.py b/test/arch/mips32/arch.py
index f71d3ee8..e5e8cff6 100644
--- a/test/arch/mips32/arch.py
+++ b/test/arch/mips32/arch.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 import time
 from pdb import pm
 
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.core.locationdb import LocationDB
-from miasm2.arch.mips32.arch import *
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.core.locationdb import LocationDB
+from miasm.arch.mips32.arch import *
 
 loc_db = LocationDB()
 
diff --git a/test/arch/mips32/unit/asm_test.py b/test/arch/mips32/unit/asm_test.py
index 7a50b38e..38a2d928 100644
--- a/test/arch/mips32/unit/asm_test.py
+++ b/test/arch/mips32/unit/asm_test.py
@@ -3,13 +3,13 @@ import os
 
 from future.utils import viewitems
 
-from miasm2.arch.mips32.arch import mn_mips32
-from miasm2.core import parse_asm
-from miasm2.expression.expression import *
-from miasm2.core import asmblock
+from miasm.arch.mips32.arch import mn_mips32
+from miasm.core import parse_asm
+from miasm.expression.expression import *
+from miasm.core import asmblock
 from elfesteem.strpatchwork import StrPatchwork
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import *
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import *
 
 
 reg_and_id = dict(mn_mips32.regs.all_regs_ids_byname)
diff --git a/test/arch/msp430/arch.py b/test/arch/msp430/arch.py
index eea87091..bc38c363 100644
--- a/test/arch/msp430/arch.py
+++ b/test/arch/msp430/arch.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 
 import time
 from pdb import pm
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.arch.msp430.arch import *
-from miasm2.core.locationdb import LocationDB
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.arch.msp430.arch import *
+from miasm.core.locationdb import LocationDB
 
 loc_db = LocationDB()
 
diff --git a/test/arch/msp430/sem.py b/test/arch/msp430/sem.py
index 88aa990d..2aca66ed 100755
--- a/test/arch/msp430/sem.py
+++ b/test/arch/msp430/sem.py
@@ -7,12 +7,12 @@ import logging
 
 from future.utils import viewitems
 
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.arch.msp430.arch import mn_msp430 as mn, mode_msp430 as mode
-from miasm2.arch.msp430.sem import ir_msp430 as ir_arch
-from miasm2.arch.msp430.regs import *
-from miasm2.expression.expression import *
-from miasm2.core.locationdb import LocationDB
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.arch.msp430.arch import mn_msp430 as mn, mode_msp430 as mode
+from miasm.arch.msp430.sem import ir_msp430 as ir_arch
+from miasm.arch.msp430.regs import *
+from miasm.expression.expression import *
+from miasm.core.locationdb import LocationDB
 
 logging.getLogger('cpuhelper').setLevel(logging.ERROR)
 EXCLUDE_REGS = set([res, ir_arch().IRDst])
diff --git a/test/arch/sh4/arch.py b/test/arch/sh4/arch.py
index f52ed070..0fbc6ba2 100644
--- a/test/arch/sh4/arch.py
+++ b/test/arch/sh4/arch.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 import time
 from pdb import pm
 from sys import stderr
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.arch.sh4.arch import *
-from miasm2.core.locationdb import LocationDB
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.arch.sh4.arch import *
+from miasm.core.locationdb import LocationDB
 
 loc_db = LocationDB()
 
diff --git a/test/arch/x86/arch.py b/test/arch/x86/arch.py
index b4cebd28..202ecac5 100644
--- a/test/arch/x86/arch.py
+++ b/test/arch/x86/arch.py
@@ -2,13 +2,13 @@ from __future__ import print_function
 import time
 from pdb import pm
 
-from miasm2.core.utils import decode_hex, encode_hex
-import miasm2.expression.expression as m2_expr
-from miasm2.arch.x86.arch import mn_x86, deref_mem_ad, \
+from miasm.core.utils import decode_hex, encode_hex
+import miasm.expression.expression as m2_expr
+from miasm.arch.x86.arch import mn_x86, deref_mem_ad, \
     base_expr, rmarg, print_size
-from miasm2.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64
-from miasm2.core.bin_stream import bin_stream_str
-from miasm2.core.locationdb import LocationDB
+from miasm.arch.x86.sem import ir_x86_16, ir_x86_32, ir_x86_64
+from miasm.core.bin_stream import bin_stream_str
+from miasm.core.locationdb import LocationDB
 
 loc_db = LocationDB()
 
diff --git a/test/arch/x86/qemu/testqemu.py b/test/arch/x86/qemu/testqemu.py
index 264a84b9..99d6e6c1 100644
--- a/test/arch/x86/qemu/testqemu.py
+++ b/test/arch/x86/qemu/testqemu.py
@@ -10,9 +10,9 @@ try:
 except AttributeError:
     pass
 
-from miasm2.analysis.sandbox import Sandbox_Linux_x86_32
-from miasm2.jitter.jitload import log_func
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.sandbox import Sandbox_Linux_x86_32
+from miasm.jitter.jitload import log_func
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 # Utils
 def parse_fmt(s):
diff --git a/test/arch/x86/qemu/testqemu64.py b/test/arch/x86/qemu/testqemu64.py
index 4fe51992..24193d40 100644
--- a/test/arch/x86/qemu/testqemu64.py
+++ b/test/arch/x86/qemu/testqemu64.py
@@ -10,9 +10,9 @@ try:
 except AttributeError:
     pass
 
-from miasm2.analysis.sandbox import Sandbox_Linux_x86_64
-from miasm2.jitter.jitload import log_func
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.sandbox import Sandbox_Linux_x86_64
+from miasm.jitter.jitload import log_func
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 # Utils
 def parse_fmt(s):
diff --git a/test/arch/x86/sem.py b/test/arch/x86/sem.py
index c0cfc8f2..5109d2b4 100755
--- a/test/arch/x86/sem.py
+++ b/test/arch/x86/sem.py
@@ -12,14 +12,14 @@ import unittest
 import logging
 import copy
 
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.arch.x86.arch import mn_x86 as mn
-from miasm2.arch.x86.sem import ir_x86_32 as ir_32, ir_x86_64 as ir_64
-from miasm2.arch.x86.regs import *
-from miasm2.expression.expression import *
-from miasm2.expression.simplifications import expr_simp
-from miasm2.core import parse_asm, asmblock
-from miasm2.core.locationdb import LocationDB
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.arch.x86.arch import mn_x86 as mn
+from miasm.arch.x86.sem import ir_x86_32 as ir_32, ir_x86_64 as ir_64
+from miasm.arch.x86.regs import *
+from miasm.expression.expression import *
+from miasm.expression.simplifications import expr_simp
+from miasm.core import parse_asm, asmblock
+from miasm.core.locationdb import LocationDB
 
 
 logging.getLogger('cpuhelper').setLevel(logging.ERROR)
diff --git a/test/arch/x86/unit/access_xmm.py b/test/arch/x86/unit/access_xmm.py
index 8354c30f..65248b2e 100644
--- a/test/arch/x86/unit/access_xmm.py
+++ b/test/arch/x86/unit/access_xmm.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python2
 """Test getter and setter for XMM registers (128 bits)"""
 
-from miasm2.analysis.machine import Machine
+from miasm.analysis.machine import Machine
 
 # Jitter engine doesn't matter, use the always available 'python' one
 myjit = Machine("x86_32").jitter("python")
diff --git a/test/arch/x86/unit/asm_test.py b/test/arch/x86/unit/asm_test.py
index a87fe278..0059f511 100644
--- a/test/arch/x86/unit/asm_test.py
+++ b/test/arch/x86/unit/asm_test.py
@@ -5,13 +5,13 @@ import os
 
 from future.utils import viewitems
 
-from miasm2.arch.x86.arch import mn_x86, base_expr, variable
-from miasm2.core import parse_asm
-from miasm2.expression.expression import *
-from miasm2.core import asmblock
+from miasm.arch.x86.arch import mn_x86, base_expr, variable
+from miasm.core import parse_asm
+from miasm.expression.expression import *
+from miasm.core import asmblock
 from elfesteem.strpatchwork import StrPatchwork
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import *
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import *
 
 reg_and_id = dict(mn_x86.regs.all_regs_ids_byname)
 
diff --git a/test/arch/x86/unit/mn_cdq.py b/test/arch/x86/unit/mn_cdq.py
index 947b40bb..d015ede9 100644
--- a/test/arch/x86/unit/mn_cdq.py
+++ b/test/arch/x86/unit/mn_cdq.py
@@ -3,7 +3,7 @@
 import sys
 
 from asm_test import Asm_Test_16, Asm_Test_32, Asm_Test_64
-from miasm2.core.utils import pck16, pck32
+from miasm.core.utils import pck16, pck32
 
 
 class Test_CBW_16(Asm_Test_16):
diff --git a/test/arch/x86/unit/mn_int.py b/test/arch/x86/unit/mn_int.py
index efacb105..8cb8080f 100755
--- a/test/arch/x86/unit/mn_int.py
+++ b/test/arch/x86/unit/mn_int.py
@@ -1,7 +1,7 @@
 #! /usr/bin/env python2
 import sys
 
-from miasm2.jitter.csts import EXCEPT_INT_XX
+from miasm.jitter.csts import EXCEPT_INT_XX
 from asm_test import Asm_Test_32
 
 
diff --git a/test/arch/x86/unit/mn_pushpop.py b/test/arch/x86/unit/mn_pushpop.py
index fedd197b..6dc37b74 100755
--- a/test/arch/x86/unit/mn_pushpop.py
+++ b/test/arch/x86/unit/mn_pushpop.py
@@ -3,7 +3,7 @@
 import sys
 
 from asm_test import Asm_Test_16, Asm_Test_32
-from miasm2.core.utils import pck16, pck32
+from miasm.core.utils import pck16, pck32
 
 
 def init_regs(test):
diff --git a/test/arch/x86/unit/mn_seh.py b/test/arch/x86/unit/mn_seh.py
index 1fa0900e..8575cc46 100755
--- a/test/arch/x86/unit/mn_seh.py
+++ b/test/arch/x86/unit/mn_seh.py
@@ -2,10 +2,10 @@
 from __future__ import print_function
 import sys
 
-from miasm2.os_dep.win_api_x86_32_seh import fake_seh_handler, build_teb, \
+from miasm.os_dep.win_api_x86_32_seh import fake_seh_handler, build_teb, \
     set_win_fs_0, return_from_exception, EXCEPTION_PRIV_INSTRUCTION, \
     return_from_seh, DEFAULT_SEH
-from miasm2.os_dep.win_32_structs import ContextException
+from miasm.os_dep.win_32_structs import ContextException
 
 from asm_test import Asm_Test_32
 
diff --git a/test/arch/x86/unit/test_asm_x86_64.py b/test/arch/x86/unit/test_asm_x86_64.py
index 4e600846..e23f9a19 100644
--- a/test/arch/x86/unit/test_asm_x86_64.py
+++ b/test/arch/x86/unit/test_asm_x86_64.py
@@ -1,7 +1,7 @@
-from miasm2.core import asmblock
-from miasm2.arch.x86  import arch
-from miasm2.core import parse_asm
-from miasm2.core.interval import interval
+from miasm.core import asmblock
+from miasm.arch.x86  import arch
+from miasm.core import parse_asm
+from miasm.core.interval import interval
 
 my_mn = arch.mn_x86
 
diff --git a/test/core/asmblock.py b/test/core/asmblock.py
index 48e81e78..e5ccf252 100644
--- a/test/core/asmblock.py
+++ b/test/core/asmblock.py
@@ -4,14 +4,14 @@ from pdb import pm
 
 from future.utils import viewitems
 
-from miasm2.core.utils import decode_hex
-from miasm2.analysis.machine import Machine
-from miasm2.analysis.binary import Container
-from miasm2.core.asmblock import AsmCFG, AsmConstraint, AsmBlock, \
+from miasm.core.utils import decode_hex
+from miasm.analysis.machine import Machine
+from miasm.analysis.binary import Container
+from miasm.core.asmblock import AsmCFG, AsmConstraint, AsmBlock, \
     AsmBlockBad, AsmConstraintTo, AsmConstraintNext, \
     bbl_simplifier
-from miasm2.core.graph import DiGraphSimplifier, MatchGraphJoker
-from miasm2.expression.expression import ExprId
+from miasm.core.graph import DiGraphSimplifier, MatchGraphJoker
+from miasm.expression.expression import ExprId
 
 # Initial data: from 'samples/simple_test.bin'
 data = decode_hex("5589e583ec10837d08007509c745fc01100000eb73837d08017709c745fc02100000eb64837d08057709c745fc03100000eb55837d080774138b450801c083f80e7509c745fc04100000eb3c8b450801c083f80e7509c745fc05100000eb298b450883e03085c07409c745fc06100000eb16837d08427509c745fc07100000eb07c745fc081000008b45fcc9c3")
diff --git a/test/core/graph.py b/test/core/graph.py
index 484591b7..3db5e523 100644
--- a/test/core/graph.py
+++ b/test/core/graph.py
@@ -1,5 +1,5 @@
 from __future__ import print_function
-from miasm2.core.graph import *
+from miasm.core.graph import *
 
 g = DiGraph()
 g.add_node('a')
diff --git a/test/core/interval.py b/test/core/interval.py
index 76c95d66..61f33178 100755
--- a/test/core/interval.py
+++ b/test/core/interval.py
@@ -2,7 +2,7 @@
 #-*- coding:utf-8 -*-
 
 from builtins import range
-from miasm2.core.interval import *
+from miasm.core.interval import *
 from random import randint
 from pdb import pm
 
diff --git a/test/core/locationdb.py b/test/core/locationdb.py
index 3db760d8..b6d7d8e0 100644
--- a/test/core/locationdb.py
+++ b/test/core/locationdb.py
@@ -1,5 +1,5 @@
 from builtins import str
-from miasm2.core.locationdb import LocationDB
+from miasm.core.locationdb import LocationDB
 
 
 # Basic tests (LocationDB description)
diff --git a/test/core/parse_asm.py b/test/core/parse_asm.py
index ade9040d..ab2bca4a 100755
--- a/test/core/parse_asm.py
+++ b/test/core/parse_asm.py
@@ -8,8 +8,8 @@ import unittest
 class TestParseAsm(unittest.TestCase):
 
     def test_ParseTxt(self):
-        from miasm2.arch.x86.arch import mn_x86
-        from miasm2.core.parse_asm import parse_txt
+        from miasm.arch.x86.arch import mn_x86
+        from miasm.core.parse_asm import parse_txt
 
         ASM0 = '''
         ;
@@ -37,9 +37,9 @@ class TestParseAsm(unittest.TestCase):
         self.assertRaises(ValueError, parse_txt, mn_x86, 32, ASM1)
 
     def test_DirectiveDontSplit(self):
-        from miasm2.arch.x86.arch import mn_x86
-        from miasm2.core.parse_asm import parse_txt
-        from miasm2.core.asmblock import asm_resolve_final
+        from miasm.arch.x86.arch import mn_x86
+        from miasm.core.parse_asm import parse_txt
+        from miasm.core.asmblock import asm_resolve_final
 
         ASM0 = '''
         lbl0:
@@ -85,8 +85,8 @@ class TestParseAsm(unittest.TestCase):
         assert(lbls[5] == lbl2block[lbls[4]].get_next())
 
     def test_DirectiveSplit(self):
-        from miasm2.arch.x86.arch import mn_x86
-        from miasm2.core.parse_asm import parse_txt
+        from miasm.arch.x86.arch import mn_x86
+        from miasm.core.parse_asm import parse_txt
 
         ASM0 = '''
         lbl0:
diff --git a/test/core/sembuilder.py b/test/core/sembuilder.py
index 53e9e60e..7c3d578e 100644
--- a/test/core/sembuilder.py
+++ b/test/core/sembuilder.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 import inspect
 from pdb import pm
 
-from miasm2.core.sembuilder import SemBuilder
-from miasm2.core.locationdb import LocationDB
-import miasm2.expression.expression as m2_expr
+from miasm.core.sembuilder import SemBuilder
+from miasm.core.locationdb import LocationDB
+import miasm.expression.expression as m2_expr
 
 
 
diff --git a/test/core/test_types.py b/test/core/test_types.py
index e3914185..1b15630c 100755
--- a/test/core/test_types.py
+++ b/test/core/test_types.py
@@ -1,19 +1,19 @@
 #! /usr/bin/env python2
 
-# miasm2.core.types tests
+# miasm.core.types tests
 
 from __future__ import print_function
 from builtins import range
 import struct
 
-from miasm2.core.utils import int_to_byte
-from miasm2.analysis.machine import Machine
-from miasm2.core.types import MemStruct, Num, Ptr, Str, \
+from miasm.core.utils import int_to_byte
+from miasm.analysis.machine import Machine
+from miasm.core.types import MemStruct, Num, Ptr, Str, \
                               Array, RawStruct, Union, \
                               BitField, Self, Void, Bits, \
                               set_allocator, MemUnion, Struct
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
-from miasm2.os_dep.common import heap
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.os_dep.common import heap
 
 # Two structures with some fields
 class OtherStruct(MemStruct):
diff --git a/test/core/utils.py b/test/core/utils.py
index 6f69fdf1..0ca64f4e 100755
--- a/test/core/utils.py
+++ b/test/core/utils.py
@@ -10,7 +10,7 @@ import unittest
 class TestUtils(unittest.TestCase):
 
     def test_boundedDict(self):
-        from miasm2.core.utils import BoundedDict
+        from miasm.core.utils import BoundedDict
 
         # Use a callback
         def logger(key):
diff --git a/test/expr_type/test_chandler.py b/test/expr_type/test_chandler.py
index 92ebd0f2..e6566636 100644
--- a/test/expr_type/test_chandler.py
+++ b/test/expr_type/test_chandler.py
@@ -9,18 +9,18 @@ from __future__ import print_function
 from future.utils import viewitems
 from past.builtins import cmp
 from builtins import str
-from miasm2.expression.expression import ExprInt, ExprId, ExprMem
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.expression import ExprInt, ExprId, ExprMem
+from miasm.expression.simplifications import expr_simp
 
-from miasm2.core.objc import parse_access
-from miasm2.core.objc import ast_get_c_access_expr
-from miasm2.core.objc import ExprCToExpr, ExprToAccessC, CHandler
+from miasm.core.objc import parse_access
+from miasm.core.objc import ast_get_c_access_expr
+from miasm.core.objc import ExprCToExpr, ExprToAccessC, CHandler
 
 
-from miasm2.core.ctypesmngr import CTypeStruct, CTypeUnion, CAstTypes, CTypePtr, CTypeId
-from miasm2.core.objc import CTypesManagerNotPacked
+from miasm.core.ctypesmngr import CTypeStruct, CTypeUnion, CAstTypes, CTypePtr, CTypeId
+from miasm.core.objc import CTypesManagerNotPacked
 
-from miasm2.arch.x86.ctype import CTypeAMD64_unk
+from miasm.arch.x86.ctype import CTypeAMD64_unk
 
 
 text_1 = """
diff --git a/test/expression/expr_cmp.py b/test/expression/expr_cmp.py
index b238151d..671085f1 100644
--- a/test/expression/expr_cmp.py
+++ b/test/expression/expr_cmp.py
@@ -2,12 +2,12 @@
 # Expression comparison regression tests  #
 #
 from pdb import pm
-from miasm2.expression.expression import ExprInt, expr_is_unsigned_greater,\
+from miasm.expression.expression import ExprInt, expr_is_unsigned_greater,\
     expr_is_unsigned_greater_or_equal, expr_is_unsigned_lower,\
     expr_is_unsigned_lower_or_equal, expr_is_signed_greater,\
     expr_is_signed_greater_or_equal, expr_is_signed_lower, \
     expr_is_signed_lower_or_equal, expr_is_equal, expr_is_not_equal
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.simplifications import expr_simp
 
 int_0 = ExprInt(0, 32)
 int_1 = ExprInt(1, 32)
diff --git a/test/expression/expr_pickle.py b/test/expression/expr_pickle.py
index 16b87db7..70778d38 100644
--- a/test/expression/expr_pickle.py
+++ b/test/expression/expr_pickle.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
 import pickle
-from miasm2.expression.expression import ExprInt, ExprAssign, ExprId, \
+from miasm.expression.expression import ExprInt, ExprAssign, ExprId, \
     Expr, ExprCompose, ExprMem
 
 
diff --git a/test/expression/expression.py b/test/expression/expression.py
index b8a2642a..3597eae8 100644
--- a/test/expression/expression.py
+++ b/test/expression/expression.py
@@ -3,8 +3,8 @@ from __future__ import print_function
 # Expression regression tests  #
 #
 from pdb import pm
-from miasm2.expression.expression import *
-from miasm2.expression.expression_helper import *
+from miasm.expression.expression import *
+from miasm.expression.expression_helper import *
 
 # Expression comparison
 assert(ExprInt(-1, 64) != ExprInt(-2, 64))
diff --git a/test/expression/expression_helper.py b/test/expression/expression_helper.py
index 6c6fb2a9..c188215e 100755
--- a/test/expression/expression_helper.py
+++ b/test/expression/expression_helper.py
@@ -10,8 +10,8 @@ import unittest
 class TestExpressionExpressionHelper(unittest.TestCase):
 
     def test_Variables_Identifier(self):
-        import miasm2.expression.expression as m2_expr
-        from miasm2.expression.expression_helper import Variables_Identifier
+        import miasm.expression.expression as m2_expr
+        from miasm.expression.expression_helper import Variables_Identifier
 
         # Build a complex expression
         cst = m2_expr.ExprInt(0x100, 16)
diff --git a/test/expression/modint.py b/test/expression/modint.py
index a833ee80..af80b284 100644
--- a/test/expression/modint.py
+++ b/test/expression/modint.py
@@ -1,5 +1,6 @@
 from __future__ import print_function
-from miasm2.expression.modint import *
+
+from miasm.expression.modint import *
 
 a = uint8(0x42)
 b = uint8(0xFF)
diff --git a/test/expression/parser.py b/test/expression/parser.py
index d05f8262..48c63753 100644
--- a/test/expression/parser.py
+++ b/test/expression/parser.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
-from miasm2.expression.parser import str_to_expr
-from miasm2.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \
+from miasm.expression.parser import str_to_expr
+from miasm.expression.expression import ExprInt, ExprId, ExprSlice, ExprMem, \
     ExprCond, ExprCompose, ExprOp, ExprAssign, ExprLoc, LocKey
 
 for expr_test in [ExprInt(0x12, 32),
diff --git a/test/expression/simplifications.py b/test/expression/simplifications.py
index ae9eb1c0..1a22c43d 100644
--- a/test/expression/simplifications.py
+++ b/test/expression/simplifications.py
@@ -6,11 +6,11 @@ from pdb import pm
 from argparse import ArgumentParser
 import logging
 
-from miasm2.expression.expression import *
-from miasm2.expression.simplifications import expr_simp, expr_simp_explicit, \
+from miasm.expression.expression import *
+from miasm.expression.simplifications import expr_simp, expr_simp_explicit, \
     ExpressionSimplifier, log_exprsimp
 
-from miasm2.expression.simplifications_cond import ExprOp_inf_signed, ExprOp_inf_unsigned, ExprOp_equal
+from miasm.expression.simplifications_cond import ExprOp_inf_signed, ExprOp_inf_unsigned, ExprOp_equal
 
 parser = ArgumentParser("Expression simplification regression tests")
 parser.add_argument("--z3", action="store_true", help="Enable check against z3")
@@ -24,7 +24,7 @@ if args.verbose:
 # Additional imports and definitions
 if args.z3:
     import z3
-    from miasm2.ir.translators import Translator
+    from miasm.ir.translators import Translator
     trans = Translator.to_language("z3")
 
     def check(expr_in, expr_out):
diff --git a/test/expression/stp.py b/test/expression/stp.py
index 7650bf45..b97b0754 100755
--- a/test/expression/stp.py
+++ b/test/expression/stp.py
@@ -8,8 +8,8 @@ import unittest
 class TestIrIr2STP(unittest.TestCase):
 
     def test_ExprOp_strcst(self):
-        from miasm2.expression.expression import ExprInt, ExprOp
-        from miasm2.ir.translators.translator  import Translator
+        from miasm.expression.expression import ExprInt, ExprOp
+        from miasm.ir.translators.translator  import Translator
         translator_smt2 = Translator.to_language("smt2")
 
         args = [ExprInt(i, 32) for i in range(9)]
@@ -23,8 +23,8 @@ class TestIrIr2STP(unittest.TestCase):
         self.assertRaises(NotImplementedError, translator_smt2.from_expr, ExprOp('X', *args[:1]))
 
     def test_ExprSlice_strcst(self):
-        from miasm2.expression.expression import ExprInt, ExprOp
-        from miasm2.ir.translators.translator  import Translator
+        from miasm.expression.expression import ExprInt, ExprOp
+        from miasm.ir.translators.translator  import Translator
         translator_smt2 = Translator.to_language("smt2")
 
         args = [ExprInt(i, 32) for i in range(9)]
diff --git a/test/ir/ir.py b/test/ir/ir.py
index 3dd95c3e..a959a7a7 100644
--- a/test/ir/ir.py
+++ b/test/ir/ir.py
@@ -1,8 +1,8 @@
 from future.utils import viewitems
 
-from miasm2.expression.expression import *
-from miasm2.ir.ir import AssignBlock
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.expression import *
+from miasm.ir.ir import AssignBlock
+from miasm.expression.simplifications import expr_simp
 
 id_a = ExprId("a", 32)
 id_b = ExprId("b", 32)
diff --git a/test/ir/ir2C.py b/test/ir/ir2C.py
index 26683468..c41c98c9 100755
--- a/test/ir/ir2C.py
+++ b/test/ir/ir2C.py
@@ -3,19 +3,19 @@
 
 from builtins import range
 import unittest
-from miasm2.expression.expression import TOK_EQUAL
+from miasm.expression.expression import TOK_EQUAL
 
 class TestIrIr2C(unittest.TestCase):
 
     def translationTest(self, expr, expected):
-        from miasm2.ir.translators import Translator
+        from miasm.ir.translators import Translator
 
         translator = Translator.to_language("C")
         self.assertEqual(translator.from_expr(expr), expected)
 
     def test_ExprOp_toC(self):
-        from miasm2.expression.expression import ExprInt, ExprOp
-        from miasm2.ir.translators.C import Translator
+        from miasm.expression.expression import ExprInt, ExprOp
+        from miasm.ir.translators.C import Translator
 
         args = [ExprInt(i, 32) for i in range(9)]
         translator = Translator.to_language("C")
diff --git a/test/ir/reduce_graph.py b/test/ir/reduce_graph.py
index f6ebad24..8835b4aa 100644
--- a/test/ir/reduce_graph.py
+++ b/test/ir/reduce_graph.py
@@ -5,13 +5,13 @@ from pdb import pm
 
 from future.utils import viewitems
 
-from miasm2.expression.expression import ExprId, ExprInt, ExprAssign, ExprCond, \
+from miasm.expression.expression import ExprId, ExprInt, ExprAssign, ExprCond, \
     ExprLoc, LocKey
 
-from miasm2.core.locationdb import LocationDB
-from miasm2.ir.analysis import ira
-from miasm2.ir.ir import IRBlock, AssignBlock, IRCFG
-from miasm2.analysis.data_flow import merge_blocks
+from miasm.core.locationdb import LocationDB
+from miasm.ir.analysis import ira
+from miasm.ir.ir import IRBlock, AssignBlock, IRCFG
+from miasm.analysis.data_flow import merge_blocks
 
 loc_db = LocationDB()
 
diff --git a/test/ir/symbexec.py b/test/ir/symbexec.py
index 3ab99c91..d627f4b9 100755
--- a/test/ir/symbexec.py
+++ b/test/ir/symbexec.py
@@ -11,12 +11,12 @@ import unittest
 class TestSymbExec(unittest.TestCase):
 
     def test_ClassDef(self):
-        from miasm2.expression.expression import ExprInt, ExprId, ExprMem, \
+        from miasm.expression.expression import ExprInt, ExprId, ExprMem, \
             ExprCompose, ExprAssign
-        from miasm2.arch.x86.sem import ir_x86_32
-        from miasm2.core.locationdb import LocationDB
-        from miasm2.ir.symbexec import SymbolicExecutionEngine
-        from miasm2.ir.ir import AssignBlock
+        from miasm.arch.x86.sem import ir_x86_32
+        from miasm.core.locationdb import LocationDB
+        from miasm.ir.symbexec import SymbolicExecutionEngine
+        from miasm.ir.ir import AssignBlock
 
 
         loc_db = LocationDB()
diff --git a/test/ir/translators/smt2.py b/test/ir/translators/smt2.py
index 78472d0a..81f63b45 100644
--- a/test/ir/translators/smt2.py
+++ b/test/ir/translators/smt2.py
@@ -1,7 +1,7 @@
 from z3 import Solver, unsat, parse_smt2_string
-from miasm2.expression.expression import *
-from miasm2.ir.translators.smt2 import TranslatorSMT2
-from miasm2.ir.translators.z3_ir import TranslatorZ3
+from miasm.expression.expression import *
+from miasm.ir.translators.smt2 import TranslatorSMT2
+from miasm.ir.translators.z3_ir import TranslatorZ3
 
 # create nested expression
 a = ExprId("a", 64)
diff --git a/test/ir/translators/z3_ir.py b/test/ir/translators/z3_ir.py
index 68421bea..b28269fb 100644
--- a/test/ir/translators/z3_ir.py
+++ b/test/ir/translators/z3_ir.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import z3
 
-from miasm2.core.locationdb import LocationDB
-from miasm2.expression.expression import *
-from miasm2.ir.translators.z3_ir import Z3Mem, TranslatorZ3
+from miasm.core.locationdb import LocationDB
+from miasm.expression.expression import *
+from miasm.ir.translators.z3_ir import Z3Mem, TranslatorZ3
 
 # Some examples of use/unit tests.
 
diff --git a/test/jitter/bad_block.py b/test/jitter/bad_block.py
index 0756dfd5..256d2388 100644
--- a/test/jitter/bad_block.py
+++ b/test/jitter/bad_block.py
@@ -1,7 +1,7 @@
 import sys
-from miasm2.core.utils import decode_hex
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_UNK_MNEMO
-from miasm2.analysis.machine import Machine
+from miasm.core.utils import decode_hex
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_UNK_MNEMO
+from miasm.analysis.machine import Machine
 
 def code_sentinelle(jitter):
     jitter.run = False
diff --git a/test/jitter/jit_options.py b/test/jitter/jit_options.py
index 91d59edd..74808330 100644
--- a/test/jitter/jit_options.py
+++ b/test/jitter/jit_options.py
@@ -2,9 +2,9 @@ from __future__ import print_function
 import os
 import sys
 
-from miasm2.core.utils import decode_hex
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
-from miasm2.analysis.machine import Machine
+from miasm.core.utils import decode_hex
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
 from pdb import pm
 
 # Shellcode
diff --git a/test/jitter/jitload.py b/test/jitter/jitload.py
index 5473b7d2..8b758a89 100644
--- a/test/jitter/jitload.py
+++ b/test/jitter/jitload.py
@@ -1,10 +1,10 @@
 import sys
 from pdb import pm
 
-from miasm2.core.utils import decode_hex, encode_hex
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
-from miasm2.analysis.machine import Machine
-from miasm2.expression.expression import ExprId, ExprAssign, ExprInt, ExprMem
+from miasm.core.utils import decode_hex, encode_hex
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+from miasm.expression.expression import ExprId, ExprAssign, ExprInt, ExprMem
 
 # Initial data: from 'example/samples/x86_32_sc.bin'
 data = decode_hex("8d49048d5b0180f90174058d5bffeb038d5b0189d8c3")
diff --git a/test/jitter/jmp_out_mem.py b/test/jitter/jmp_out_mem.py
index ff137b84..2b064f73 100644
--- a/test/jitter/jmp_out_mem.py
+++ b/test/jitter/jmp_out_mem.py
@@ -1,7 +1,7 @@
 import sys
-from miasm2.core.utils import decode_hex
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_ACCESS_VIOL
-from miasm2.analysis.machine import Machine
+from miasm.core.utils import decode_hex
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE, EXCEPT_ACCESS_VIOL
+from miasm.analysis.machine import Machine
 
 def code_sentinelle(jitter):
     jitter.run = False
diff --git a/test/jitter/test_post_instr.py b/test/jitter/test_post_instr.py
index ab8f8a74..52274a46 100644
--- a/test/jitter/test_post_instr.py
+++ b/test/jitter/test_post_instr.py
@@ -1,9 +1,9 @@
 from __future__ import print_function
 import sys
 
-from miasm2.core.utils import decode_hex
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE, \
+from miasm.core.utils import decode_hex
+from miasm.analysis.machine import Machine
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE, \
     EXCEPT_BREAKPOINT_MEMORY, EXCEPT_ACCESS_VIOL
 
 machine = Machine("x86_32")
diff --git a/test/jitter/vm_mngr.py b/test/jitter/vm_mngr.py
index 3aa4105e..468fb347 100644
--- a/test/jitter/vm_mngr.py
+++ b/test/jitter/vm_mngr.py
@@ -1,6 +1,6 @@
 import sys
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
-from miasm2.analysis.machine import Machine
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
 
 myjit = Machine("x86_32").jitter(sys.argv[1])
 
diff --git a/test/os_dep/common.py b/test/os_dep/common.py
index 52512075..749d71a7 100755
--- a/test/os_dep/common.py
+++ b/test/os_dep/common.py
@@ -4,10 +4,10 @@
 from builtins import range
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.common as commonapi
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.common as commonapi
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")
 
diff --git a/test/os_dep/linux/stdlib.py b/test/os_dep/linux/stdlib.py
index 80b99969..a205002b 100755
--- a/test/os_dep/linux/stdlib.py
+++ b/test/os_dep/linux/stdlib.py
@@ -3,10 +3,10 @@
 
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.linux_stdlib as stdlib
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.linux_stdlib as stdlib
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")
 
diff --git a/test/os_dep/linux/test_env.py b/test/os_dep/linux/test_env.py
index 1e8e7678..13351a84 100644
--- a/test/os_dep/linux/test_env.py
+++ b/test/os_dep/linux/test_env.py
@@ -2,8 +2,8 @@ from __future__ import print_function
 import os
 import sys
 from pdb import pm
-from miasm2.analysis.binary import Container
-from miasm2.analysis.sandbox import Sandbox_Linux_x86_32, Sandbox_Linux_x86_64,\
+from miasm.analysis.binary import Container
+from miasm.analysis.sandbox import Sandbox_Linux_x86_32, Sandbox_Linux_x86_64,\
     Sandbox_Linux_arml, Sandbox_Linux_aarch64l
 
 if len(sys.argv) < 2:
diff --git a/test/os_dep/win_api_x86_32.py b/test/os_dep/win_api_x86_32.py
index 2dcac61d..a7d88f90 100755
--- a/test/os_dep/win_api_x86_32.py
+++ b/test/os_dep/win_api_x86_32.py
@@ -4,10 +4,10 @@
 from builtins import range
 import unittest
 import logging
-from miasm2.analysis.machine import Machine
-import miasm2.os_dep.win_api_x86_32 as winapi
-from miasm2.core.utils import pck32
-from miasm2.jitter.csts import PAGE_READ, PAGE_WRITE
+from miasm.analysis.machine import Machine
+import miasm.os_dep.win_api_x86_32 as winapi
+from miasm.core.utils import pck32
+from miasm.jitter.csts import PAGE_READ, PAGE_WRITE
 
 machine = Machine("x86_32")