16 files changed, 60 insertions, 60 deletions
diff --git a/example/expression/access_c.py b/example/expression/access_c.py
index c6f26a10..c604a0bd 100644
--- a/example/expression/access_c.py
+++ b/example/expression/access_c.py
@@ -45,16 +45,16 @@ import sys
 
 from future.utils import viewitems, viewvalues
 
-from miasm2.analysis.machine import Machine
-from miasm2.analysis.binary import Container
-from miasm2.expression.expression import ExprOp, ExprCompose, ExprId, ExprInt
-from miasm2.analysis.depgraph import DependencyGraph
+from miasm.analysis.machine import Machine
+from miasm.analysis.binary import Container
+from miasm.expression.expression import ExprOp, ExprCompose, ExprId, ExprInt
+from miasm.analysis.depgraph import DependencyGraph
 
-from miasm2.arch.x86.ctype import CTypeAMD64_unk
+from miasm.arch.x86.ctype import CTypeAMD64_unk
 
-from miasm2.core.objc import ExprToAccessC, CHandler
-from miasm2.core.objc import CTypesManagerNotPacked
-from miasm2.core.ctypesmngr import CAstTypes, CTypePtr, CTypeStruct
+from miasm.core.objc import ExprToAccessC, CHandler
+from miasm.core.objc import CTypesManagerNotPacked
+from miasm.core.ctypesmngr import CAstTypes, CTypePtr, CTypeStruct
 
 def find_call(ircfg):
     """Returns (irb, index) which call"""
diff --git a/example/expression/asm_to_ir.py b/example/expression/asm_to_ir.py
index 16f766e1..4bcbb05d 100644
--- a/example/expression/asm_to_ir.py
+++ b/example/expression/asm_to_ir.py
@@ -3,12 +3,12 @@ from pdb import pm
 
 from future.utils import viewitems
 
-from miasm2.arch.x86.arch import mn_x86
-from miasm2.core import parse_asm
-from miasm2.expression.expression import *
-from miasm2.core import asmblock
-from miasm2.arch.x86.ira import ir_a_x86_32
-from miasm2.analysis.data_flow import dead_simp
+from miasm.arch.x86.arch import mn_x86
+from miasm.core import parse_asm
+from miasm.expression.expression import *
+from miasm.core import asmblock
+from miasm.arch.x86.ira import ir_a_x86_32
+from miasm.analysis.data_flow import dead_simp
 
 
 # First, asm code
diff --git a/example/expression/basic_op.py b/example/expression/basic_op.py
index 8b5d7e2b..afeb4081 100644
--- a/example/expression/basic_op.py
+++ b/example/expression/basic_op.py
@@ -1,5 +1,5 @@
 from __future__ import print_function
-from miasm2.expression.expression import *
+from miasm.expression.expression import *
 
 print("""
 Simple expression manipulation demo
diff --git a/example/expression/basic_simplification.py b/example/expression/basic_simplification.py
index 5ecf21db..05ebefc6 100644
--- a/example/expression/basic_simplification.py
+++ b/example/expression/basic_simplification.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
-from miasm2.expression.expression import *
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.expression import *
+from miasm.expression.simplifications import expr_simp
 
 print("""
 Simple expression simplification demo
diff --git a/example/expression/constant_propagation.py b/example/expression/constant_propagation.py
index 1259758b..a6efbb46 100644
--- a/example/expression/constant_propagation.py
+++ b/example/expression/constant_propagation.py
@@ -6,12 +6,12 @@ A "constant expression" is an expression based on constants or init regs.
 
 from argparse import ArgumentParser
 
-from miasm2.analysis.machine import Machine
-from miasm2.analysis.binary import Container
-from miasm2.analysis.cst_propag import propagate_cst_expr
-from miasm2.analysis.data_flow import dead_simp, \
+from miasm.analysis.machine import Machine
+from miasm.analysis.binary import Container
+from miasm.analysis.cst_propag import propagate_cst_expr
+from miasm.analysis.data_flow import dead_simp, \
     merge_blocks, remove_empty_assignblks
-from miasm2.expression.simplifications import expr_simp
+from miasm.expression.simplifications import expr_simp
 
 
 parser = ArgumentParser("Constant expression propagation")
diff --git a/example/expression/export_llvm.py b/example/expression/export_llvm.py
index c8ee14a5..241a907d 100644
--- a/example/expression/export_llvm.py
+++ b/example/expression/export_llvm.py
@@ -1,11 +1,11 @@
 from future.utils import viewitems, viewvalues
 
 from argparse import ArgumentParser
-from miasm2.analysis.binary import Container
-from miasm2.analysis.machine import Machine
-from miasm2.jitter.llvmconvert import LLVMType, LLVMContext_IRCompilation, LLVMFunction_IRCompilation
+from miasm.analysis.binary import Container
+from miasm.analysis.machine import Machine
+from miasm.jitter.llvmconvert import LLVMType, LLVMContext_IRCompilation, LLVMFunction_IRCompilation
 from llvmlite import ir as llvm_ir
-from miasm2.expression.simplifications import expr_simp_high_to_explicit
+from miasm.expression.simplifications import expr_simp_high_to_explicit
 
 parser = ArgumentParser("LLVM export example")
 parser.add_argument("target", help="Target binary")
diff --git a/example/expression/expr_c.py b/example/expression/expr_c.py
index 83cc727b..cdfdf4ca 100644
--- a/example/expression/expr_c.py
+++ b/example/expression/expr_c.py
@@ -5,10 +5,10 @@ Parse C expression to access variables and retrieve information:
 """
 from __future__ import print_function
 
-from miasm2.core.ctypesmngr import CTypeStruct, CAstTypes, CTypePtr
-from miasm2.arch.x86.ctype import CTypeAMD64_unk
-from miasm2.core.objc import CTypesManagerNotPacked, CHandler
-from miasm2.expression.expression import ExprId
+from miasm.core.ctypesmngr import CTypeStruct, CAstTypes, CTypePtr
+from miasm.arch.x86.ctype import CTypeAMD64_unk
+from miasm.core.objc import CTypesManagerNotPacked, CHandler
+from miasm.expression.expression import ExprId
 
 
 """
diff --git a/example/expression/expr_grapher.py b/example/expression/expr_grapher.py
index e1643b03..2550c5d3 100644
--- a/example/expression/expr_grapher.py
+++ b/example/expression/expr_grapher.py
@@ -1,6 +1,6 @@
 from __future__ import print_function
 
-from miasm2.expression.expression import *
+from miasm.expression.expression import *
 
 print("Simple Expression grapher demo")
 
diff --git a/example/expression/expr_random.py b/example/expression/expr_random.py
index 5ac3be06..e1164f6f 100644
--- a/example/expression/expr_random.py
+++ b/example/expression/expr_random.py
@@ -3,7 +3,7 @@ from builtins import range
 import string
 import random
 
-from miasm2.expression.expression_helper import ExprRandom
+from miasm.expression.expression_helper import ExprRandom
 
 print("Simple expression generator\n")
 
diff --git a/example/expression/expr_reduce.py b/example/expression/expr_reduce.py
index 0f575e57..4c8b6c83 100644
--- a/example/expression/expr_reduce.py
+++ b/example/expression/expr_reduce.py
@@ -1,5 +1,5 @@
-from miasm2.expression.expression import ExprId, ExprInt, ExprMem
-from miasm2.expression.expression_reduce import ExprReducer
+from miasm.expression.expression import ExprId, ExprInt, ExprMem
+from miasm.expression.expression_reduce import ExprReducer
 
 
 class StructLookup(ExprReducer):
diff --git a/example/expression/expr_translate.py b/example/expression/expr_translate.py
index 1a36a64c..8562975f 100644
--- a/example/expression/expr_translate.py
+++ b/example/expression/expr_translate.py
@@ -3,9 +3,9 @@ import random
 
 from future.utils import viewitems
 
-from miasm2.expression.expression import *
-from miasm2.expression.expression_helper import ExprRandom
-from miasm2.ir.translators import Translator
+from miasm.expression.expression import *
+from miasm.expression.expression_helper import ExprRandom
+from miasm.ir.translators import Translator
 
 random.seed(0)
 
diff --git a/example/expression/get_read_write.py b/example/expression/get_read_write.py
index 0c8bb3dd..cf333d0c 100644
--- a/example/expression/get_read_write.py
+++ b/example/expression/get_read_write.py
@@ -2,10 +2,10 @@ from __future__ import print_function
 
 from future.utils import viewitems
 
-from miasm2.arch.x86.arch import mn_x86
-from miasm2.expression.expression import get_rw
-from miasm2.arch.x86.ira import ir_a_x86_32
-from miasm2.core.locationdb import LocationDB
+from miasm.arch.x86.arch import mn_x86
+from miasm.expression.expression import get_rw
+from miasm.arch.x86.ira import ir_a_x86_32
+from miasm.core.locationdb import LocationDB
 
 loc_db = LocationDB()
 
diff --git a/example/expression/graph_dataflow.py b/example/expression/graph_dataflow.py
index 55159598..c320fba0 100644
--- a/example/expression/graph_dataflow.py
+++ b/example/expression/graph_dataflow.py
@@ -3,13 +3,13 @@ from argparse import ArgumentParser
 
 from future.utils import viewitems, viewvalues
 
-from miasm2.analysis.binary import Container
-from miasm2.analysis.machine import Machine
-from miasm2.expression.expression import get_expr_mem
-from miasm2.analysis.data_analysis import intra_block_flow_raw, inter_block_flow
-from miasm2.core.graph import DiGraph
-from miasm2.ir.symbexec import SymbolicExecutionEngine
-from miasm2.analysis.data_flow import dead_simp
+from miasm.analysis.binary import Container
+from miasm.analysis.machine import Machine
+from miasm.expression.expression import get_expr_mem
+from miasm.analysis.data_analysis import intra_block_flow_raw, inter_block_flow
+from miasm.core.graph import DiGraph
+from miasm.ir.symbexec import SymbolicExecutionEngine
+from miasm.analysis.data_flow import dead_simp
 
 
 parser = ArgumentParser("Simple expression use for generating dataflow graph")
diff --git a/example/expression/simplification_add.py b/example/expression/simplification_add.py
index 6ac36a17..ff28d56e 100644
--- a/example/expression/simplification_add.py
+++ b/example/expression/simplification_add.py
@@ -1,13 +1,13 @@
 from __future__ import print_function
-import miasm2.expression.expression as m2_expr
-from miasm2.expression.simplifications import expr_simp
+import miasm.expression.expression as m2_expr
+from miasm.expression.simplifications import expr_simp
 from pdb import pm
 
 print("""
 Expression simplification demo: Adding a simplification:
 a + a + a == a * 3
 
-More detailed examples can be found in miasm2/expression/simplification*.
+More detailed examples can be found in miasm/expression/simplification*.
 """)
 
 # Define the simplification method
diff --git a/example/expression/simplification_tools.py b/example/expression/simplification_tools.py
index a9bcc429..b5fafba2 100644
--- a/example/expression/simplification_tools.py
+++ b/example/expression/simplification_tools.py
@@ -1,5 +1,5 @@
 from __future__ import print_function
-from miasm2.expression.expression import *
+from miasm.expression.expression import *
 from pdb import pm
 
 print("""
diff --git a/example/expression/solve_condition_stp.py b/example/expression/solve_condition_stp.py
index e0ab09da..2c654b77 100644
--- a/example/expression/solve_condition_stp.py
+++ b/example/expression/solve_condition_stp.py
@@ -6,15 +6,15 @@ from pdb import pm
 
 from future.utils import viewitems
 
-from miasm2.analysis.machine import Machine
-from miasm2.analysis.binary import Container
-from miasm2.expression.expression import ExprInt, ExprCond, ExprId, \
+from miasm.analysis.machine import Machine
+from miasm.analysis.binary import Container
+from miasm.expression.expression import ExprInt, ExprCond, ExprId, \
     get_expr_ids, ExprAssign, ExprLoc
-from miasm2.core.bin_stream import bin_stream_str
-from miasm2.ir.symbexec import SymbolicExecutionEngine, get_block
-from miasm2.expression.simplifications import expr_simp
-from miasm2.core import parse_asm
-from miasm2.ir.translators.translator  import Translator
+from miasm.core.bin_stream import bin_stream_str
+from miasm.ir.symbexec import SymbolicExecutionEngine, get_block
+from miasm.expression.simplifications import expr_simp
+from miasm.core import parse_asm
+from miasm.ir.translators.translator  import Translator
 
 machine = Machine("x86_32")