diff --git a/nimbus/p2p/chain.nim b/nimbus/p2p/chain.nim
index 96e1158f7..c292dba7c 100644
--- a/nimbus/p2p/chain.nim
+++ b/nimbus/p2p/chain.nim
@@ -1,5 +1,5 @@
 import ../db/db_chain, eth/common, chronicles, ../vm_state, ../vm_types,
-  ../vm_computation, ../vm/message, ./vm_forks, stint, nimcrypto,
+  ../vm_computation, ../vm_message, ./vm_forks, stint, nimcrypto,
   ../utils, eth/trie/db, ./executor, ../config, ../genesis, ../utils,
   stew/endians2
 
diff --git a/nimbus/p2p/executor.nim b/nimbus/p2p/executor.nim
index 0be56c19e..9b23dd350 100644
--- a/nimbus/p2p/executor.nim
+++ b/nimbus/p2p/executor.nim
@@ -3,7 +3,7 @@ import options, sets,
   ../db/[db_chain, accounts_cache],
   ../utils, ../constants, ../transaction,
   ../vm_state, ../vm_types, ../vm_state_transactions,
-  ../vm_computation, vm/[message, precompiles],
+  ../vm_computation, ../vm_message, ../vm/precompiles,
   ./vm_forks,
   ./dao, ../config
 
diff --git a/nimbus/rpc/p2p.nim b/nimbus/rpc/p2p.nim
index 747270c8d..693d7227f 100644
--- a/nimbus/rpc/p2p.nim
+++ b/nimbus/rpc/p2p.nim
@@ -14,7 +14,7 @@ import
   eth/p2p/rlpx_protocols/eth_protocol,
   ../transaction, ../config, ../vm_state, ../constants, ../vm_types,
   ../utils, ../db/[db_chain, state_db],
-  rpc_types, rpc_utils, ../vm/message, ../vm_computation,
+  rpc_types, rpc_utils, ../vm_message, ../vm_computation,
   ../vm_forks
 
 #[
diff --git a/nimbus/vm/interpreter.nim b/nimbus/vm/interpreter.nim
index 493ae60a0..8fc82d32c 100644
--- a/nimbus/vm/interpreter.nim
+++ b/nimbus/vm/interpreter.nim
@@ -9,11 +9,11 @@ import
   vm/interpreter/[opcode_values, gas_meter, nvm_forks]
 
 import # Used in vm_types. Beware of recursive dependencies
-  vm/[code_stream, nvm_computation, stack, message]
+  vm/[code_stream, nvm_computation, stack, nvm_message]
 
 export
   opcode_values, gas_meter,
   nvm_forks
 
 export
-  code_stream, nvm_computation, stack, message
+  code_stream, nvm_computation, stack, nvm_message
diff --git a/nimbus/vm/nvm_computation.nim b/nimbus/vm/nvm_computation.nim
index 18299d31a..1cf4cdc04 100644
--- a/nimbus/vm/nvm_computation.nim
+++ b/nimbus/vm/nvm_computation.nim
@@ -10,7 +10,7 @@ import
   sets, eth/[common, keys],
   constants, errors,
   vm/interpreter/[opcode_values, gas_meter, nvm_gas_costs, nvm_forks],
-  vm/[code_stream, memory, message, stack, nvm_types, nvm_state],
+  vm/[code_stream, memory, nvm_message, stack, nvm_types, nvm_state],
   db/[accounts_cache, db_chain],
   utils/header, precompiles,
   transaction_tracer, utils
diff --git a/nimbus/vm/message.nim b/nimbus/vm/nvm_message.nim
similarity index 100%
rename from nimbus/vm/message.nim
rename to nimbus/vm/nvm_message.nim
diff --git a/nimbus/vm_message.nim b/nimbus/vm_message.nim
new file mode 100644
index 000000000..c3511b212
--- /dev/null
+++ b/nimbus/vm_message.nim
@@ -0,0 +1,18 @@
+# Nimbus
+# Copyright (c) 2018 Status Research & Development GmbH
+# Licensed under either of
+#  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+#    http://www.apache.org/licenses/LICENSE-2.0)
+#  * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+#    http://opensource.org/licenses/MIT)
+# at your option. This file may not be copied, modified, or distributed except
+# according to those terms.
+
+# Should be considered part of another header file (e.h. vm_misc)
+import
+  ./vm/nvm_message as vmm
+
+export
+  vmm.isCreate
+
+# End
diff --git a/tests/macro_assembler.nim b/tests/macro_assembler.nim
index 6555d24f1..24e81863d 100644
--- a/tests/macro_assembler.nim
+++ b/tests/macro_assembler.nim
@@ -8,8 +8,8 @@ import
   options, json, os, eth/trie/[db, hexary],
   ../nimbus/[vm_state, vm_types, transaction, utils],
   ../nimbus/db/[db_chain, accounts_cache],
-  ../nimbus/[vm_computation, vm_state_transactions, vm_forks],
-  ../nimbus/vm/[message,  memory]
+  ../nimbus/[vm_computation, vm_state_transactions, vm_forks, vm_message],
+  ../nimbus/vm/memory
 
 export opcode_values, byteutils
 {.experimental: "dynamicBindSym".}