diff --git a/libevmjit-cpp/Env.cpp b/libevmjit-cpp/Env.cpp
index 72775822c2..fd85a3ccf5 100644
--- a/libevmjit-cpp/Env.cpp
+++ b/libevmjit-cpp/Env.cpp
@@ -3,7 +3,7 @@
 #include <libevm/FeeStructure.h>
 #include <libevm/ExtVMFace.h>
 
-#include "../libevmjit/Utils.h"
+#include <evmjit/libevmjit/Utils.h>
 
 extern "C"
 {
diff --git a/libevmjit-cpp/VM.cpp b/libevmjit-cpp/JitVM.cpp
similarity index 91%
rename from libevmjit-cpp/VM.cpp
rename to libevmjit-cpp/JitVM.cpp
index 7ac51097d4..da945139d8 100644
--- a/libevmjit-cpp/VM.cpp
+++ b/libevmjit-cpp/JitVM.cpp
@@ -1,21 +1,19 @@
 
-#include "VM.h"
-
+#include "JitVM.h"
 #include <libevm/VMFace.h>
 #include <libevm/VM.h>
-
-#include "../libevmjit/ExecutionEngine.h"
-#include "../libevmjit/Compiler.h"
+#include <evmjit/libevmjit/ExecutionEngine.h>
+#include <evmjit/libevmjit/Compiler.h>
 
 namespace dev
 {
 namespace eth
 {
-namespace jit
-{
 
-bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const&, uint64_t)
+bytesConstRef JitVM::go(ExtVMFace& _ext, OnOpFunc const&, uint64_t)
 {
+	using namespace jit;
+
 	Compiler::Options defaultOptions;
 	auto module = Compiler(defaultOptions).compile(_ext.code);
 
@@ -63,7 +61,6 @@ bytesConstRef VM::go(ExtVMFace& _ext, OnOpFunc const&, uint64_t)
 	return {m_output.data(), m_output.size()};  // TODO: This all bytesConstRef stuff sucks
 }
 
-}
 }
 }
 
diff --git a/libevmjit-cpp/VM.h b/libevmjit-cpp/JitVM.h
similarity index 76%
rename from libevmjit-cpp/VM.h
rename to libevmjit-cpp/JitVM.h
index 1c6c711813..028dca7a09 100644
--- a/libevmjit-cpp/VM.h
+++ b/libevmjit-cpp/JitVM.h
@@ -10,12 +10,7 @@ namespace dev
 namespace eth
 {
 
-class VMFactory;
-
-namespace jit
-{
-
-class VM: public VMFace
+class JitVM: public VMFace
 {
 	virtual bytesConstRef go(ExtVMFace& _ext, OnOpFunc const& _onOp = {}, uint64_t _steps = (uint64_t)-1) override final;
 
@@ -23,12 +18,12 @@ class VM: public VMFace
 	static std::unique_ptr<VMFace> create(Kind, u256 _gas = 0);
 
 private:
-	friend VMFactory;
-	explicit VM(u256 _gas = 0): VMFace(_gas) {}
+	friend class VMFactory;
+	explicit JitVM(u256 _gas = 0) : VMFace(_gas) {}
 
 	bytes m_output;
 };
 
-}
+
 }
 }