diff --git a/src/evm/vmfactory.rs b/src/evm/factory.rs
similarity index 82%
rename from src/evm/vmfactory.rs
rename to src/evm/factory.rs
index 13a908cc7..788140a38 100644
--- a/src/evm/vmfactory.rs
+++ b/src/evm/factory.rs
@@ -3,9 +3,9 @@
 use evm::Evm;
 
 /// Evm factory. Creates appropriate Evm.
-pub struct VmFactory;
+pub struct Factory;
 
-impl VmFactory {
+impl Factory {
 	/// Returns jit vm
 	#[cfg(feature = "jit")]
 	pub fn create() -> Box<Evm> {
@@ -21,5 +21,5 @@ impl VmFactory {
 
 #[test]
 fn test_create_vm() {
-	let _vm = VmFactory::create();
+	let _vm = Factory::create();
 }
diff --git a/src/evm/mod.rs b/src/evm/mod.rs
index 7d9492119..9f5789dda 100644
--- a/src/evm/mod.rs
+++ b/src/evm/mod.rs
@@ -2,16 +2,12 @@
 
 pub mod ext;
 pub mod evm;
-pub mod vmfactory;
-//pub mod logentry;
+pub mod factory;
 pub mod schedule;
 #[cfg(feature = "jit" )]
 mod jit;
 
-// TODO: Error -> evm::Error, Result -> evm::Result
 pub use self::evm::{Evm, Error, Result};
 pub use self::ext::Ext;
-// TODO: VmFactory -> evm::Factory
-// TODO: module rename vmfactory -> factory
-pub use self::vmfactory::VmFactory;
+pub use self::factory::Factory;
 pub use self::schedule::Schedule;
diff --git a/src/executive.rs b/src/executive.rs
index a0eda47d1..07af3b71b 100644
--- a/src/executive.rs
+++ b/src/executive.rs
@@ -2,7 +2,7 @@
 use common::*;
 use state::*;
 use engine::*;
-use evm::{self, Schedule, VmFactory, Ext};
+use evm::{self, Schedule, Factory, Ext};
 
 /// Returns new address created from address and given nonce.
 pub fn contract_address(address: &Address, nonce: &U256) -> Address {
@@ -184,7 +184,7 @@ impl<'a> Executive<'a> {
 		} else if params.code.len() > 0 {
 			// if destination is a contract, do normal message call
 			let mut ext = Externalities::from_executive(self, params, substate, OutputPolicy::Return(output));
-			let evm = VmFactory::create();
+			let evm = Factory::create();
 			evm.exec(&params, &mut ext)
 		} else {
 			// otherwise, nothing
@@ -202,7 +202,7 @@ impl<'a> Executive<'a> {
 		self.state.transfer_balance(&params.sender, &params.address, &params.value);
 
 		let mut ext = Externalities::from_executive(self, params, substate, OutputPolicy::InitContract);
-		let evm = VmFactory::create();
+		let evm = Factory::create();
 		evm.exec(&params, &mut ext)
 	}