diff --git a/src/aeso_ast_to_icode.erl b/src/aeso_ast_to_icode.erl
index a8bd2bf..06f80a4 100644
--- a/src/aeso_ast_to_icode.erl
+++ b/src/aeso_ast_to_icode.erl
@@ -674,7 +674,7 @@ make_type_def(Args, Def, Icode = #{ type_vars := TypeEnv }) ->
         ast_typerep(Def, Icode#{ type_vars := maps:merge(TypeEnv, TypeEnv1) })
     end.
 
--spec ast_typerep(aeso_syntax:type()) -> aeso_sophia:type().
+-spec ast_typerep(aeso_syntax:type()) -> aeb_aevm_data:type().
 ast_typerep(Type) -> ast_typerep(Type, aeso_icode:new([])).
 
 ast_typerep({id, _, Name}, Icode) ->
diff --git a/src/aeso_compiler.erl b/src/aeso_compiler.erl
index be193bf..f8b2d1d 100644
--- a/src/aeso_compiler.erl
+++ b/src/aeso_compiler.erl
@@ -208,7 +208,7 @@ last_contract_indent(Decls) ->
         _                     -> 0
     end.
 
--spec to_sophia_value(string(), string(), ok | error | revert, aeso_sophia:data()) ->
+-spec to_sophia_value(string(), string(), ok | error | revert, aeb_aevm_data:data()) ->
         {ok, aeso_syntax:expr()} | {error, term()}.
 to_sophia_value(ContractString, Fun, ResType, Data) ->
     to_sophia_value(ContractString, Fun, ResType, Data, []).
@@ -260,7 +260,7 @@ to_sophia_value(ContractString, FunName, ok, Data, Options) ->
 address_literal(N) -> {hash, [], <<N:256>>}.  % TODO
 
 %% TODO: somewhere else
--spec translate_vm_value(aeso_sophia:type(), aeso_syntax:type(), aeso_sophia:data()) -> aeso_syntax:expr().
+-spec translate_vm_value(aeb_aevm_data:type(), aeso_syntax:type(), aeb_aevm_data:data()) -> aeso_syntax:expr().
 translate_vm_value(word,   {id, _, "address"},                     N) -> address_literal(N);
 translate_vm_value(word,   {app_t, _, {id, _, "oracle"}, _},       N) -> address_literal(N);
 translate_vm_value(word,   {app_t, _, {id, _, "oracle_query"}, _}, N) -> address_literal(N);
@@ -313,7 +313,7 @@ translate_vm_value(_VmType, _Type, _Data) ->
     throw(cannot_translate_to_sophia).
 
 -spec create_calldata(string(), string(), [string()]) ->
-                             {ok, binary(), aeso_sophia:type(), aeso_sophia:type()}
+                             {ok, binary(), aeb_aevm_data:type(), aeb_aevm_data:type()}
                              | {error, term()}.
 create_calldata(Code, Fun, Args) ->
     case check_call(Code, Fun, Args, []) of
diff --git a/src/aeso_icode.erl b/src/aeso_icode.erl
index 16953da..c589152 100644
--- a/src/aeso_icode.erl
+++ b/src/aeso_icode.erl
@@ -25,14 +25,14 @@
 
 -include("aeso_icode.hrl").
 
--type type_def() :: fun(([aeso_sophia:type()]) -> aeso_sophia:type()).
+-type type_def() :: fun(([aeb_aevm_data:type()]) -> aeb_aevm_data:type()).
 
 -type bindings() :: any().
 -type fun_dec() :: { string()
                    , [modifier()]
                    , arg_list()
                    , expr()
-                   , aeso_sophia:type()}.
+                   , aeb_aevm_data:type()}.
 
 -type modifier() :: private | stateful.
 
@@ -42,10 +42,10 @@
                   , functions => [fun_dec()]
                   , namespace => aeso_syntax:con() | aeso_syntax:qcon()
                   , env => [bindings()]
-                  , state_type => aeso_sophia:type()
-                  , event_type => aeso_sophia:type()
+                  , state_type => aeb_aevm_data:type()
+                  , event_type => aeb_aevm_data:type()
                   , types => #{ type_name() => type_def() }
-                  , type_vars => #{ string() => aeso_sophia:type() }
+                  , type_vars => #{ string() => aeb_aevm_data:type() }
                   , constructors => #{ [string()] => integer() }  %% name to tag
                   , options => [any()]
                   }.
diff --git a/src/aeso_icode.hrl b/src/aeso_icode.hrl
index 56da80a..a338125 100644
--- a/src/aeso_icode.hrl
+++ b/src/aeso_icode.hrl
@@ -1,5 +1,5 @@
 
--define(Type(), aeso_sophia:type()).
+-define(Type(), aeb_aevm_data:type()).
 
 -define(TYPEREP_WORD_TAG,   0).
 -define(TYPEREP_STRING_TAG, 1).
diff --git a/src/aeso_sophia.erl b/src/aeso_sophia.erl
deleted file mode 100644
index 96d6700..0000000
--- a/src/aeso_sophia.erl
+++ /dev/null
@@ -1,30 +0,0 @@
--module(aeso_sophia).
-
--export_type([data/0,
-              type/0,
-              heap/0]).
-
--type type() :: word | signed_word | string | typerep | function
-              | {list,   type()}
-              | {option, type()}
-              | {tuple, [type()]}
-              | {variant, [[type()]]}.
-
-
--type data() :: none
-              | {some,   data()}
-              | {option, data()}
-              | word
-              | string
-              | {list,   data()}
-              | {tuple, [data()]}
-              | {variant, integer(), [data()]}
-              | integer()
-              | binary()
-              | [data()]
-              | {}
-              | {data()}
-              | {data(), data()}.
-
--type heap() :: binary().
-