8 files changed, 26 insertions, 26 deletions
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):