diff --git a/packages/web3-core-abi/package.json b/packages/web3-eth-abi/package.json
similarity index 87%
rename from packages/web3-core-abi/package.json
rename to packages/web3-eth-abi/package.json
index 6ca7ded..32dea01 100644
--- a/packages/web3-core-abi/package.json
+++ b/packages/web3-eth-abi/package.json
@@ -1,8 +1,8 @@
 {
-    "name": "web3-core-abi",
+    "name": "web3-eth-abi",
     "version": "1.0.0",
     "description": "Web3 module encode and decode EVM in/output.",
-    "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-abi",
+    "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-abi",
     "license": "LGPL-3.0",
     "main": "src/index.js",
     "dependencies": {
diff --git a/packages/web3-core-abi/src/index.js b/packages/web3-eth-abi/src/index.js
similarity index 100%
rename from packages/web3-core-abi/src/index.js
rename to packages/web3-eth-abi/src/index.js
diff --git a/packages/web3-core-abi/src/solidity/address.js b/packages/web3-eth-abi/src/solidity/address.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/address.js
rename to packages/web3-eth-abi/src/solidity/address.js
diff --git a/packages/web3-core-abi/src/solidity/bool.js b/packages/web3-eth-abi/src/solidity/bool.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/bool.js
rename to packages/web3-eth-abi/src/solidity/bool.js
diff --git a/packages/web3-core-abi/src/solidity/bytes.js b/packages/web3-eth-abi/src/solidity/bytes.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/bytes.js
rename to packages/web3-eth-abi/src/solidity/bytes.js
diff --git a/packages/web3-core-abi/src/solidity/coder.js b/packages/web3-eth-abi/src/solidity/coder.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/coder.js
rename to packages/web3-eth-abi/src/solidity/coder.js
diff --git a/packages/web3-core-abi/src/solidity/dynamicbytes.js b/packages/web3-eth-abi/src/solidity/dynamicbytes.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/dynamicbytes.js
rename to packages/web3-eth-abi/src/solidity/dynamicbytes.js
diff --git a/packages/web3-core-abi/src/solidity/formatters.js b/packages/web3-eth-abi/src/solidity/formatters.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/formatters.js
rename to packages/web3-eth-abi/src/solidity/formatters.js
diff --git a/packages/web3-core-abi/src/solidity/int.js b/packages/web3-eth-abi/src/solidity/int.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/int.js
rename to packages/web3-eth-abi/src/solidity/int.js
diff --git a/packages/web3-core-abi/src/solidity/param.js b/packages/web3-eth-abi/src/solidity/param.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/param.js
rename to packages/web3-eth-abi/src/solidity/param.js
diff --git a/packages/web3-core-abi/src/solidity/string.js b/packages/web3-eth-abi/src/solidity/string.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/string.js
rename to packages/web3-eth-abi/src/solidity/string.js
diff --git a/packages/web3-core-abi/src/solidity/type.js b/packages/web3-eth-abi/src/solidity/type.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/type.js
rename to packages/web3-eth-abi/src/solidity/type.js
diff --git a/packages/web3-core-abi/src/solidity/uint.js b/packages/web3-eth-abi/src/solidity/uint.js
similarity index 100%
rename from packages/web3-core-abi/src/solidity/uint.js
rename to packages/web3-eth-abi/src/solidity/uint.js
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
index 8d2ee6e..0a169e4 100644
--- a/packages/web3-eth-contract/package.json
+++ b/packages/web3-eth-contract/package.json
@@ -9,10 +9,10 @@
         "web3-core-helpers": "^1.0.0",
         "web3-core-subscriptions": "^1.0.0",
         "web3-core-method": "^1.0.0",
-        "web3-core-abi": "^1.0.0",
+        "web3-core-promiEvent": "^1.0.0",
+        "web3-eth-abi": "^1.0.0",
         "web3-utils": "^1.0.0",
         "underscore": "^1.8.3",
-        "web3-core-promiEvent": "^1.0.0",
         "number-to-bn": "^1.7.0",
         "bn.js": "^4.11.6"
     }
diff --git a/packages/web3-eth-contract/src/index.js b/packages/web3-eth-contract/src/index.js
index d8fe6d2..7dacbde 100644
--- a/packages/web3-eth-contract/src/index.js
+++ b/packages/web3-eth-contract/src/index.js
@@ -37,7 +37,7 @@ var utils = require('web3-utils');
 var Subscription = require('web3-core-subscriptions').subscription;
 var formatters = require('web3-core-helpers').formatters;
 var promiEvent = require('web3-core-promiEvent');
-var coder = require('web3-core-abi').solidity;
+var coder = require('web3-eth-abi').solidity;
 
 
 /**
diff --git a/test/coder.decodeParam.js b/test/coder.decodeParam.js
index c11fb61..bacce23 100644
--- a/test/coder.decodeParam.js
+++ b/test/coder.decodeParam.js
@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var coder = require('../packages/web3-eth-contract/src/solidity/coder');
+var coder = require('../packages/web3-eth-abi').solidity;
 
 // TODO check line 108 again!
 
diff --git a/test/coder.encodeParam.js b/test/coder.encodeParam.js
index 949ac9c..cda3fbc 100644
--- a/test/coder.encodeParam.js
+++ b/test/coder.encodeParam.js
@@ -1,6 +1,6 @@
 var chai = require('chai');
 var assert = chai.assert;
-var coder = require('../packages/web3-eth-contract/src/solidity/coder');
+var coder = require('../packages/web3-eth-abi').solidity;
 
 
 describe('lib/solidity/coder', function () {
diff --git a/test/soldity.formatters.formatInputInt.js b/test/soldity.formatters.formatInputInt.js
index 23d41b5..fd57a1b 100644
--- a/test/soldity.formatters.formatInputInt.js
+++ b/test/soldity.formatters.formatInputInt.js
@@ -1,7 +1,7 @@
 var chai = require('chai');
 var assert = chai.assert;
-var formatters = require('../packages/web3-eth-contract/src/solidity/formatters.js');
-var SolidityParam = require('../packages/web3-eth-contract/src/solidity/param');
+var formatters = require('../packages/web3-eth-abi/src/solidity/formatters.js');
+var SolidityParam = require('../packages/web3-eth-abi/src/solidity/param');
 
 var tests = [
     { input: 1, result: new SolidityParam('0000000000000000000000000000000000000000000000000000000000000001') },