diff --git a/lib/contracts/blockchain.js b/lib/contracts/blockchain.js
index 6a18d630..ae6567fa 100644
--- a/lib/contracts/blockchain.js
+++ b/lib/contracts/blockchain.js
@@ -6,7 +6,7 @@ const utils = require('../utils/utils');
 const WEB3_READY = 'web3Ready';
 
 // TODO: consider another name, this is the blockchain connector
-class Blockchain {
+class BlockchainConnector {
   constructor(options) {
     const self = this;
     this.plugins = options.plugins;
@@ -286,5 +286,5 @@ class Blockchain {
   }
 }
 
-module.exports = Blockchain;
+module.exports = BlockchainConnector;
 
diff --git a/lib/core/engine.js b/lib/core/engine.js
index 24da952e..8a324c37 100644
--- a/lib/core/engine.js
+++ b/lib/core/engine.js
@@ -195,6 +195,7 @@ class Engine {
     this.registerModule('specialconfigs');
     this.registerModule('console_listener', {ipc: this.ipc});
 
+    // TODO: need to refactor dependencies before moving into a module
     const ContractsManager = require('../contracts/contracts.js');
     this.contractsManager = new ContractsManager({
       contractFiles: this.config.contractsFiles,